aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32/STM32F4xx/FSMC_SRAM
diff options
context:
space:
mode:
Diffstat (limited to 'testhal/STM32/STM32F4xx/FSMC_SRAM')
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h14
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_SRAM/main.c5
-rw-r--r--testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h18
3 files changed, 24 insertions, 13 deletions
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
index da9c607..a19553b 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
@@ -32,6 +32,20 @@
#endif
/**
+ * @brief Enables the SDRAM subsystem.
+ */
+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)
+#define HAL_USE_SDRAM FALSE
+#endif
+
+/**
+ * @brief Enables the SRAM subsystem.
+ */
+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)
+#define HAL_USE_SRAM TRUE
+#endif
+
+/**
* @brief Enables the NAND subsystem.
*/
#if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c b/testhal/STM32/STM32F4xx/FSMC_SRAM/main.c
index c94bd73..4bd94f8 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"
@@ -173,8 +172,8 @@ int main(void) {
halInit();
chSysInit();
- fsmcSramInit();
- fsmcSramStart(&SRAMD4, &sram_cfg);
+ sramInit();
+ sramStart(&SRAMD4, &sram_cfg);
membench();
memtest();
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
index 317fe5d..b601a5f 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/mcuconf_community.h
@@ -26,8 +26,8 @@
/*
* FSMC NAND driver system settings.
*/
-#define STM32_NAND_USE_FSMC_NAND1 FALSE
-#define STM32_NAND_USE_FSMC_NAND2 FALSE
+#define STM32_NAND_USE_NAND1 FALSE
+#define STM32_NAND_USE_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
@@ -36,18 +36,16 @@
/*
* 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_SRAM_USE_SRAM1 FALSE
+#define STM32_SRAM_USE_SRAM2 FALSE
+#define STM32_SRAM_USE_SRAM3 FALSE
+#define STM32_SRAM_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_SDRAM_USE_SDRAM1 FALSE
+#define STM32_SDRAM_USE_SDRAM2 FALSE
/*
* TIMCAP driver system settings.