diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-13 07:06:46 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-13 07:06:46 -0600 |
| commit | 7d68d41865439a0ca249703479d363ca2dd966b4 (patch) | |
| tree | a633bc1f427dab36b9d0232a435373d9d2cf5859 | |
| parent | 53076ef591815daac96665e44dc50d4d1d04144f (diff) | |
| download | px4-nuttx-7d68d41865439a0ca249703479d363ca2dd966b4.tar.gz px4-nuttx-7d68d41865439a0ca249703479d363ca2dd966b4.tar.bz2 px4-nuttx-7d68d41865439a0ca249703479d363ca2dd966b4.zip | |
STM32: Fix RX DMA setup for UART5. From Jussi Kivilinna.
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip/stm32f10xxx_dma.h | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_dma.h b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_dma.h index d9ba76170..a24c611a5 100644 --- a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_dma.h +++ b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_dma.h @@ -338,13 +338,13 @@ # define DMACHAN_TIM4_UP STM32_DMA1_CHAN7 # define DMACHAN_SPI3_RX STM32_DMA2_CHAN1 -# define DMACHAN_USART5_TX STM32_DMA2_CHAN1 +# define DMACHAN_UART5_TX STM32_DMA2_CHAN1 # define DMACHAN_TIM5_CH4 STM32_DMA2_CHAN1 # define DMACHAN_TIM5_TRIG STM32_DMA2_CHAN1 # define DMACHAN_TIM5_COM STM32_DMA2_CHAN1 # define DMACHAN_SPI3_TX STM32_DMA2_CHAN2 -# define DMACHAN_USART5_RX STM32_DMA2_CHAN2 +# define DMACHAN_UART5_RX STM32_DMA2_CHAN2 # define DMACHAN_TIM5_CH3 STM32_DMA2_CHAN2 # define DMACHAN_TIM5_UP STM32_DMA2_CHAN2 diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index da254c2bb..2d2273d42 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -159,9 +159,9 @@ # endif # endif -# if defined(CONFIG_UART4_RXDMA) +# if defined(CONFIG_UART4_RXDMA) || defined(CONFIG_UART5_RXDMA) # ifndef CONFIG_STM32_DMA2 -# error STM32 UART4 receive DMA requires CONFIG_STM32_DMA2 +# error STM32 UART4/5 receive DMA requires CONFIG_STM32_DMA2 # endif # endif @@ -171,6 +171,7 @@ # define DMAMAP_USART2_RX DMACHAN_USART2_RX # define DMAMAP_USART3_RX DMACHAN_USART3_RX # define DMAMAP_UART4_RX DMACHAN_UART4_RX +# define DMAMAP_UART5_RX DMACHAN_UART5_RX # endif |