Bladeren bron

修复BUG:SDIO和UART6(TX)的DMA通道分配冲突

breederbai 3 jaren geleden
bovenliggende
commit
326abec0e7
1 gewijzigde bestanden met toevoegingen van 7 en 1 verwijderingen
  1. 7 1
      bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h

+ 7 - 1
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