sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in dagar/nuttx/pr-stm32_dma_v1_duplicate (pull request #800)

Browse Source 
stm32_dma_v1.h remove duplicate DAC DMA defines for CONFIG_STM32_STM32F30XX

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Daniel Agar 2019-01-03 18:26:21 +00:00 committed by GregoryN
parent b0f18d93cc
commit 2697b087c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/stm32/chip/stm32_dma_v1.h
View File

@ -475,7 +475,7 @@
# define DMACHAN_TIM1_CH2_1 STM32_DMA1_CHAN3
# define DMACHAN_TIM3_CH4 STM32_DMA1_CHAN3
# define DMACHAN_TIM3_UP_2 STM32_DMA1_CHAN3
# define DMACHAN_DAC1_CH1 STM32_DMA1_CHAN3
# define DMACHAN_DAC1_CH1_1 STM32_DMA1_CHAN3
# define DMACHAN_SPI2_RX STM32_DMA1_CHAN4
# define DMACHAN_I2S2_RX STM32_DMA1_CHAN4
@ -486,7 +486,7 @@
# define DMACHAN_TIM1_COM STM32_DMA1_CHAN4
# define DMACHAN_TIM4_CH2 STM32_DMA1_CHAN4
# define DMACHAN_TIM7_UP_1 STM32_DMA1_CHAN4
# define DMACHAN_DAC1_CH2 STM32_DMA1_CHAN4 /* NOTE: a typo in the ref manual */
# define DMACHAN_DAC1_CH2_1 STM32_DMA1_CHAN4 /* NOTE: a typo in the ref manual */
# define DMACHAN_SPI2_TX STM32_DMA1_CHAN5
# define DMACHAN_I2S2_TX STM32_DMA1_CHAN5
@ -533,12 +533,12 @@
# define DMACHAN_ADC2_2 STM32_DMA2_CHAN3
# define DMACHAN_UART4_RX STM32_DMA2_CHAN3
# define DMACHAN_TIM6_UP STM32_DMA2_CHAN3
# define DMACHAN_DAC1_CH1 STM32_DMA2_CHAN3
# define DMACHAN_DAC1_CH1_2 STM32_DMA2_CHAN3
# define DMACHAN_TIM8_CH1 STM32_DMA2_CHAN3
# define DMACHAN_ADC4_2 STM32_DMA2_CHAN4
# define DMACHAN_TIM7_UP_2 STM32_DMA2_CHAN4
# define DMACHAN_DAC1_CH2 STM32_DMA2_CHAN4
# define DMACHAN_DAC1_CH2_2 STM32_DMA2_CHAN4
# define DMACHAN_ADC3 STM32_DMA2_CHAN5
# define DMACHAN_UART4_TX STM32_DMA2_CHAN5