From 6698a019589ea0ac6be74bee811d2f4d4508df2c Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Sun, 14 Jun 2015 16:11:19 +0200 Subject: [PATCH] boards: removed obsolete GPIO defines - touched pca10000, pca10005, stm32f3discovery, yunjia-nrf51822 --- boards/pca10000/include/periph_conf.h | 42 ------ boards/pca10005/include/periph_conf.h | 42 ------ boards/stm32f3discovery/include/periph_conf.h | 125 ------------------ boards/yunjia-nrf51822/include/periph_conf.h | 26 ---- 4 files changed, 235 deletions(-) diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h index 9b1fee932d..851dbf95ac 100644 --- a/boards/pca10000/include/periph_conf.h +++ b/boards/pca10000/include/periph_conf.h @@ -121,48 +121,6 @@ extern "C" { #define RADIO_IRQ_PRIO 1 /** @} */ -/** - * @name GPIO configuration - * @{ - */ -#define GPIO_NUMOF 16 -#define GPIO_0_EN 1 -#define GPIO_1_EN 1 -#define GPIO_2_EN 1 -#define GPIO_3_EN 1 -#define GPIO_4_EN 1 -#define GPIO_5_EN 1 -#define GPIO_6_EN 1 -#define GPIO_7_EN 1 -#define GPIO_8_EN 1 -#define GPIO_9_EN 1 -#define GPIO_10_EN 1 -#define GPIO_11_EN 1 -#define GPIO_12_EN 1 -#define GPIO_13_EN 1 -#define GPIO_14_EN 1 -#define GPIO_15_EN 1 -#define GPIO_IRQ_PRIO 1 - -/* GPIO pin configuration */ -#define GPIO_0_PIN 0 -#define GPIO_1_PIN 1 -#define GPIO_2_PIN 2 -#define GPIO_3_PIN 3 -#define GPIO_4_PIN 4 -#define GPIO_5_PIN 5 -#define GPIO_6_PIN 6 -#define GPIO_7_PIN 7 -#define GPIO_8_PIN 8 -#define GPIO_9_PIN 9 -#define GPIO_10_PIN 10 -#define GPIO_11_PIN 11 -#define GPIO_12_PIN 12 -#define GPIO_13_PIN 13 -#define GPIO_14_PIN 14 -#define GPIO_15_PIN 15 -/** @} */ - #ifdef __cplusplus } #endif diff --git a/boards/pca10005/include/periph_conf.h b/boards/pca10005/include/periph_conf.h index d935a6069c..502c070402 100644 --- a/boards/pca10005/include/periph_conf.h +++ b/boards/pca10005/include/periph_conf.h @@ -140,48 +140,6 @@ extern "C" { #define RADIO_IRQ_PRIO 1 /** @} */ -/** - * @name GPIO configuration - * @{ - */ -#define GPIO_NUMOF 16 -#define GPIO_0_EN 1 -#define GPIO_1_EN 1 -#define GPIO_2_EN 1 -#define GPIO_3_EN 1 -#define GPIO_4_EN 1 -#define GPIO_5_EN 1 -#define GPIO_6_EN 1 -#define GPIO_7_EN 1 -#define GPIO_8_EN 1 -#define GPIO_9_EN 1 -#define GPIO_10_EN 1 -#define GPIO_11_EN 1 -#define GPIO_12_EN 1 -#define GPIO_13_EN 1 -#define GPIO_14_EN 1 -#define GPIO_15_EN 1 -#define GPIO_IRQ_PRIO 1 - -/* GPIO pin configuration */ -#define GPIO_0_PIN 0 -#define GPIO_1_PIN 1 -#define GPIO_2_PIN 2 -#define GPIO_3_PIN 3 -#define GPIO_4_PIN 4 -#define GPIO_5_PIN 5 -#define GPIO_6_PIN 6 -#define GPIO_7_PIN 7 -#define GPIO_8_PIN 8 -#define GPIO_9_PIN 9 -#define GPIO_10_PIN 10 -#define GPIO_11_PIN 11 -#define GPIO_12_PIN 12 -#define GPIO_13_PIN 13 -#define GPIO_14_PIN 14 -#define GPIO_15_PIN 15 -/** @} */ - #ifdef __cplusplus } #endif diff --git a/boards/stm32f3discovery/include/periph_conf.h b/boards/stm32f3discovery/include/periph_conf.h index 2c346c5ba9..b7f5ed86c3 100644 --- a/boards/stm32f3discovery/include/periph_conf.h +++ b/boards/stm32f3discovery/include/periph_conf.h @@ -244,131 +244,6 @@ extern "C" { #define I2C_1_SDA_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOFEN) /** @} */ -/** - * @brief GPIO configuration - * @{ - */ - -#define GPIO_NUMOF 12 -#define GPIO_0_EN 1 -#define GPIO_1_EN 1 -#define GPIO_2_EN 1 -#define GPIO_3_EN 1 -#define GPIO_4_EN 1 -#define GPIO_5_EN 1 -#define GPIO_6_EN 1 -#define GPIO_7_EN 1 -#define GPIO_8_EN 1 -#define GPIO_9_EN 1 -#define GPIO_10_EN 1 -#define GPIO_11_EN 1 -#define GPIO_IRQ_PRIO 1 - -/* IRQ config */ -#define GPIO_IRQ_0 GPIO_11 /* alternatively GPIO_4 could be used here */ -#define GPIO_IRQ_1 GPIO_5 -#define GPIO_IRQ_2 GPIO_0 -#define GPIO_IRQ_3 GPIO_3 -#define GPIO_IRQ_4 GPIO_1 -#define GPIO_IRQ_5 GPIO_2 -#define GPIO_IRQ_6 (-1) /* not configured */ -#define GPIO_IRQ_7 (-1) /* not configured */ -#define GPIO_IRQ_8 (-1) /* not configured */ -#define GPIO_IRQ_9 (-1) /* not configured */ -#define GPIO_IRQ_10 (-1) /* not configured */ -#define GPIO_IRQ_11 GPIO_6 -#define GPIO_IRQ_12 GPIO_7 -#define GPIO_IRQ_13 GPIO_8 -#define GPIO_IRQ_14 GPIO_9 -#define GPIO_IRQ_15 GPIO_10 - -/* GPIO channel 0 config */ -#define GPIO_0_PORT GPIOE /* LSM303DLHC -> DRDY */ -#define GPIO_0_PIN 2 -#define GPIO_0_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_0_EXTI_CFG1() (SYSCFG->EXTICR[0] &= ~(SYSCFG_EXTICR1_EXTI2)) -#define GPIO_0_EXTI_CFG2() (SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI2_PE) -#define GPIO_0_IRQ EXTI2_TSC_IRQn - -/* GPIO channel 1 config */ -#define GPIO_1_PORT GPIOE /* LSM303DLHC -> INT1 */ -#define GPIO_1_PIN 4 -#define GPIO_1_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_1_EXTI_CFG1() (SYSCFG->EXTICR[1] &= ~(SYSCFG_EXTICR2_EXTI4)) -#define GPIO_1_EXTI_CFG2() (SYSCFG->EXTICR[1] |= SYSCFG_EXTICR2_EXTI4_PE) -#define GPIO_1_IRQ EXTI4_IRQn -/* GPIO channel 2 config */ -#define GPIO_2_PORT GPIOE /* LSM303DLHC -> INT2 */ -#define GPIO_2_PIN 5 -#define GPIO_2_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_2_EXTI_CFG1() (SYSCFG->EXTICR[1] &= ~(SYSCFG_EXTICR2_EXTI5)) -#define GPIO_2_EXTI_CFG2() (SYSCFG->EXTICR[1] |= SYSCFG_EXTICR2_EXTI5_PE) -#define GPIO_2_IRQ EXTI9_5_IRQn -/* GPIO channel 3 config */ -#define GPIO_3_PORT GPIOE /* L2GD20 -> CS */ -#define GPIO_3_PIN 3 -#define GPIO_3_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_3_EXTI_CFG1() (SYSCFG->EXTICR[0] &= ~(SYSCFG_EXTICR1_EXTI3)) -#define GPIO_3_EXTI_CFG2() (SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI3_PE) -#define GPIO_3_IRQ EXTI3_IRQn -/* GPIO channel 4 config */ -#define GPIO_4_PORT GPIOE /* L2GD20 -> INT1 */ -#define GPIO_4_PIN 0 -#define GPIO_4_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_4_EXTI_CFG1() (SYSCFG->EXTICR[0] &= ~(SYSCFG_EXTICR1_EXTI0)) -#define GPIO_4_EXTI_CFG2() (SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI0_PE) -#define GPIO_4_IRQ EXTI0_IRQn -/* GPIO channel 5 config */ -#define GPIO_5_PORT GPIOE /* L2GD20 -> INT2/DRDY */ -#define GPIO_5_PIN 1 -#define GPIO_5_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOEEN) -#define GPIO_5_EXTI_CFG1() (SYSCFG->EXTICR[0] &= ~(SYSCFG_EXTICR1_EXTI1)) -#define GPIO_5_EXTI_CFG2() (SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI1_PE) -#define GPIO_5_IRQ EXTI1_IRQn -/* GPIO channel 6 config */ -#define GPIO_6_PORT GPIOB -#define GPIO_6_PIN 11 -#define GPIO_6_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOBEN) -#define GPIO_6_EXTI_CFG1() (SYSCFG->EXTICR[2] &= ~(SYSCFG_EXTICR3_EXTI11)) -#define GPIO_6_EXTI_CFG2() (SYSCFG->EXTICR[2] |= SYSCFG_EXTICR3_EXTI11_PB) -#define GPIO_6_IRQ EXTI15_10_IRQn -/* GPIO channel 7 config */ -#define GPIO_7_PORT GPIOB -#define GPIO_7_PIN 12 -#define GPIO_7_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOBEN) -#define GPIO_7_EXTI_CFG1() (SYSCFG->EXTICR[3] &= ~(SYSCFG_EXTICR4_EXTI12)) -#define GPIO_7_EXTI_CFG2() (SYSCFG->EXTICR[3] |= SYSCFG_EXTICR4_EXTI12_PB) -#define GPIO_7_IRQ EXTI15_10_IRQn -/* GPIO channel 8 config */ -#define GPIO_8_PORT GPIOB -#define GPIO_8_PIN 13 -#define GPIO_8_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOBEN) -#define GPIO_8_EXTI_CFG1() (SYSCFG->EXTICR[3] &= ~(SYSCFG_EXTICR4_EXTI13)) -#define GPIO_8_EXTI_CFG2() (SYSCFG->EXTICR[3] |= SYSCFG_EXTICR4_EXTI13_PB) -#define GPIO_8_IRQ EXTI15_10_IRQn -/* GPIO channel 9 config */ -#define GPIO_9_PORT GPIOB -#define GPIO_9_PIN 14 -#define GPIO_9_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOBEN) -#define GPIO_9_EXTI_CFG1() (SYSCFG->EXTICR[3] &= ~(SYSCFG_EXTICR4_EXTI14)) -#define GPIO_9_EXTI_CFG2() (SYSCFG->EXTICR[3] |= SYSCFG_EXTICR4_EXTI14_PB) -#define GPIO_9_IRQ EXTI15_10_IRQn -/* GPIO channel 10 config */ -#define GPIO_10_PORT GPIOB -#define GPIO_10_PIN 15 -#define GPIO_10_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOBEN) -#define GPIO_10_EXTI_CFG1() (SYSCFG->EXTICR[3] &= ~(SYSCFG_EXTICR4_EXTI15)) -#define GPIO_10_EXTI_CFG2() (SYSCFG->EXTICR[3] |= SYSCFG_EXTICR4_EXTI15_PB) -#define GPIO_10_IRQ EXTI15_10_IRQn -/* GPIO channel 11 config */ -#define GPIO_11_PORT GPIOA /* User button 1 */ -#define GPIO_11_PIN 0 -#define GPIO_11_CLKEN() (RCC->AHBENR |= RCC_AHBENR_GPIOAEN) -#define GPIO_11_EXTI_CFG1() (SYSCFG->EXTICR[0] &= ~(SYSCFG_EXTICR1_EXTI0)) -#define GPIO_11_EXTI_CFG2() (SYSCFG->EXTICR[0] |= SYSCFG_EXTICR1_EXTI0_PA) -#define GPIO_11_IRQ EXTI0_IRQn -/** @} */ - #ifdef __cplusplus } #endif diff --git a/boards/yunjia-nrf51822/include/periph_conf.h b/boards/yunjia-nrf51822/include/periph_conf.h index d4144a17b8..f32d3a6319 100644 --- a/boards/yunjia-nrf51822/include/periph_conf.h +++ b/boards/yunjia-nrf51822/include/periph_conf.h @@ -138,32 +138,6 @@ extern "C" { #define RADIO_IRQ_PRIO 1 /** @} */ -/** - * @name GPIO configuration - * @{ - */ -#define GPIO_NUMOF (8U) -#define GPIO_0_EN 1 -#define GPIO_1_EN 1 -#define GPIO_2_EN 1 -#define GPIO_3_EN 1 -#define GPIO_4_EN 1 -#define GPIO_5_EN 1 -#define GPIO_6_EN 1 -#define GPIO_7_EN 1 -#define GPIO_IRQ_PRIO 1 - -/* GPIO pin configuration */ -#define GPIO_0_PIN 7 -#define GPIO_1_PIN 8 -#define GPIO_2_PIN 9 -#define GPIO_3_PIN 10 -#define GPIO_4_PIN 11 -#define GPIO_5_PIN 12 -#define GPIO_6_PIN 13 -#define GPIO_7_PIN 14 -/** @} */ - #ifdef __cplusplus } #endif