From 00735a2a0132f9981279d5c46855280f0314c6db Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 2 Oct 2014 12:06:56 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7348 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c | 10 ++-------- os/hal/ports/STM32/STM32F0xx/stm32_registry.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'os') diff --git a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c index 3e83cc2b3..49f9a7d3d 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c +++ b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c @@ -36,14 +36,8 @@ RCC_AHBENR_GPIOEEN | RCC_AHBENR_GPIOHEN) #define AHB_LPEN_MASK AHB_EN_MASK -#elif defined(STM32F030) || defined(STM32F0XX_MD) -#define AHB_EN_MASK (RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN | \ - RCC_AHBENR_GPIOCEN | RCC_AHBENR_GPIODEN | \ - RCC_AHBENR_GPIOFEN) - -#elif defined(STM32F0XX_LD) -#define AHB_EN_MASK (RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN | \ - RCC_AHBENR_GPIOCEN | RCC_AHBENR_GPIOFEN) +#elif defined(STM32F0XX) +#define AHB_EN_MASK STM32_GPIO_EN_MASK #elif defined(STM32F3XX) || defined(STM32F37X) #define AHB_EN_MASK STM32_GPIO_EN_MASK diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h index 138745f16..590ed02b4 100644 --- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h @@ -89,6 +89,11 @@ #define STM32_HAS_GPIOG FALSE #define STM32_HAS_GPIOH FALSE #define STM32_HAS_GPIOI FALSE +#define STM32_GPIO_EN_MASK (RCC_AHBENR_GPIOAEN | \ + RCC_AHBENR_GPIOBEN | \ + RCC_AHBENR_GPIOCEN | \ + RCC_AHBENR_GPIODEN | \ + RCC_AHBENR_GPIOFEN) /* I2C attributes.*/ #define STM32_HAS_I2C1 TRUE @@ -227,6 +232,10 @@ #define STM32_HAS_GPIOG FALSE #define STM32_HAS_GPIOH FALSE #define STM32_HAS_GPIOI FALSE +#define STM32_GPIO_EN_MASK (RCC_AHBENR_GPIOAEN | \ + RCC_AHBENR_GPIOBEN | \ + RCC_AHBENR_GPIOCEN | \ + RCC_AHBENR_GPIOFEN) /* I2C attributes.*/ #define STM32_HAS_I2C1 TRUE @@ -350,6 +359,11 @@ #define STM32_HAS_GPIOG FALSE #define STM32_HAS_GPIOH FALSE #define STM32_HAS_GPIOI FALSE +#define STM32_GPIO_EN_MASK (RCC_AHBENR_GPIOAEN | \ + RCC_AHBENR_GPIOBEN | \ + RCC_AHBENR_GPIOCEN | \ + RCC_AHBENR_GPIODEN | \ + RCC_AHBENR_GPIOFEN) /* I2C attributes.*/ #define STM32_HAS_I2C1 TRUE -- cgit v1.2.3