diff options
Diffstat (limited to 'os/hal/include')
| -rw-r--r-- | os/hal/include/fsmc/sram.h | 32 | ||||
| -rw-r--r-- | os/hal/include/hal_fsmc.h | 12 |
2 files changed, 22 insertions, 22 deletions
diff --git a/os/hal/include/fsmc/sram.h b/os/hal/include/fsmc/sram.h index 6eed97a..4a19246 100644 --- a/os/hal/include/fsmc/sram.h +++ b/os/hal/include/fsmc/sram.h @@ -43,32 +43,32 @@ * @brief SRAM driver enable switch. * @details If set to @p TRUE the support for SRAM1 is included. */ -#if !defined(STM32_SRAM_USE_FSMC_SRAM1) || defined(__DOXYGEN__) -#define STM32_SRAM_USE_FSMC_SRAM1 FALSE +#if !defined(STM32_FSMC_USE_SRAM1) || defined(__DOXYGEN__) +#define STM32_FSMC_USE_SRAM1 FALSE #endif /** * @brief SRAM driver enable switch. * @details If set to @p TRUE the support for SRAM2 is included. */ -#if !defined(STM32_SRAM_USE_FSMC_SRAM2) || defined(__DOXYGEN__) -#define STM32_SRAM_USE_FSMC_SRAM2 FALSE +#if !defined(STM32_FSMC_USE_SRAM2) || defined(__DOXYGEN__) +#define STM32_FSMC_USE_SRAM2 FALSE #endif /** * @brief SRAM driver enable switch. * @details If set to @p TRUE the support for SRAM3 is included. */ -#if !defined(STM32_SRAM_USE_FSMC_SRAM3) || defined(__DOXYGEN__) -#define STM32_SRAM_USE_FSMC_SRAM3 FALSE +#if !defined(STM32_FSMC_USE_SRAM3) || defined(__DOXYGEN__) +#define STM32_FSMC_USE_SRAM3 FALSE #endif /** * @brief SRAM driver enable switch. * @details If set to @p TRUE the support for SRAM4 is included. */ -#if !defined(STM32_SRAM_USE_FSMC_SRAM4) || defined(__DOXYGEN__) -#define STM32_SRAM_USE_FSMC_SRAM4 FALSE +#if !defined(STM32_FSMC_USE_SRAM4) || defined(__DOXYGEN__) +#define STM32_FSMC_USE_SRAM4 FALSE #endif /** @} */ @@ -77,13 +77,13 @@ /* Derived constants and error checks. */ /*===========================================================================*/ -#if !STM32_SRAM_USE_FSMC_SRAM1 && !STM32_SRAM_USE_FSMC_SRAM2 && \ - !STM32_SRAM_USE_FSMC_SRAM3 && !STM32_SRAM_USE_FSMC_SRAM4 +#if !STM32_FSMC_USE_SRAM1 && !STM32_FSMC_USE_SRAM2 && \ + !STM32_FSMC_USE_SRAM3 && !STM32_FSMC_USE_SRAM4 #error "SRAM driver activated but no SRAM peripheral assigned" #endif -#if (STM32_SRAM_USE_FSMC_SRAM1 || STM32_SRAM_USE_FSMC_SRAM2 || \ - STM32_SRAM_USE_FSMC_SRAM3 || STM32_SRAM_USE_FSMC_SRAM4) && !STM32_HAS_FSMC +#if (STM32_FSMC_USE_SRAM1 || STM32_FSMC_USE_SRAM2 || \ + STM32_FSMC_USE_SRAM3 || STM32_FSMC_USE_SRAM4) && !STM32_HAS_FSMC #error "FSMC not present in the selected device" #endif @@ -137,19 +137,19 @@ struct SRAMDriver { /* External declarations. */ /*===========================================================================*/ -#if STM32_SRAM_USE_FSMC_SRAM1 && !defined(__DOXYGEN__) +#if STM32_FSMC_USE_SRAM1 && !defined(__DOXYGEN__) extern SRAMDriver SRAMD1; #endif -#if STM32_SRAM_USE_FSMC_SRAM2 && !defined(__DOXYGEN__) +#if STM32_FSMC_USE_SRAM2 && !defined(__DOXYGEN__) extern SRAMDriver SRAMD2; #endif -#if STM32_SRAM_USE_FSMC_SRAM3 && !defined(__DOXYGEN__) +#if STM32_FSMC_USE_SRAM3 && !defined(__DOXYGEN__) extern SRAMDriver SRAMD3; #endif -#if STM32_SRAM_USE_FSMC_SRAM4 && !defined(__DOXYGEN__) +#if STM32_FSMC_USE_SRAM4 && !defined(__DOXYGEN__) extern SRAMDriver SRAMD4; #endif diff --git a/os/hal/include/hal_fsmc.h b/os/hal/include/hal_fsmc.h index f85079a..834fa8d 100644 --- a/os/hal/include/hal_fsmc.h +++ b/os/hal/include/hal_fsmc.h @@ -327,25 +327,25 @@ struct FSMCDriver { /* End of the mandatory fields.*/ #if HAL_USE_FSMC_SRAM - #if STM32_SRAM_USE_FSMC_SRAM1 + #if STM32_FSMC_USE_SRAM1 FSMC_SRAM_NOR_TypeDef *sram1; #endif - #if STM32_SRAM_USE_FSMC_SRAM2 + #if STM32_FSMC_USE_SRAM2 FSMC_SRAM_NOR_TypeDef *sram2; #endif - #if STM32_SRAM_USE_FSMC_SRAM3 + #if STM32_FSMC_USE_SRAM3 FSMC_SRAM_NOR_TypeDef *sram3; #endif - #if STM32_SRAM_USE_FSMC_SRAM4 + #if STM32_FSMC_USE_SRAM4 FSMC_SRAM_NOR_TypeDef *sram4; #endif #endif #if HAL_USE_FSMC_NAND - #if STM32_NAND_USE_FSMC_NAND1 + #if STM32_FSMC_USE_NAND1 FSMC_NAND_TypeDef *nand1; #endif - #if STM32_NAND_USE_FSMC_NAND2 + #if STM32_FSMC_USE_NAND1 FSMC_NAND_TypeDef *nand2; #endif #endif |