From 38a3858dcb326d84f113bd94dc48b57924454b16 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Sat, 19 Jan 2019 09:15:14 +0800 Subject: [PATCH] [bsp][stm32] fix dma config bug --- .../HAL_Drivers/config/f4/uart_config.h | 32 +++++++++---------- .../HAL_Drivers/config/f7/uart_config.h | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h index 50eb02bfc0..256716d8c4 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h @@ -56,10 +56,10 @@ extern "C" { #ifndef UART2_DMA_CONFIG #define UART2_DMA_CONFIG \ { \ - .Instance = USART2_RX_DMA_INSTANCE, \ - .channel = USART2_RX_DMA_CHANNEL, \ - .dma_rcc = USART2_RX_DMA_RCC, \ - .dma_irq = USART2_RX_DMA_IRQ, \ + .Instance = UART2_RX_DMA_INSTANCE, \ + .channel = UART2_RX_DMA_CHANNEL, \ + .dma_rcc = UART2_RX_DMA_RCC, \ + .dma_irq = UART2_RX_DMA_IRQ, \ } #endif /* UART2_DMA_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ @@ -79,10 +79,10 @@ extern "C" { #ifndef UART3_DMA_CONFIG #define UART3_DMA_CONFIG \ { \ - .Instance = USART3_RX_DMA_INSTANCE, \ - .channel = USART3_RX_DMA_CHANNEL, \ - .dma_rcc = USART3_RX_DMA_RCC, \ - .dma_irq = USART3_RX_DMA_IRQ, \ + .Instance = UART3_RX_DMA_INSTANCE, \ + .channel = UART3_RX_DMA_CHANNEL, \ + .dma_rcc = UART3_RX_DMA_RCC, \ + .dma_irq = UART3_RX_DMA_IRQ, \ } #endif /* UART3_DMA_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ @@ -102,10 +102,10 @@ extern "C" { #ifndef UART4_DMA_CONFIG #define UART4_DMA_CONFIG \ { \ - .Instance = USART4_RX_DMA_INSTANCE, \ - .channel = USART4_RX_DMA_CHANNEL, \ - .dma_rcc = USART4_RX_DMA_RCC, \ - .dma_irq = USART4_RX_DMA_IRQ, \ + .Instance = UART4_RX_DMA_INSTANCE, \ + .channel = UART4_RX_DMA_CHANNEL, \ + .dma_rcc = UART4_RX_DMA_RCC, \ + .dma_irq = UART4_RX_DMA_IRQ, \ } #endif /* UART4_DMA_CONFIG */ #endif /* BSP_UART4_RX_USING_DMA */ @@ -125,10 +125,10 @@ extern "C" { #ifndef UART5_DMA_CONFIG #define UART5_DMA_CONFIG \ { \ - .Instance = USART5_RX_DMA_INSTANCE, \ - .channel = USART5_RX_DMA_CHANNEL, \ - .dma_rcc = USART5_RX_DMA_RCC, \ - .dma_irq = USART5_RX_DMA_IRQ, \ + .Instance = UART5_RX_DMA_INSTANCE, \ + .channel = UART5_RX_DMA_CHANNEL, \ + .dma_rcc = UART5_RX_DMA_RCC, \ + .dma_irq = UART5_RX_DMA_IRQ, \ } #endif /* UART5_DMA_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h index a4eeeff936..7e4c87a61e 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h @@ -56,10 +56,10 @@ extern "C" { #ifndef UART2_DMA_CONFIG #define UART2_DMA_CONFIG \ { \ - .Instance = USART2_RX_DMA_INSTANCE, \ - .channel = USART2_RX_DMA_CHANNEL, \ - .dma_rcc = USART2_RX_DMA_RCC, \ - .dma_irq = USART2_RX_DMA_IRQ, \ + .Instance = UART2_RX_DMA_INSTANCE, \ + .channel = UART2_RX_DMA_CHANNEL, \ + .dma_rcc = UART2_RX_DMA_RCC, \ + .dma_irq = UART2_RX_DMA_IRQ, \ } #endif /* UART2_DMA_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ @@ -79,10 +79,10 @@ extern "C" { #ifndef UART3_DMA_CONFIG #define UART3_DMA_CONFIG \ { \ - .Instance = USART3_RX_DMA_INSTANCE, \ - .channel = USART3_RX_DMA_CHANNEL, \ - .dma_rcc = USART3_RX_DMA_RCC, \ - .dma_irq = USART3_RX_DMA_IRQ, \ + .Instance = UART3_RX_DMA_INSTANCE, \ + .channel = UART3_RX_DMA_CHANNEL, \ + .dma_rcc = UART3_RX_DMA_RCC, \ + .dma_irq = UART3_RX_DMA_IRQ, \ } #endif /* UART3_DMA_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ @@ -102,10 +102,10 @@ extern "C" { #ifndef UART4_DMA_CONFIG #define UART4_DMA_CONFIG \ { \ - .Instance = USART4_RX_DMA_INSTANCE, \ - .channel = USART4_RX_DMA_CHANNEL, \ - .dma_rcc = USART4_RX_DMA_RCC, \ - .dma_irq = USART4_RX_DMA_IRQ, \ + .Instance = UART4_RX_DMA_INSTANCE, \ + .channel = UART4_RX_DMA_CHANNEL, \ + .dma_rcc = UART4_RX_DMA_RCC, \ + .dma_irq = UART4_RX_DMA_IRQ, \ } #endif /* UART4_DMA_CONFIG */ #endif /* BSP_UART4_RX_USING_DMA */ @@ -125,10 +125,10 @@ extern "C" { #ifndef UART5_DMA_CONFIG #define UART5_DMA_CONFIG \ { \ - .Instance = USART5_RX_DMA_INSTANCE, \ - .channel = USART5_RX_DMA_CHANNEL, \ - .dma_rcc = USART5_RX_DMA_RCC, \ - .dma_irq = USART5_RX_DMA_IRQ, \ + .Instance = UART5_RX_DMA_INSTANCE, \ + .channel = UART5_RX_DMA_CHANNEL, \ + .dma_rcc = UART5_RX_DMA_RCC, \ + .dma_irq = UART5_RX_DMA_IRQ, \ } #endif /* UART5_DMA_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ -- GitLab