1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #14135 from aabadie/pr/boards/dma_ifdef_remove

boards/stm32: remove useless #ifdef MODULE_PERIPH_DMA
This commit is contained in:
Koen Zandberg 2020-05-25 13:50:06 +02:00 committed by GitHub
commit a4530aaa68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 1 additions and 58 deletions

View File

@ -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
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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

View File

@ -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
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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
/** @} */
/**

View File

@ -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 */
/** @} */

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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 */
/** @} */
/**

View File

@ -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