Cleaning FSMC code

7 files changed, 22 insertions, 17 deletions

diff --git a/os/hal/include/hal_community.h b/os/hal/include/hal_community.h
index 889da4f..d4924f5 100644
--- a/os/hal/include/hal_community.h
+++ b/os/hal/include/hal_community.h
@@ -96,7 +96,6 @@
 /* Shared headers.*/

 

 /* Normal drivers.*/

-#include "hal_nand.h"

 #include "hal_eicu.h"

 #include "hal_rng.h"

 #include "hal_usbh.h"

diff --git a/os/hal/include/hal_sdram.h b/os/hal/include/hal_sdram.h
index 297b715..af4a1ad 100644
--- a/os/hal/include/hal_sdram.h
+++ b/os/hal/include/hal_sdram.h
@@ -239,6 +239,6 @@ extern "C" {
 
 #endif /* HAL_USE_SDRAM */
 
-#endif /* SDRAM_H_ */
+#endif /* HAL_SDRAM_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
index c4f8595..51f2b95 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_nand_lld.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    hal_fsmc_nand_lld.h
+ * @file    hal_nand_lld.h
  * @brief   FSMC NAND Driver subsystem low level driver header.
  *
  * @addtogroup NAND
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
index 6a19728..3991695 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef HAL_FMC_SDRAM_H_
-#define HAL_FMC_SDRAM_H_
+#ifndef HAL_SDRAM_LLD_H_
+#define HAL_SDRAM_LLD_H_
 
 #include "hal_fsmc.h"
 
@@ -113,6 +113,6 @@ extern "C" {
 
 #endif /* STM32_SDRAM_USE_SDRAM */
 
-#endif /* HAL_FSMC_SDRAM_H_ */
+#endif /* HAL_SDRAM_LLD_H_ */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_sram_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_sram_lld.h
index 7af18c4..857a96e 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_sram_lld.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_sram_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef HAL_FSMC_SRAM_H_
-#define HAL_FSMC_SRAM_H_
+#ifndef HAL_SRAM_LLD_H_
+#define HAL_SRAM_LLD_H_
 
 #include "hal_fsmc.h"
 
@@ -86,6 +86,6 @@ extern "C" {
 
 #endif /* STM32_SRAM_USE_SRAM */
 
-#endif /* HAL_FSMC_SRAM_H_ */
+#endif /* HAL_SRAM_LLD_H_ */
 
 /** @} */
diff --git a/os/hal/src/hal_fsmc.c b/os/hal/src/hal_fsmc.c
index 7d30720..c3f2a99 100644
--- a/os/hal/src/hal_fsmc.c
+++ b/os/hal/src/hal_fsmc.c
@@ -71,7 +71,7 @@ void fsmcInit(void) {
 
   if (FSMCD1.state == FSMC_UNINIT) {
     FSMCD1.state  = FSMC_STOP;
-
+#if HAL_USE_SRAM
 #if STM32_SRAM_USE_SRAM1
     FSMCD1.sram1 = (FSMC_SRAM_TypeDef *)(FSMC_Bank1_R_BASE);
 #endif
@@ -87,7 +87,9 @@ void fsmcInit(void) {
 #if STM32_SRAM_USE_SRAM4
     FSMCD1.sram4 = (FSMC_SRAM_TypeDef *)(FSMC_Bank1_R_BASE + 8 * 3);
 #endif
+#endif
 
+#if HAL_USE_NAND
 #if STM32_NAND_USE_NAND1
     FSMCD1.nand1 = (FSMC_NAND_TypeDef *)FSMC_Bank2_R_BASE;
 #endif
@@ -95,7 +97,9 @@ void fsmcInit(void) {
 #if STM32_NAND_USE_NAND2
     FSMCD1.nand2 = (FSMC_NAND_TypeDef *)FSMC_Bank3_R_BASE;
 #endif
+#endif
 
+#if HAL_USE_SDRAM
 #if (defined(STM32F427xx) || defined(STM32F437xx) || \
      defined(STM32F429xx) || defined(STM32F439xx) || \
      defined(STM32F745xx) || defined(STM32F746xx) || \
@@ -106,6 +110,7 @@ void fsmcInit(void) {
     FSMCD1.sdram = (FSMC_SDRAM_TypeDef *)FSMC_Bank5_6_R_BASE;
   #endif
 #endif
+#endif
   }
 }
 
@@ -176,6 +181,7 @@ void fsmcStop(FSMCDriver *fsmcp) {
 CH_IRQ_HANDLER(STM32_FSMC_HANDLER) {
 
   CH_IRQ_PROLOGUE();
+#if HAL_USE_NAND
 #if STM32_NAND_USE_NAND1
   if (FSMCD1.nand1->SR & FSMC_SR_ISR_MASK) {
     NANDD1.isr_handler(&NANDD1);
@@ -186,6 +192,7 @@ CH_IRQ_HANDLER(STM32_FSMC_HANDLER) {
     NANDD2.isr_handler(&NANDD2);
   }
 #endif
+#endif
   CH_IRQ_EPILOGUE();
 }
 
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
index bba7f08..0a5db9b 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/mcuconf_community.h
@@ -34,17 +34,16 @@
 /*
  * FSMC SRAM driver system settings.
  */
-#define STM32_SRAM_USE_SRAM1           FALSE
-#define STM32_SRAM_USE_SRAM2           FALSE
-#define STM32_SRAM_USE_SRAM3           FALSE
-#define STM32_SRAM_USE_SRAM4           FALSE
+#define STM32_SRAM_USE_SRAM1                FALSE
+#define STM32_SRAM_USE_SRAM2                FALSE
+#define STM32_SRAM_USE_SRAM3                FALSE
+#define STM32_SRAM_USE_SRAM4                FALSE
 
 /*
  * FSMC SDRAM driver system settings.
  */
-#define STM32_SDRAM_USE_SDRAM1         FALSE
-#define STM32_SDRAM_USE_SDRAM2         FALSE
-
+#define STM32_SDRAM_USE_SDRAM1              FALSE
+#define STM32_SDRAM_USE_SDRAM2              FALSE
 /*
  * TIMCAP driver system settings.
  */