diff --git a/boards/f4vi1/include/periph_conf.h b/boards/f4vi1/include/periph_conf.h index 317e68f1ff..c4ea0359a7 100644 --- a/boards/f4vi1/include/periph_conf.h +++ b/boards/f4vi1/include/periph_conf.h @@ -83,16 +83,16 @@ extern "C" { * @{ */ static const uart_conf_t uart_config[] = { - /* device, RCC mask, RX pin, TX pin, pin AF, IRQ channel, DMA stream, DMA */ { - USART6, /* device base register */ - RCC_APB2ENR_USART6EN, /* RCC mask */ - GPIO_PIN(PORT_C,7), /* RX pin */ - GPIO_PIN(PORT_C,6), /* TX pin */ - GPIO_AF8, /* pin AF */ - USART6_IRQn, /* IRQ channel */ - 14, /* DMA stream */ - 5 /* DMA channel */ + .dev = USART6, + .rcc_mask = RCC_APB2ENR_USART6EN, + .rx_pin = GPIO_PIN(PORT_C,7), + .tx_pin = GPIO_PIN(PORT_C,6), + .af = GPIO_AF8, + .bus = APB2, + .irqn = USART6_IRQn, + .dma_stream = 14, + .dma_chan = 5 }, }; diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h index b1ab9ea154..cc7f5596a2 100644 --- a/boards/msbiot/include/periph_conf.h +++ b/boards/msbiot/include/periph_conf.h @@ -129,40 +129,42 @@ extern "C" { /** @} */ /** - * @name UART configuration + * @brief UART configuration * @{ */ static const uart_conf_t uart_config[] = { - /* device, RCC mask, RX pin, TX pin, pin AF, IRQ channel, DMA stream, DMA */ { - USART2, /* device base register */ - RCC_APB1ENR_USART2EN, /* RCC mask */ - GPIO_PIN(PORT_A,3), /* RX pin */ - GPIO_PIN(PORT_A,2), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART2_IRQn, /* IRQ channel */ - 6, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART2, + .rcc_mask = RCC_APB1ENR_USART2EN, + .rx_pin = GPIO_PIN(PORT_A,3), + .tx_pin = GPIO_PIN(PORT_A,2), + .af = GPIO_AF7, + .bus = APB1, + .irqn = USART2_IRQn, + .dma_stream = 6, + .dma_chan = 4 }, { - USART1, /* device base register */ - RCC_APB2ENR_USART1EN, /* RCC mask */ - GPIO_PIN(PORT_A,10), /* RX pin */ - GPIO_PIN(PORT_A,9), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART1_IRQn, /* IRQ channel */ - 15, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART1, + .rcc_mask = RCC_APB2ENR_USART1EN, + .rx_pin = GPIO_PIN(PORT_A,10), + .tx_pin = GPIO_PIN(PORT_A,9), + .af = GPIO_AF7, + .bus = APB2, + .irqn = USART1_IRQn, + .dma_stream = 15, + .dma_chan = 4 }, { - USART3, /* device base register */ - RCC_APB1ENR_USART3EN, /* RCC mask */ - GPIO_PIN(PORT_D,9), /* RX pin */ - GPIO_PIN(PORT_D,8), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART3_IRQn, /* IRQ channel */ - 3, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART3, + .rcc_mask = RCC_APB1ENR_USART3EN, + .rx_pin = GPIO_PIN(PORT_D,9), + .tx_pin = GPIO_PIN(PORT_D,8), + .af = GPIO_AF7, + .bus = APB1, + .irqn = USART3_IRQn, + .dma_stream = 3, + .dma_chan = 4 }, }; diff --git a/boards/nucleo-f401/include/periph_conf.h b/boards/nucleo-f401/include/periph_conf.h index 149e7d83eb..49915b5257 100644 --- a/boards/nucleo-f401/include/periph_conf.h +++ b/boards/nucleo-f401/include/periph_conf.h @@ -77,20 +77,20 @@ extern "C" { /** @} */ /** - * @name UART configuration + * @brief UART configuration * @{ */ static const uart_conf_t uart_config[] = { - /* device, RCC mask, RX pin, TX pin, pin AF, IRQ channel, DMA stream, DMA */ { - USART2, /* device base register */ - RCC_APB1ENR_USART2EN, /* RCC mask */ - GPIO_PIN(PORT_A,3), /* RX pin */ - GPIO_PIN(PORT_A,2), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART2_IRQn, /* IRQ channel */ - 6, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART2, + .rcc_mask = RCC_APB1ENR_USART2EN, + .rx_pin = GPIO_PIN(PORT_A,3), + .tx_pin = GPIO_PIN(PORT_A,2), + .af = GPIO_AF7, + .bus = APB1, + .irqn = USART2_IRQn, + .dma_stream = 6, + .dma_chan = 4 } }; diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h index e348355f34..d497874cde 100644 --- a/boards/stm32f4discovery/include/periph_conf.h +++ b/boards/stm32f4discovery/include/periph_conf.h @@ -78,30 +78,31 @@ extern "C" { /** @} */ /** - * @name UART configuration + * @brief UART configuration * @{ */ static const uart_conf_t uart_config[] = { - /* device, RCC mask, RX pin, TX pin, pin AF, IRQ channel, DMA stream, DMA */ { - USART2, /* device base register */ - RCC_APB1ENR_USART2EN, /* RCC mask */ - GPIO_PIN(PORT_A,3), /* RX pin */ - GPIO_PIN(PORT_A,2), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART2_IRQn, /* IRQ channel */ - 6, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART2, + .rcc_mask = RCC_APB1ENR_USART2EN, + .rx_pin = GPIO_PIN(PORT_A,3), + .tx_pin = GPIO_PIN(PORT_A,2), + .af = GPIO_AF7, + .bus = APB1, + .irqn = USART2_IRQn, + .dma_stream = 6, + .dma_chan = 4 }, { - USART3, /* device base register */ - RCC_APB1ENR_USART3EN, /* RCC mask */ - GPIO_PIN(PORT_D,9), /* RX pin */ - GPIO_PIN(PORT_D,8), /* TX pin */ - GPIO_AF7, /* pin AF */ - USART3_IRQn, /* IRQ channel */ - 3, /* DMA stream */ - 4 /* DMA channel */ + .dev = USART3, + .rcc_mask = RCC_APB1ENR_USART3EN, + .rx_pin = GPIO_PIN(PORT_D,9), + .tx_pin = GPIO_PIN(PORT_D,8), + .af = GPIO_AF7, + .bus = APB1, + .irqn = USART3_IRQn, + .dma_stream = 3, + .dma_chan = 4 }, };