diff --git a/boards/b-l072z-lrwan1/include/periph_conf.h b/boards/b-l072z-lrwan1/include/periph_conf.h index 82a4ded2b7f4..54a563690b22 100644 --- a/boards/b-l072z-lrwan1/include/periph_conf.h +++ b/boards/b-l072z-lrwan1/include/periph_conf.h @@ -33,7 +33,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, /* channel 2 */ { .stream = 2 }, /* channel 3 */ @@ -48,7 +47,6 @@ static const dma_conf_t dma_config[] = { #define DMA_SHARED_ISR_1_STREAMS { 2, 3, 4 } /* Indexes 2, 3 and 4 of dma_config share the same isr */ #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/b-l475e-iot01a/include/periph_conf.h b/boards/b-l475e-iot01a/include/periph_conf.h index 98841c258413..d96116d9263a 100644 --- a/boards/b-l475e-iot01a/include/periph_conf.h +++ b/boards/b-l475e-iot01a/include/periph_conf.h @@ -31,7 +31,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, /* DMA1 Channel 2 - SPI1_RX */ { .stream = 2 }, /* DMA1 Channel 3 - SPI1_TX */ @@ -45,7 +44,6 @@ static const dma_conf_t dma_config[] = { #define DMA_3_ISR isr_dma2_channel3 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/common/iotlab/include/periph_conf_common.h b/boards/common/iotlab/include/periph_conf_common.h index 948cf325aaac..7e6169d957ef 100644 --- a/boards/common/iotlab/include/periph_conf_common.h +++ b/boards/common/iotlab/include/periph_conf_common.h @@ -72,7 +72,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 3 }, /* DMA1 Channel 4 - USART1_TX */ { .stream = 5 }, /* DMA1 Channel 6 - USART2_TX */ @@ -82,7 +81,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma1_channel6 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/lsn50/include/periph_conf.h b/boards/lsn50/include/periph_conf.h index d10f2de99b28..8edbd3fabb78 100644 --- a/boards/lsn50/include/periph_conf.h +++ b/boards/lsn50/include/periph_conf.h @@ -32,7 +32,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, /* channel 2 */ { .stream = 2 }, /* channel 3 */ @@ -47,7 +46,6 @@ static const dma_conf_t dma_config[] = { #define DMA_SHARED_ISR_1_STREAMS { 2, 3, 4 } /* Indexes 2, 3 and 4 of dma_config share the same isr */ #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h index b77a236c7cb9..c910c7e84614 100644 --- a/boards/msbiot/include/periph_conf.h +++ b/boards/msbiot/include/periph_conf.h @@ -31,7 +31,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -41,8 +40,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f091rc/include/periph_conf.h b/boards/nucleo-f091rc/include/periph_conf.h index 465fd154c691..588dddf86aac 100644 --- a/boards/nucleo-f091rc/include/periph_conf.h +++ b/boards/nucleo-f091rc/include/periph_conf.h @@ -58,7 +58,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, { .stream = 2 }, @@ -68,7 +67,7 @@ static const dma_conf_t dma_config[] = { #define DMA_SHARED_ISR_0_STREAMS { 0, 1 } /* Indexes 0 and 1 of dma_config share the same isr */ #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif +/** @} */ /** * @name Timer configuration diff --git a/boards/nucleo-f207zg/include/periph_conf.h b/boards/nucleo-f207zg/include/periph_conf.h index d1bb7296cb72..11027824fa0b 100644 --- a/boards/nucleo-f207zg/include/periph_conf.h +++ b/boards/nucleo-f207zg/include/periph_conf.h @@ -34,7 +34,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ @@ -54,7 +53,6 @@ static const dma_conf_t dma_config[] = { #define DMA_6_ISR isr_dma2_stream0 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/nucleo-f401re/include/periph_conf.h b/boards/nucleo-f401re/include/periph_conf.h index 93c89da44326..7338be529b0f 100644 --- a/boards/nucleo-f401re/include/periph_conf.h +++ b/boards/nucleo-f401re/include/periph_conf.h @@ -32,7 +32,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -50,8 +49,6 @@ static const dma_conf_t dma_config[] = { #define DMA_5_ISR isr_dma1_stream0 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f410rb/include/periph_conf.h b/boards/nucleo-f410rb/include/periph_conf.h index cfce33cfced1..62203cd32c29 100644 --- a/boards/nucleo-f410rb/include/periph_conf.h +++ b/boards/nucleo-f410rb/include/periph_conf.h @@ -32,7 +32,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -42,8 +41,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f411re/include/periph_conf.h b/boards/nucleo-f411re/include/periph_conf.h index 9c4b8db0b551..9d90fc59c0ce 100644 --- a/boards/nucleo-f411re/include/periph_conf.h +++ b/boards/nucleo-f411re/include/periph_conf.h @@ -32,7 +32,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -42,8 +41,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f412zg/include/periph_conf.h b/boards/nucleo-f412zg/include/periph_conf.h index b3e17a0ae31e..5c41f4d185e5 100644 --- a/boards/nucleo-f412zg/include/periph_conf.h +++ b/boards/nucleo-f412zg/include/periph_conf.h @@ -35,7 +35,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -45,8 +44,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f413zh/include/periph_conf.h b/boards/nucleo-f413zh/include/periph_conf.h index d38885ca12c8..3ce3a1e26e31 100644 --- a/boards/nucleo-f413zh/include/periph_conf.h +++ b/boards/nucleo-f413zh/include/periph_conf.h @@ -36,7 +36,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -46,7 +45,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/nucleo-f429zi/include/periph_conf.h b/boards/nucleo-f429zi/include/periph_conf.h index 336d5b8dffe1..818e293c619e 100644 --- a/boards/nucleo-f429zi/include/periph_conf.h +++ b/boards/nucleo-f429zi/include/periph_conf.h @@ -34,7 +34,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -44,8 +43,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f446re/include/periph_conf.h b/boards/nucleo-f446re/include/periph_conf.h index af09454eccd6..613325539ab7 100644 --- a/boards/nucleo-f446re/include/periph_conf.h +++ b/boards/nucleo-f446re/include/periph_conf.h @@ -33,7 +33,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -51,8 +50,6 @@ static const dma_conf_t dma_config[] = { #define DMA_5_ISR isr_dma1_stream0 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f446ze/include/periph_conf.h b/boards/nucleo-f446ze/include/periph_conf.h index 06390d283557..8ada9c9b4b89 100644 --- a/boards/nucleo-f446ze/include/periph_conf.h +++ b/boards/nucleo-f446ze/include/periph_conf.h @@ -34,7 +34,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -44,8 +43,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/nucleo-f767zi/include/periph_conf.h b/boards/nucleo-f767zi/include/periph_conf.h index ac2d03a7e7e5..4c5398cd5114 100644 --- a/boards/nucleo-f767zi/include/periph_conf.h +++ b/boards/nucleo-f767zi/include/periph_conf.h @@ -35,7 +35,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 4 }, /* DMA1 Stream 4 - USART3_TX */ { .stream = 14 }, /* DMA2 Stream 6 - USART6_TX */ @@ -49,7 +48,6 @@ static const dma_conf_t dma_config[] = { #define DMA_3_ISR isr_dma2_stream0 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/nucleo-l152re/include/periph_conf.h b/boards/nucleo-l152re/include/periph_conf.h index acc6e95e42e0..c1454f44be7f 100644 --- a/boards/nucleo-l152re/include/periph_conf.h +++ b/boards/nucleo-l152re/include/periph_conf.h @@ -65,7 +65,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, /* DMA1 Channel 2 - SPI1_RX / USART3_TX */ { .stream = 2 }, /* DMA1 Channel 3 - SPI1_TX */ @@ -79,7 +78,6 @@ static const dma_conf_t dma_config[] = { #define DMA_3_ISR isr_dma1_ch4 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /** @} */ /** diff --git a/boards/nucleo-l476rg/include/periph_conf.h b/boards/nucleo-l476rg/include/periph_conf.h index e5670b4f4468..9d2f53e085f7 100644 --- a/boards/nucleo-l476rg/include/periph_conf.h +++ b/boards/nucleo-l476rg/include/periph_conf.h @@ -36,7 +36,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 1 }, /* DMA1 Channel 2 - SPI1_RX | USART3_TX */ { .stream = 2 }, /* DMA1 Channel 3 - SPI1_TX */ @@ -50,7 +49,6 @@ static const dma_conf_t dma_config[] = { #define DMA_3_ISR isr_dma1_channel7 #define DMA_NUMOF ARRAY_SIZE(dma_config) -#endif /* MODULE_PERIPH_DMA */ /** @} */ diff --git a/boards/pyboard/include/periph_conf.h b/boards/pyboard/include/periph_conf.h index f67ab4b42972..97ea9c44a5d0 100644 --- a/boards/pyboard/include/periph_conf.h +++ b/boards/pyboard/include/periph_conf.h @@ -63,7 +63,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -73,8 +72,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream2 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/stm32f429i-disc1/include/periph_conf.h b/boards/stm32f429i-disc1/include/periph_conf.h index 7aab6917602d..db8a07d4f5a5 100644 --- a/boards/stm32f429i-disc1/include/periph_conf.h +++ b/boards/stm32f429i-disc1/include/periph_conf.h @@ -33,7 +33,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 14 }, /* DMA2 Stream 6 - SPI5_TX */ { .stream = 13 }, /* DMA2 Stream 5 - SPI5_RX */ @@ -43,8 +42,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream5 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h index 8b827515d43e..4ef005f072d8 100644 --- a/boards/stm32f4discovery/include/periph_conf.h +++ b/boards/stm32f4discovery/include/periph_conf.h @@ -33,7 +33,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 11 }, /* DMA2 Stream 3 - SPI1_TX */ { .stream = 10 }, /* DMA2 Stream 2 - SPI1_RX */ @@ -47,8 +46,6 @@ static const dma_conf_t dma_config[] = { #define DMA_3_ISR isr_dma1_stream3 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/boards/ublox-c030-u201/include/periph_conf.h b/boards/ublox-c030-u201/include/periph_conf.h index cabd06b298f6..93ff3f6bcdd1 100644 --- a/boards/ublox-c030-u201/include/periph_conf.h +++ b/boards/ublox-c030-u201/include/periph_conf.h @@ -61,7 +61,6 @@ extern "C" { * @name DMA streams configuration * @{ */ -#ifdef MODULE_PERIPH_DMA static const dma_conf_t dma_config[] = { { .stream = 9 }, /* DMA2 Stream 1 - SPI4_TX */ { .stream = 8 }, /* DMA2 Stream 0 - SPI4_RX */ @@ -71,8 +70,6 @@ static const dma_conf_t dma_config[] = { #define DMA_1_ISR isr_dma2_stream0 #define DMA_NUMOF ARRAY_SIZE(dma_config) - -#endif /* MODULE_PERIPH_DMA */ /** @} */ /** diff --git a/cpu/stm32/include/periph_cpu.h b/cpu/stm32/include/periph_cpu.h index 7bb539be11e1..e447dca8bc4d 100644 --- a/cpu/stm32/include/periph_cpu.h +++ b/cpu/stm32/include/periph_cpu.h @@ -366,7 +366,6 @@ typedef enum { /** @} */ #endif /* ndef DOXYGEN */ -#ifdef MODULE_PERIPH_DMA /** * @brief DMA configuration */ @@ -429,7 +428,6 @@ typedef enum { #define DMA_DATA_WIDTH_MASK (0x0C) #define DMA_DATA_WIDTH_SHIFT (2) /** @} */ -#endif /* MODULE_PERIPH_DMA */ /** * @brief Available number of ADC devices