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

boards/iotlab-m3: configure and use DMA

Browse Source 
Used with UART and SPI peripheral
This commit is contained in:
Alexandre Abadie 2019-01-07 12:53:20 +01:00 committed by Vincent Dupont
parent 9ecf12119f
commit 0b6bccb543
4 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
boards/common/iotlab/include/periph_conf_common.h
View File

@ -68,6 +68,27 @@ extern "C" {
#define ADC_NUMOF (3) #define ADC_NUMOF (3)
/** @} */ /** @} */
/**
* @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 */
{ .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_NUMOF (sizeof(dma_config) / sizeof(dma_config[0]))
#endif
/** @} */
/** /**
* @name Timer configuration * @name Timer configuration
* @{ * @{
@ -106,7 +127,11 @@ static const uart_conf_t uart_config[] = {
.rx_pin = GPIO_PIN(PORT_A, 10), .rx_pin = GPIO_PIN(PORT_A, 10),
.tx_pin = GPIO_PIN(PORT_A, 9), .tx_pin = GPIO_PIN(PORT_A, 9),
.bus = APB2, .bus = APB2,
.irqn = USART1_IRQn .irqn = USART1_IRQn,
#ifdef MODULE_PERIPH_DMA
.dma = 2,
.dma_chan = 2
#endif
}, },
{ {
.dev = USART2, .dev = USART2,
@ -114,7 +139,11 @@ static const uart_conf_t uart_config[] = {
.rx_pin = GPIO_PIN(PORT_A, 3), .rx_pin = GPIO_PIN(PORT_A, 3),
.tx_pin = GPIO_PIN(PORT_A, 2), .tx_pin = GPIO_PIN(PORT_A, 2),
.bus = APB1, .bus = APB1,
.irqn = USART2_IRQn .irqn = USART2_IRQn,
#ifdef MODULE_PERIPH_DMA
.dma = 3,
.dma_chan = 2
#endif
} }
}; };

2
boards/iotlab-m3/Makefile.dep
View File

@ -1,5 +1,7 @@
include $(RIOTBOARD)/common/iotlab/Makefile.dep include $(RIOTBOARD)/common/iotlab/Makefile.dep
FEATURES_REQUIRED += periph_dma
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += isl29020 USEMODULE += isl29020
USEMODULE += lps331ap USEMODULE += lps331ap

2
boards/iotlab-m3/Makefile.features
View File

@ -1,3 +1,5 @@
include $(RIOTBOARD)/common/iotlab/Makefile.features include $(RIOTBOARD)/common/iotlab/Makefile.features
FEATURES_PROVIDED += periph_dma
include $(RIOTCPU)/stm32f1/Makefile.features include $(RIOTCPU)/stm32f1/Makefile.features

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

@ -39,7 +39,13 @@ static const spi_conf_t spi_config[] = {
.sclk_pin = GPIO_PIN(PORT_A, 5), .sclk_pin = GPIO_PIN(PORT_A, 5),
.cs_pin = GPIO_UNDEF, .cs_pin = GPIO_UNDEF,
.rccmask = RCC_APB2ENR_SPI1EN, .rccmask = RCC_APB2ENR_SPI1EN,
.apbbus = APB2 .apbbus = APB2,
#ifdef MODULE_PERIPH_DMA
.tx_dma = 1,
.tx_dma_chan = 1,
.rx_dma = 0,
.rx_dma_chan = 1,
#endif
} }
}; };