Merge remote-tracking branch 'remotes/origin/master' into add_stm32_new_framework

bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h

@@ -132,12 +132,12 @@ extern "C" {
 #define SPI1_RX_DMA_INSTANCE             DMA2_Stream2
 #define SPI1_RX_DMA_CHANNEL              DMA_CHANNEL_3
 #define SPI1_RX_DMA_IRQ                  DMA2_Stream2_IRQn
-#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
-#define USART1_DMA_RX_IRQHandler         DMA2_Stream2_IRQHandler
-#define USART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
-#define USART1_RX_DMA_INSTANCE           DMA2_Stream2
-#define USART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
-#define USART1_RX_DMA_IRQ                DMA2_Stream2_IRQn
+#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
+#define UART1_DMA_RX_IRQHandler         DMA2_Stream2_IRQHandler
+#define UART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
+#define UART1_RX_DMA_INSTANCE           DMA2_Stream2
+#define UART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
+#define UART1_RX_DMA_IRQ                DMA2_Stream2_IRQn
 #endif
 
 /* DMA2 stream3 */
@@ -184,12 +184,12 @@ extern "C" {
 #define SPI1_TX_DMA_INSTANCE             DMA2_Stream5
 #define SPI1_TX_DMA_CHANNEL              DMA_CHANNEL_3
 #define SPI1_TX_DMA_IRQ                  DMA2_Stream5_IRQn
-#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
-#define USART1_DMA_RX_IRQHandler         DMA2_Stream5_IRQHandler
-#define USART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
-#define USART1_RX_DMA_INSTANCE           DMA2_Stream5
-#define USART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
-#define USART1_RX_DMA_IRQ                DMA2_Stream5_IRQn
+#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
+#define UART1_DMA_RX_IRQHandler         DMA2_Stream5_IRQHandler
+#define UART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
+#define UART1_RX_DMA_INSTANCE           DMA2_Stream5
+#define UART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
+#define UART1_RX_DMA_IRQ                DMA2_Stream5_IRQn
 #elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
 #define SPI5_DMA_RX_IRQHandler           DMA2_Stream5_IRQHandler
 #define SPI5_RX_DMA_RCC                  RCC_AHB1ENR_DMA2EN

bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h

@@ -33,10 +33,10 @@ extern "C" {
 #ifndef UART1_DMA_CONFIG
 #define UART1_DMA_CONFIG                                            \
     {                                                               \
-        .Instance = USART1_RX_DMA_INSTANCE,                         \
-        .channel = USART1_RX_DMA_CHANNEL,                           \
-        .dma_rcc = USART1_RX_DMA_RCC,                               \
-        .dma_irq = USART1_RX_DMA_IRQ,                               \
+        .Instance = UART1_RX_DMA_INSTANCE,                         \
+        .channel = UART1_RX_DMA_CHANNEL,                           \
+        .dma_rcc = UART1_RX_DMA_RCC,                               \
+        .dma_irq = UART1_RX_DMA_IRQ,                               \
     }
 #endif /* UART1_DMA_CONFIG */
 #endif /* BSP_UART1_RX_USING_DMA */

bsp/stm32/libraries/HAL_Drivers/config/f7/dma_config.h

@@ -133,12 +133,12 @@ extern "C" {
 #define SPI1_RX_DMA_INSTANCE             DMA2_Stream2
 #define SPI1_RX_DMA_CHANNEL              DMA_CHANNEL_3
 #define SPI1_RX_DMA_IRQ                  DMA2_Stream2_IRQn
-#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
-#define USART1_DMA_RX_IRQHandler         DMA2_Stream2_IRQHandler
-#define USART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
-#define USART1_RX_DMA_INSTANCE           DMA2_Stream2
-#define USART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
-#define USART1_RX_DMA_IRQ                DMA2_Stream2_IRQn
+#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
+#define UART1_DMA_RX_IRQHandler         DMA2_Stream2_IRQHandler
+#define UART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
+#define UART1_RX_DMA_INSTANCE           DMA2_Stream2
+#define UART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
+#define UART1_RX_DMA_IRQ                DMA2_Stream2_IRQn
 #elif defined(BSP_QSPI_USING_DMA) && !defined(QSPI_DMA_INSTANCE)
 #define QSPI_DMA_IRQHandler              DMA2_Stream2_IRQHandler
 #define QSPI_DMA_RCC                     RCC_AHB1ENR_DMA2EN
@@ -190,12 +190,12 @@ extern "C" {
 #define SPI1_TX_DMA_INSTANCE             DMA2_Stream5
 #define SPI1_TX_DMA_CHANNEL              DMA_CHANNEL_3
 #define SPI1_TX_DMA_IRQ                  DMA2_Stream5_IRQn
-#elif defined(BSP_UART1_RX_USING_DMA) && !defined(USART1_RX_DMA_INSTANCE)
-#define USART1_DMA_RX_IRQHandler         DMA2_Stream5_IRQHandler
-#define USART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
-#define USART1_RX_DMA_INSTANCE           DMA2_Stream5
-#define USART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
-#define USART1_RX_DMA_IRQ                DMA2_Stream5_IRQn
+#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
+#define UART1_DMA_RX_IRQHandler         DMA2_Stream5_IRQHandler
+#define UART1_RX_DMA_RCC                RCC_AHB1ENR_DMA2EN
+#define UART1_RX_DMA_INSTANCE           DMA2_Stream5
+#define UART1_RX_DMA_CHANNEL            DMA_CHANNEL_4
+#define UART1_RX_DMA_IRQ                DMA2_Stream5_IRQn
 #elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
 #define SPI5_DMA_RX_IRQHandler           DMA2_Stream5_IRQHandler
 #define SPI5_RX_DMA_RCC                  RCC_AHB1ENR_DMA2EN

bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h

@@ -33,10 +33,10 @@ extern "C" {
 #ifndef UART1_DMA_CONFIG
 #define UART1_DMA_CONFIG                                            \
     {                                                               \
-        .Instance = USART1_RX_DMA_INSTANCE,                         \
-        .channel = USART1_RX_DMA_CHANNEL,                           \
-        .dma_rcc = USART1_RX_DMA_RCC,                               \
-        .dma_irq = USART1_RX_DMA_IRQ,                               \
+        .Instance = UART1_RX_DMA_INSTANCE,                         \
+        .channel = UART1_RX_DMA_CHANNEL,                           \
+        .dma_rcc = UART1_RX_DMA_RCC,                               \
+        .dma_irq = UART1_RX_DMA_IRQ,                               \
     }
 #endif /* UART1_DMA_CONFIG */
 #endif /* BSP_UART1_RX_USING_DMA */

bsp/stm32/libraries/HAL_Drivers/drv_usart.c

@@ -308,7 +308,7 @@ void USART1_IRQHandler(void)
     rt_interrupt_leave();
 }
 #if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART1_RX_USING_DMA)
-void USART1_DMA_RX_IRQHandler(void)
+void UART1_DMA_RX_IRQHandler(void)
 {
     /* enter interrupt */
     rt_interrupt_enter();
@@ -333,7 +333,7 @@ void USART2_IRQHandler(void)
     rt_interrupt_leave();
 }
 #if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART2_RX_USING_DMA)
-void USART2_DMA_RX_IRQHandler(void)
+void UART2_DMA_RX_IRQHandler(void)
 {
     /* enter interrupt */
     rt_interrupt_enter();
@@ -358,7 +358,7 @@ void USART3_IRQHandler(void)
     rt_interrupt_leave();
 }
 #if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART3_RX_USING_DMA)
-void USART3_DMA_RX_IRQHandler(void)
+void UART3_DMA_RX_IRQHandler(void)
 {
     /* enter interrupt */
     rt_interrupt_enter();
@@ -383,7 +383,7 @@ void UART4_IRQHandler(void)
     rt_interrupt_leave();
 }
 #if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART4_RX_USING_DMA)
-void USART4_DMA_RX_IRQHandler(void)
+void UART4_DMA_RX_IRQHandler(void)
 {
     /* enter interrupt */
     rt_interrupt_enter();
@@ -408,7 +408,7 @@ void UART5_IRQHandler(void)
     rt_interrupt_leave();
 }
 #if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART5_RX_USING_DMA)
-void USART5_DMA_RX_IRQHandler(void)
+void UART5_DMA_RX_IRQHandler(void)
 {
     /* enter interrupt */
     rt_interrupt_enter();