diff options
| author | breederbai <[email protected]> | 2022-04-25 13:03:14 +0800 |
|---|---|---|
| committer | guo <[email protected]> | 2022-04-27 21:54:28 +0800 |
| commit | 326abec0e7aa0553510ef83338a6cba4c7fd2d65 (patch) | |
| tree | 6cf37f3b1051bd1e9c652ff0e37eac9f53255bc9 /bsp | |
| parent | 7215a27038c6257bdbc38838893d3034af80de34 (diff) | |
修复BUG：SDIO和UART6（TX）的DMA通道分配冲突
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h index 80d45afc79..b535cf4850 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h @@ -259,7 +259,7 @@ extern "C" { #define SPI5_TX_DMA_INSTANCE DMA2_Stream6 #define SPI5_TX_DMA_CHANNEL DMA_CHANNEL_7 #define SPI5_TX_DMA_IRQ DMA2_Stream6_IRQn -#elif defined(BSP_UART6_TX_USING_DMA) && !defined(UART6_TX_DMA_INSTANCE) +#elif defined(BSP_UART6_TX_USING_DMA) && !defined(BSP_USING_SDIO) #define UART6_DMA_TX_IRQHandler DMA2_Stream6_IRQHandler #define UART6_TX_DMA_RCC RCC_AHB1ENR_DMA2EN #define UART6_TX_DMA_INSTANCE DMA2_Stream6 @@ -274,6 +274,12 @@ extern "C" { #define UART1_TX_DMA_INSTANCE DMA2_Stream7 #define UART1_TX_DMA_CHANNEL DMA_CHANNEL_4 #define UART1_TX_DMA_IRQ DMA2_Stream7_IRQn +#elif defined(BSP_UART6_TX_USING_DMA) && !defined(UART6_TX_DMA_INSTANCE) +#define UART6_DMA_TX_IRQHandler DMA2_Stream7_IRQHandler +#define UART6_TX_DMA_RCC RCC_AHB1ENR_DMA2EN +#define UART6_TX_DMA_INSTANCE DMA2_Stream7 +#define UART6_TX_DMA_CHANNEL DMA_CHANNEL_5 +#define UART6_TX_DMA_IRQ DMA2_Stream7_IRQn #endif #ifdef __cplusplus |