From c997dcd4f4d4c1a2cba55dc4bb5998e3ec3e03da Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Mon, 26 Mar 2012 17:04:06 -0400 Subject: stm32.h: Add STM32_HAVE_FSMC. This is a feature test macro for the flexible static memory controller (FSMC) peripheral. Signed-off-by: Marti Bolivar --- libmaple/include/libmaple/stm32.h | 3 +++ libmaple/stm32f1/include/series/stm32.h | 2 ++ libmaple/stm32f2/include/series/stm32.h | 9 ++------- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libmaple') diff --git a/libmaple/include/libmaple/stm32.h b/libmaple/include/libmaple/stm32.h index 3f86faa..d6f3304 100644 --- a/libmaple/include/libmaple/stm32.h +++ b/libmaple/include/libmaple/stm32.h @@ -55,6 +55,9 @@ extern "C" { * * - Everything enclosed in the following __DOXYGEN_PREDEFINED_HACK * conditional block. + * + * - STM32_HAVE_FSMC: 1 if the MCU has the FSMC peripheral, and 0 + * otherwise. */ #include diff --git a/libmaple/stm32f1/include/series/stm32.h b/libmaple/stm32f1/include/series/stm32.h index 86f0294..26c45a2 100644 --- a/libmaple/stm32f1/include/series/stm32.h +++ b/libmaple/stm32f1/include/series/stm32.h @@ -58,8 +58,10 @@ extern "C" { #ifdef STM32_MEDIUM_DENSITY # define STM32_NR_INTERRUPTS 43 +# define STM32_HAVE_FSMC 0 #elif defined(STM32_HIGH_DENSITY) # define STM32_NR_INTERRUPTS 60 +# define STM32_HAVE_FSMC 1 #else #error "Unsupported STM32F1 density, or no density specified. Add something " \ "like -DSTM32_MEDIUM_DENSITY to your compiler arguments." diff --git a/libmaple/stm32f2/include/series/stm32.h b/libmaple/stm32f2/include/series/stm32.h index 29e789f..222608d 100644 --- a/libmaple/stm32f2/include/series/stm32.h +++ b/libmaple/stm32f2/include/series/stm32.h @@ -52,22 +52,17 @@ extern "C" { #define STM32_DELAY_US_MULT 20 /* FIXME: dummy value. */ #endif -/* - * Interrupts - */ - -#define STM32_NR_INTERRUPTS 81 - /* * Series- and MCU-specific values */ #define STM32_MCU_SERIES STM32_SERIES_F2 +#define STM32_NR_INTERRUPTS 81 +#define STM32_HAVE_FSMC 1 #if defined(MCU_STM32F207IC) || defined(MCU_STM32F207IG) # define STM32_NR_GPIO_PORTS 9 # define STM32_SRAM_END ((void*)0x20020000) - #else #error "Unrecognized STM32F2 MCU, or no MCU specified." #endif -- cgit v1.2.3