diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-29 20:16:08 +0100 |
|---|---|---|
| committer | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-29 20:16:08 +0100 |
| commit | 90f32c35466c9edbd59716de66903b3f537f5abb (patch) | |
| tree | 8e1a1006a00d48c6196d0b053f3bf6d6781aae70 /testhal | |
| parent | 97b7064031ed2be5980a59cdab8174a9074febb4 (diff) | |
| download | ChibiOS-Contrib-90f32c35466c9edbd59716de66903b3f537f5abb.tar.gz ChibiOS-Contrib-90f32c35466c9edbd59716de66903b3f537f5abb.tar.bz2 ChibiOS-Contrib-90f32c35466c9edbd59716de66903b3f537f5abb.zip | |
Updating FSMC driver (SRAM part)
Diffstat (limited to 'testhal')
4 files changed, 24 insertions, 27 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h index d1d3ada..9ad41fd 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h +++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h @@ -46,13 +46,6 @@ #endif
/**
- * @brief Enables the NAND subsystem.
- */
-#if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)
-#define HAL_USE_NAND FALSE
-#endif
-
-/**
* @brief Enables the 1-wire subsystem.
*/
#if !defined(HAL_USE_ONEWIRE) || defined(__DOXYGEN__)
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h index da9c607..f9cfcbe 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h +++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h @@ -27,15 +27,22 @@ /**
* @brief Enables the FSMC subsystem.
*/
-#if !defined(HAL_USE_FSMC) || defined(__DOXYGEN__)
-#define HAL_USE_FSMC TRUE
+#if !defined(HAL_USE_FSMC_SDRAM) || defined(__DOXYGEN__)
+#define HAL_USE_FSMC_SDRAM FALSE
#endif
/**
- * @brief Enables the NAND subsystem.
+ * @brief Enables the FSMC subsystem.
+ */
+#if !defined(HAL_USE_FSMC_SRAM) || defined(__DOXYGEN__)
+#define HAL_USE_FSMC_SRAM TRUE
+#endif
+
+/**
+ * @brief Enables the FSMC subsystem.
*/
-#if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)
-#define HAL_USE_NAND FALSE
+#if !defined(HAL_USE_FSMC_NAND) || defined(__DOXYGEN__)
+#define HAL_USE_FSMC_NAND FALSE
#endif
/**
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c b/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c index c94bd73..6413835 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c +++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c @@ -17,7 +17,6 @@ #include "ch.h" #include "hal.h" -#include "hal_fsmc_sram.h" #include "membench.h" #include "memtest.h" diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h index 317fe5d..8abb48d 100644 --- a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h +++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h @@ -22,32 +22,30 @@ #define STM32_FSMC_USE_FSMC1 TRUE #define STM32_FSMC_FSMC1_IRQ_PRIORITY 10 #define STM32_FSMC_DMA_CHN 0x03010201 +#define STM32_FSMC_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_FSMC_DMA_PRIORITY 0 +#define STM32_FSMC_DMA_ERROR_HOOK(nandp) osalSysHalt("FSMC DMA failure") /* * FSMC NAND driver system settings. */ -#define STM32_NAND_USE_FSMC_NAND1 FALSE -#define STM32_NAND_USE_FSMC_NAND2 FALSE -#define STM32_NAND_USE_EXT_INT FALSE -#define STM32_NAND_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) -#define STM32_NAND_DMA_PRIORITY 0 -#define STM32_NAND_DMA_ERROR_HOOK(nandp) osalSysHalt("DMA failure") +#define STM32_FSMC_USE_NAND1 FALSE +#define STM32_FSMC_USE_NAND2 FALSE +#define STM32_FSMC_USE_NAND_EXT_INT FALSE /* * FSMC SRAM driver system settings. */ -#define STM32_USE_FSMC_SRAM TRUE -#define STM32_SRAM_USE_FSMC_SRAM1 FALSE -#define STM32_SRAM_USE_FSMC_SRAM2 FALSE -#define STM32_SRAM_USE_FSMC_SRAM3 FALSE -#define STM32_SRAM_USE_FSMC_SRAM4 TRUE +#define STM32_FSMC_USE_SRAM1 FALSE +#define STM32_FSMC_USE_SRAM2 FALSE +#define STM32_FSMC_USE_SRAM3 FALSE +#define STM32_FSMC_USE_SRAM4 TRUE /* * FSMC SDRAM driver system settings. */ -#define STM32_USE_FSMC_SDRAM FALSE -#define STM32_SDRAM_USE_FSMC_SDRAM1 FALSE -#define STM32_SDRAM_USE_FSMC_SDRAM2 TRUE +#define STM32_FSMC_USE_SDRAM1 FALSE +#define STM32_FSMC_USE_SDRAM2 FALSE /* * TIMCAP driver system settings. |