diff --git a/boards/common/iotlab/include/periph_conf_common.h b/boards/common/iotlab/include/periph_conf_common.h index cb81ba5b6c9759a1d113fb657b48700645faa1dd..4daebc8f5686c04a63160e797a8ccb9cab2bdc74 100644 --- a/boards/common/iotlab/include/periph_conf_common.h +++ b/boards/common/iotlab/include/periph_conf_common.h @@ -74,16 +74,12 @@ extern "C" { */ #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 */ { .stream = 3 }, /* DMA1 Channel 4 - USART1_TX */ { .stream = 5 }, /* DMA1 Channel 6 - USART2_TX */ }; -#define DMA_0_ISR isr_dma1_channel2 -#define DMA_1_ISR isr_dma1_channel3 -#define DMA_2_ISR isr_dma1_channel4 -#define DMA_3_ISR isr_dma1_channel6 +#define DMA_0_ISR isr_dma1_channel4 +#define DMA_1_ISR isr_dma1_channel6 #define DMA_NUMOF (sizeof(dma_config) / sizeof(dma_config[0])) #endif @@ -129,7 +125,7 @@ static const uart_conf_t uart_config[] = { .bus = APB2, .irqn = USART1_IRQn, #ifdef MODULE_PERIPH_DMA - .dma = 2, + .dma = 0, .dma_chan = 2 #endif }, @@ -141,7 +137,7 @@ static const uart_conf_t uart_config[] = { .bus = APB1, .irqn = USART2_IRQn, #ifdef MODULE_PERIPH_DMA - .dma = 3, + .dma = 1, .dma_chan = 2 #endif } diff --git a/boards/iotlab-m3/include/periph_conf.h b/boards/iotlab-m3/include/periph_conf.h index 9ec6ffd7c3782ace086dab0ccdb0a30a8c169da6..e912a9bb1359cab99e898e4348f042fd31a6a199 100644 --- a/boards/iotlab-m3/include/periph_conf.h +++ b/boards/iotlab-m3/include/periph_conf.h @@ -41,9 +41,9 @@ static const spi_conf_t spi_config[] = { .rccmask = RCC_APB2ENR_SPI1EN, .apbbus = APB2, #ifdef MODULE_PERIPH_DMA - .tx_dma = 1, + .tx_dma = DMA_STREAM_UNDEF, .tx_dma_chan = 1, - .rx_dma = 0, + .rx_dma = DMA_STREAM_UNDEF, .rx_dma_chan = 1, #endif }