RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:12:57 +01:00
Code Releases Activity

boards: s/GPIO(x,y)/GPIO_PIN(x,y)/

Browse Source
This commit is contained in:
Hauke Petersen 2015-09-15 11:45:21 +02:00 committed by Thomas Eichinger
parent 0ce94291ac
commit e395dfd91e
17 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
boards/fox/include/board.h
View File

@ -52,10 +52,10 @@ extern "C" {
* @{
*/
#define AT86RF231_SPI SPI_0
#define AT86RF231_CS GPIO(PORT_A,1)
#define AT86RF231_INT GPIO(PORT_C,2)
#define AT86RF231_RESET GPIO(PORT_C,1)
#define AT86RF231_SLEEP GPIO(PORT_A,0)
#define AT86RF231_CS GPIO_PIN(PORT_A,1)
#define AT86RF231_INT GPIO_PIN(PORT_C,2)
#define AT86RF231_RESET GPIO_PIN(PORT_C,1)
#define AT86RF231_SLEEP GPIO_PIN(PORT_A,0)
/** @} */
/**
@ -72,8 +72,8 @@ extern "C" {
*/
#define L3G4200D_I2C I2C_0
#define L3G4200D_ADDR 0x68
#define L3G4200D_DRDY GPIO(PORT_B,8)
#define L3G4200D_INT GPIO(PORT_B,11)
#define L3G4200D_DRDY GPIO_PIN(PORT_B,8)
#define L3G4200D_INT GPIO_PIN(PORT_B,11)
/** @} */
/**
@ -83,9 +83,9 @@ extern "C" {
#define LSM303DLHC_I2C I2C_0
#define LSM303DLHC_ACC_ADDR (25)
#define LSM303DLHC_MAG_ADDR (30)
#define LSM303DLHC_INT1 GPIO(PORT_B,9)
#define LSM303DLHC_INT2 GPIO(PORT_B,5)
#define LSM303DLHC_DRDY GPIO(PORT_A,9)
#define LSM303DLHC_INT1 GPIO_PIN(PORT_B,9)
#define LSM303DLHC_INT2 GPIO_PIN(PORT_B,5)
#define LSM303DLHC_DRDY GPIO_PIN(PORT_A,9)
/** @} */
/**
@ -94,10 +94,10 @@ extern "C" {
*/
#define LED_RED_PORT (GPIOB)
#define LED_RED_PIN (10)
#define LED_RED_GPIO GPIO(PORT_B,10)
#define LED_RED_GPIO GPIO_PIN(PORT_B,10)
#define LED_GREEN_PORT (GPIOB)
#define LED_GREEN_PIN (12)
#define LED_GREEN_GPIO GPIO(PORT_B,12)
#define LED_GREEN_GPIO GPIO_PIN(PORT_B,12)
/** @} */
/**

26
boards/fox/include/periph_conf.h
View File

@ -94,8 +94,8 @@ extern "C" {
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ 36000000
/* UART 0 pin configuration */
#define UART_0_RX_PIN GPIO(PORT_A,3)
#define UART_0_TX_PIN GPIO(PORT_A,2)
#define UART_0_RX_PIN GPIO_PIN(PORT_A,3)
#define UART_0_TX_PIN GPIO_PIN(PORT_A,2)
/* UART 1 device configuration */
#define UART_1_DEV USART1
@ -104,8 +104,8 @@ extern "C" {
#define UART_1_ISR isr_usart1
#define UART_1_BUS_FREQ 72000000
/* UART 1 pin configuration */
#define UART_1_RX_PIN GPIO(PORT_A,10)
#define UART_1_TX_PIN GPIO(PORT_A,9)
#define UART_1_RX_PIN GPIO_PIN(PORT_A,10)
#define UART_1_TX_PIN GPIO_PIN(PORT_A,9)
/** @} */
/**
@ -116,14 +116,14 @@ extern "C" {
#define SPI_0_EN 1
/* SPI 0 device configuration */
#define SPI_0_DEV SPI2
#define SPI_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_SPI2EN)
#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 */
#define SPI_0_DEV SPI2
#define SPI_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_SPI2EN)
#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_PIN GPIO(PORT_B,13)
#define SPI_0_MOSI_PIN GPIO(PORT_B,15)
#define SPI_0_MISO_PIN GPIO(PORT_B,14)
#define SPI_0_CLK_PIN GPIO_PIN(PORT_B,13)
#define SPI_0_MOSI_PIN GPIO_PIN(PORT_B,15)
#define SPI_0_MISO_PIN GPIO_PIN(PORT_B,14)
/** @} */
/**
@ -159,8 +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_PIN GPIO(PORT_B,6)
#define I2C_0_SDA_PIN GPIO(PORT_B,7)
#define I2C_0_SCL_PIN GPIO_PIN(PORT_B,6)
#define I2C_0_SDA_PIN GPIO_PIN(PORT_B,7)
/** @} */
#ifdef __cplusplus

30
boards/iotlab-m3/include/board.h
View File

@ -57,10 +57,10 @@ extern "C" {
* @{
*/
#define AT86RF231_SPI SPI_0
#define AT86RF231_CS GPIO(PORT_A,4)
#define AT86RF231_INT GPIO(PORT_C,4)
#define AT86RF231_RESET GPIO(PORT_C,1)
#define AT86RF231_SLEEP GPIO(PORT_A,2)
#define AT86RF231_CS GPIO_PIN(PORT_A,4)
#define AT86RF231_INT GPIO_PIN(PORT_C,4)
#define AT86RF231_RESET GPIO_PIN(PORT_C,1)
#define AT86RF231_SLEEP GPIO_PIN(PORT_A,2)
#define AT86RF231_SPI_CLK SPI_SPEED_5MHZ
/** @} */
@ -69,9 +69,9 @@ extern "C" {
* @{
*/
#define EXTFLASH_SPI SPI_1
#define EXTFLASH_CS GPIO(PORT_A,11)
#define EXTFLASH_WRITE GPIO(PORT_C,6)
#define EXTFLASH_HOLD GPIO(PORT_C,9)
#define EXTFLASH_CS GPIO_PIN(PORT_A,11)
#define EXTFLASH_WRITE GPIO_PIN(PORT_C,6)
#define EXTFLASH_HOLD GPIO_PIN(PORT_C,9)
/** @} */
/**
@ -96,8 +96,8 @@ extern "C" {
*/
#define L3G4200D_I2C I2C_0
#define L3G4200D_ADDR 0x68
#define L3G4200D_DRDY GPIO(PORT_C,0)
#define L3G4200D_INT GPIO(PORT_C,5)
#define L3G4200D_DRDY GPIO_PIN(PORT_C,0)
#define L3G4200D_INT GPIO_PIN(PORT_C,5)
/** @} */
/**
@ -107,9 +107,9 @@ extern "C" {
#define LSM303DLHC_I2C I2C_0
#define LSM303DLHC_ACC_ADDR (0x19)
#define LSM303DLHC_MAG_ADDR (0x1e)
#define LSM303DLHC_INT1 GPIO(PORT_B,12)
#define LSM303DLHC_INT2 GPIO(PORT_B,1)
#define LSM303DLHC_DRDY GPIO(PORT_B,2)
#define LSM303DLHC_INT1 GPIO_PIN(PORT_B,12)
#define LSM303DLHC_INT2 GPIO_PIN(PORT_B,1)
#define LSM303DLHC_DRDY GPIO_PIN(PORT_B,2)
/** @} */
/**
@ -118,13 +118,13 @@ extern "C" {
*/
#define LED_RED_PORT (GPIOD)
#define LED_RED_PIN (2)
#define LED_RED_GPIO GPIO(PORT_D,2)
#define LED_RED_GPIO GPIO_PIN(PORT_D,2)
#define LED_GREEN_PORT (GPIOB)
#define LED_GREEN_PIN (5)
#define LED_GREEN_GPIO GPIO(PORT_B,5)
#define LED_GREEN_GPIO GPIO_PIN(PORT_B,5)
#define LED_ORANGE_PORT (GPIOC)
#define LED_ORANGE_PIN (10)
#define LED_ORANGE_GPIO GPIO(PORT_C,10)
#define LED_ORANGE_GPIO GPIO_PIN(PORT_C,10)
/** @} */
/**

26
boards/iotlab-m3/include/periph_conf.h
View File

@ -95,8 +95,8 @@ extern "C" {
#define UART_0_ISR isr_usart1
#define UART_0_BUS_FREQ 72000000
/* UART 0 pin configuration */
#define UART_0_RX_PIN GPIO(PORT_A,10)
#define UART_0_TX_PIN GPIO(PORT_A,9)
#define UART_0_RX_PIN GPIO_PIN(PORT_A,10)
#define UART_0_TX_PIN GPIO_PIN(PORT_A,9)
/* UART 1 device configuration */
#define UART_1_DEV USART2
@ -105,8 +105,8 @@ extern "C" {
#define UART_1_ISR isr_usart2
#define UART_1_BUS_FREQ 36000000
/* UART 1 pin configuration */
#define UART_1_RX_PIN GPIO(PORT_A,3)
#define UART_1_TX_PIN GPIO(PORT_A,2)
#define UART_1_RX_PIN GPIO_PIN(PORT_A,3)
#define UART_1_TX_PIN GPIO_PIN(PORT_A,2)
/** @} */
/**
@ -117,14 +117,14 @@ extern "C" {
#define SPI_0_EN 1
/* SPI 0 device configuration */
#define SPI_0_DEV SPI1
#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
#define SPI_0_BUS_DIV 1 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
#define SPI_0_DEV SPI1
#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
#define SPI_0_BUS_DIV 1 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
/* SPI 0 pin configuration */
#define SPI_0_CLK_PIN GPIO(PORT_A,5)
#define SPI_0_MOSI_PIN GPIO(PORT_A,7)
#define SPI_0_MISO_PIN GPIO(PORT_A,6)
#define SPI_0_CLK_PIN GPIO_PIN(PORT_A,5)
#define SPI_0_MOSI_PIN GPIO_PIN(PORT_A,7)
#define SPI_0_MISO_PIN GPIO_PIN(PORT_A,6)
/** @} */
/**
@ -160,8 +160,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_PIN GPIO(PORT_B,6)
#define I2C_0_SDA_PIN GPIO(PORT_B,7)
#define I2C_0_SCL_PIN GPIO_PIN(PORT_B,6)
#define I2C_0_SDA_PIN GPIO_PIN(PORT_B,7)
/** @} */
#ifdef __cplusplus

6
boards/limifrog-v1/include/board.h
View File

@ -49,9 +49,9 @@ extern "C" {
* @name LED pin definitions
* @{
*/
#define LED_RED_PORT (GPIOC)
#define LED_RED_PIN (3)
#define LED_RED_GPIO GPIO(PORT_C,3)
#define LED_RED_PORT (GPIOC)
#define LED_RED_PIN (3)
#define LED_RED_GPIO GPIO_PIN(PORT_C,3)
/** @} */
/**

6
boards/msb-430/include/periph_conf.h
View File

@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
#define SPI_PIN_MISO GPIO(P5,2)
#define SPI_PIN_MOSI GPIO(P5,1)
#define SPI_PIN_CLK GPIO(P5,3)
#define SPI_PIN_MISO GPIO_PIN(P5,2)
#define SPI_PIN_MOSI GPIO_PIN(P5,1)
#define SPI_PIN_CLK GPIO_PIN(P5,3)
/** @} */
#ifdef __cplusplus

6
boards/msb-430h/include/periph_conf.h
View File

@ -84,9 +84,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
#define SPI_PIN_MISO GPIO(P3,2)
#define SPI_PIN_MOSI GPIO(P3,1)
#define SPI_PIN_CLK GPIO(P3,3)
#define SPI_PIN_MISO GPIO_PIN(P3,2)
#define SPI_PIN_MOSI GPIO_PIN(P3,1)
#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus

8
boards/msbiot/include/board.h
View File

@ -40,10 +40,10 @@ extern "C" {
* @{
*/
#define CC110X_SPI SPI_0
#define CC110X_CS GPIO(PORT_B, 12)
#define CC110X_GDO0 GPIO(PORT_C, 4)
#define CC110X_GDO1 GPIO(PORT_A, 6)
#define CC110X_GDO2 GPIO(PORT_C, 5)
#define CC110X_CS GPIO_PIN(PORT_B, 12)
#define CC110X_GDO0 GPIO_PIN(PORT_C, 4)
#define CC110X_GDO1 GPIO_PIN(PORT_A, 6)
#define CC110X_GDO2 GPIO_PIN(PORT_C, 5)
/** @} */
/**

4
boards/nucleo-l1/include/periph_conf.h
View File

@ -72,8 +72,8 @@ static const timer_conf_t timer_config[] = {
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ 32000000
/* UART 0 pin configuration */
#define UART_0_RX_PIN GPIO(PORT_A, 3)
#define UART_0_TX_PIN GPIO(PORT_A, 2)
#define UART_0_RX_PIN GPIO_PIN(PORT_A, 3)
#define UART_0_TX_PIN GPIO_PIN(PORT_A, 2)
#define UART_0_AF GPIO_AF7
/**

2
boards/saml21-xpro/board.c
View File

@ -44,5 +44,5 @@ void board_init(void)
*/
void led_init(void)
{
gpio_init(GPIO(PB,10), GPIO_DIR_OUT, GPIO_NOPULL);
gpio_init(GPIO_PIN(PB,10), GPIO_DIR_OUT, GPIO_NOPULL);
}

22
boards/samr21-xpro/include/board.h
View File

@ -45,23 +45,23 @@ extern "C" {
* @name AT86RF233 configuration
* @{
*/
#define AT86RF233_SPI (SPI_0)
#define AT86RF233_CS GPIO(PB, 31)
#define AT86RF233_INT GPIO(PB, 0)
#define AT86RF233_RESET GPIO(PB, 15)
#define AT86RF233_SLEEP GPIO(PA, 20)
#define AT86RF233_SPI_CLK (SPI_SPEED_1MHZ)
#define AT86RF233_SPI (SPI_0)
#define AT86RF233_CS GPIO_PIN(PB, 31)
#define AT86RF233_INT GPIO_PIN(PB, 0)
#define AT86RF233_RESET GPIO_PIN(PB, 15)
#define AT86RF233_SLEEP GPIO_PIN(PA, 20)
#define AT86RF233_SPI_CLK (SPI_SPEED_1MHZ)
/** @}*/
/**
* @name AT86RF231 config
* @{
*/
#define AT86RF231_SPI SPI_0
#define AT86RF231_CS GPIO(PB, 31)
#define AT86RF231_INT GPIO(PB, 0)
#define AT86RF231_RESET GPIO(PB, 15)
#define AT86RF231_SLEEP GPIO(PA, 20)
#define AT86RF231_SPI SPI_0
#define AT86RF231_CS GPIO_PIN(PB, 31)
#define AT86RF231_INT GPIO_PIN(PB, 0)
#define AT86RF231_RESET GPIO_PIN(PB, 15)
#define AT86RF231_SLEEP GPIO_PIN(PA, 20)
#define AT86RF231_SPI_SPEED SPI_SPEED_1MHZ
/** @} */

4
boards/samr21-xpro/include/periph_conf.h
View File

@ -111,8 +111,8 @@ extern "C" {
/* UART device configuration */
static const uart_conf_t uart_config[] = {
/* device, RX pin, TX pin, mux */
{&SERCOM0->USART, GPIO(PA,5), GPIO(PA,4), GPIO_MUX_D},
{&SERCOM5->USART, GPIO(PA,23), GPIO(PA,22), GPIO_MUX_D},
{&SERCOM0->USART, GPIO_PIN(PA,5), GPIO_PIN(PA,4), GPIO_MUX_D},
{&SERCOM5->USART, GPIO_PIN(PA,23), GPIO_PIN(PA,22), GPIO_MUX_D},
};
/* interrupt function name mapping */

10
boards/spark-core/include/board.h
View File

@ -81,16 +81,16 @@
/**
* @name User button configuration
*/
#define BUTTON1 GPIO(PORT_B,2)
#define BUTTON1 GPIO_PIN(PORT_B,2)
/**
* @name CC3000 pin configuration
* @{
*/
#define CC3000_SPI SPI_0
#define CC3000_CS GPIO(PORT_B,12)
#define CC3000_EN GPIO(PORT_B,8)
#define CC3000_INT GPIO(PORT_B,11)
#define CC3000_CS GPIO_PIN(PORT_B,12)
#define CC3000_EN GPIO_PIN(PORT_B,8)
#define CC3000_INT GPIO_PIN(PORT_B,11)
/** @} */
/**
@ -98,7 +98,7 @@
* @{
*/
#define EXTFLASH_SPI SPI_0
#define EXTFLASH GPIO(PORT_B,9)
#define EXTFLASH GPIO_PIN(PORT_B,9)
/** @} */
/**

22
boards/spark-core/include/periph_conf.h
View File

@ -93,26 +93,26 @@
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ (CLOCK_CORECLOCK/2)
/* UART 0 pin configuration */
#define UART_0_RX_PIN GPIO(PORT_A,3)
#define UART_0_TX_PIN GPIO(PORT_A,2)
#define UART_0_RX_PIN GPIO_PIN(PORT_A,3)
#define UART_0_TX_PIN GPIO_PIN(PORT_A,2)
/** @} */
/**
* @brief SPI configuration
* @{
*/
#define SPI_NUMOF (1U)
#define SPI_0_EN 1
#define SPI_NUMOF (1U)
#define SPI_0_EN 1
/* SPI 0 device configuration */
#define SPI_0_DEV SPI1
#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
#define SPI_0_BUS_DIV 0 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
#define SPI_0_DEV SPI1
#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
#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_PIN GPIO(PORT_B,15)
#define SPI_0_MOSI_PIN GPIO(PORT_B,17)
#define SPI_0_MISO_PIN GPIO(PORT_B,16)
#define SPI_0_CLK_PIN GPIO_PIN(PORT_B,15)
#define SPI_0_MOSI_PIN GPIO_PIN(PORT_B,17)
#define SPI_0_MISO_PIN GPIO_PIN(PORT_B,16)
/** @} */
#ifdef __cplusplus

6
boards/telosb/include/periph_conf.h
View File

@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
#define SPI_PIN_MISO GPIO(P3,2)
#define SPI_PIN_MOSI GPIO(P3,1)
#define SPI_PIN_CLK GPIO(P3,3)
#define SPI_PIN_MISO GPIO_PIN(P3,2)
#define SPI_PIN_MOSI GPIO_PIN(P3,1)
#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus

6
boards/wsn430-common/include/periph_conf.h
View File

@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
#define SPI_PIN_MISO GPIO(P5,2)
#define SPI_PIN_MOSI GPIO(P5,1)
#define SPI_PIN_CLK GPIO(P5,3)
#define SPI_PIN_MISO GPIO_PIN(P5,2)
#define SPI_PIN_MOSI GPIO_PIN(P5,1)
#define SPI_PIN_CLK GPIO_PIN(P5,3)
/** @} */

6
boards/z1/include/periph_conf.h
View File

@ -81,9 +81,9 @@ extern "C" {
#define SPI_IF (SFR->IFG2)
#define SPI_IE_RX_BIT (1 << 2)
#define SPI_IE_TX_BIT (1 << 3)
#define SPI_PIN_MISO GPIO(P3,2)
#define SPI_PIN_MOSI GPIO(P3,1)
#define SPI_PIN_CLK GPIO(P3,3)
#define SPI_PIN_MISO GPIO_PIN(P3,2)
#define SPI_PIN_MOSI GPIO_PIN(P3,1)
#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus