diff options
author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-08-07 08:53:41 +0000 |
---|---|---|
committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-08-07 08:53:41 +0000 |
commit | 683c4ac7af0bf05d31eaded26078b69d383d5cce (patch) | |
tree | 612cf84e7315d535ddd395f34307b191f4c7196c /os/hal/src | |
parent | 07339aeb0e0cb5f6a6f66933df2fd8f21051da92 (diff) | |
download | ChibiOS-683c4ac7af0bf05d31eaded26078b69d383d5cce.tar.gz ChibiOS-683c4ac7af0bf05d31eaded26078b69d383d5cce.tar.bz2 ChibiOS-683c4ac7af0bf05d31eaded26078b69d383d5cce.zip |
STM32 FSMC NAND. Polishing driver after hardware tests.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7152 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src')
-rw-r--r-- | os/hal/src/hal.c | 7 | ||||
-rw-r--r-- | os/hal/src/nand.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c index 698e1b29b..7cd9e6fb5 100644 --- a/os/hal/src/hal.c +++ b/os/hal/src/hal.c @@ -119,11 +119,8 @@ void halInit(void) { #if HAL_USE_RTC || defined(__DOXYGEN__)
rtcInit();
#endif
-#if HAL_USE_EMC || defined(__DOXYGEN__)
- emcInit();
-#endif
-#if HAL_USE_EMCNAND || defined(__DOXYGEN__)
- emcnandInit();
+#if HAL_USE_NAND || defined(__DOXYGEN__)
+ nandInit();
#endif
/* Board specific initialization.*/
boardInit();
diff --git a/os/hal/src/nand.c b/os/hal/src/nand.c index c5536f4be..ee2bd3b2d 100644 --- a/os/hal/src/nand.c +++ b/os/hal/src/nand.c @@ -242,8 +242,6 @@ void nandObjectInit(NANDDriver *nandp) { void nandStart(NANDDriver *nandp, const NANDConfig *config) { osalDbgCheck((nandp != NULL) && (config != NULL)); - osalDbgAssert(config->fsmcp->state == FSMC_READY, - "lower level driver not ready"); osalDbgAssert((nandp->state == NAND_STOP) || (nandp->state == NAND_READY), "invalid state"); |