boards/fox: adjusted GPIO defines in periph_conf.h

RIOT-OS · Aug 12, 2015 · 5671932 · 5671932
1 parent af4bc11
commit 5671932
Showing 1 changed file with 9 additions and 25 deletions.
diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h
@@ -94,11 +94,8 @@ extern "C" {
 #define UART_0_ISR          isr_usart2
 #define UART_0_BUS_FREQ     36000000
 /* UART 0 pin configuration */
-#define UART_0_PORT         GPIOA
-#define UART_0_PORT_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_IOPAEN)
-#define UART_0_RX_PIN       3
-#define UART_0_TX_PIN       2
-#define UART_0_AF           1
+#define UART_0_RX_PIN       GPIO(PORT_A,3)
+#define UART_0_TX_PIN       GPIO(PORT_A,2)
 
 /* UART 1 device configuration */
 #define UART_1_DEV          USART1
@@ -107,11 +104,8 @@ extern "C" {
 #define UART_1_ISR          isr_usart1
 #define UART_1_BUS_FREQ     72000000
 /* UART 1 pin configuration */
-#define UART_1_PORT         GPIOA
-#define UART_1_PORT_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_IOPAEN)
-#define UART_1_RX_PIN       10
-#define UART_1_TX_PIN       9
-#define UART_1_AF           0
+#define UART_1_RX_PIN       GPIO(PORT_A,10)
+#define UART_1_TX_PIN       GPIO(PORT_A,9)
 /** @} */
 
 /**
@@ -127,15 +121,9 @@ extern "C" {
 #define SPI_0_CLKDIS()          (RCC->APB1ENR &= ~(RCC_APB1ENR_SPI2EN))
 #define SPI_0_BUS_DIV           0   /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
 /* SPI 0 pin configuration */
-#define SPI_0_CLK_PORT          GPIOB
-#define SPI_0_CLK_PIN           13
-#define SPI_0_CLK_PORT_CLKEN()  (RCC->APB2ENR |= RCC_APB2ENR_IOPBEN)
-#define SPI_0_MOSI_PORT         GPIOB
-#define SPI_0_MOSI_PIN          15
-#define SPI_0_MOSI_PORT_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_IOPBEN)
-#define SPI_0_MISO_PORT         GPIOB
-#define SPI_0_MISO_PIN          14
-#define SPI_0_MISO_PORT_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_IOPBEN)
+#define SPI_0_CLK_PIN           GPIO(PORT_B,13)
+#define SPI_0_MOSI_PIN          GPIO(PORT_B,15)
+#define SPI_0_MISO_PIN          GPIO(PORT_B,14)
 /** @} */
 
 /**
@@ -171,12 +159,8 @@ extern "C" {
 #define I2C_0_ERR_IRQ       I2C1_ER_IRQn
 #define I2C_0_ERR_ISR       isr_i2c1_er
 /* I2C 0 pin configuration */
-#define I2C_0_SCL_PORT      GPIOB
-#define I2C_0_SCL_PIN       6
-#define I2C_0_SCL_CLKEN()   (RCC->APB2ENR |= RCC_APB2ENR_IOPBEN)
-#define I2C_0_SDA_PORT      GPIOB
-#define I2C_0_SDA_PIN       7
-#define I2C_0_SDA_CLKEN()   (RCC->APB2ENR |= RCC_APB2ENR_IOPBEN)
+#define I2C_0_SCL_PIN       GPIO(PORT_B,6)
+#define I2C_0_SDA_PIN       GPIO(PORT_B,7)
 /** @} */
 
 #ifdef __cplusplus