From 9e260109483ed2d410f12c46e119f5b21c842d0d Mon Sep 17 00:00:00 2001 From: SummerGift Date: Fri, 24 May 2019 20:52:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E6=B7=BB=E5=8A=A0=E4=B8=B2=E5=8F=A3=20DMA=20=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=AF=B9=E4=B8=B2=E5=8F=A3=20DMA=20=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=A0=E6=88=90=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HAL_Drivers/config/f0/uart_config.h | 12 ++++---- .../HAL_Drivers/config/f1/uart_config.h | 6 ++-- .../HAL_Drivers/config/f7/uart_config.h | 30 +++++++++---------- .../HAL_Drivers/config/g0/uart_config.h | 30 +++++++++---------- .../HAL_Drivers/config/h7/uart_config.h | 30 +++++++++---------- .../HAL_Drivers/config/l0/uart_config.h | 12 ++++---- .../HAL_Drivers/config/l4/uart_config.h | 18 +++++------ 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f0/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f0/uart_config.h index 04b3be7557..ea5e767aed 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f0/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f0/uart_config.h @@ -29,14 +29,14 @@ extern "C" { #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .Instance = UART1_RX_DMA_INSTANCE, \ .dma_rcc = UART1_RX_DMA_RCC, \ .dma_irq = UART1_RX_DMA_IRQ, \ } -#endif /* UART1_DMA_CONFIG */ +#endif /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -51,14 +51,14 @@ extern "C" { #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .Instance = UART2_RX_DMA_INSTANCE, \ .dma_rcc = UART2_RX_DMA_RCC, \ .dma_irq = UART2_RX_DMA_IRQ, \ } -#endif /* UART2_DMA_CONFIG */ +#endif /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h index b6f9576fde..a08196e996 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h @@ -163,12 +163,12 @@ extern "C" { #endif /* BSP_USING_UART5 */ #if defined(BSP_UART5_RX_USING_DMA) -#ifndef UART5_DMA_CONFIG -#define UART5_DMA_CONFIG \ +#ifndef UART5_DMA_RX_CONFIG +#define UART5_DMA_RX_CONFIG \ { \ .Instance = DMA_NOT_AVAILABLE, \ } -#endif /* UART5_DMA_CONFIG */ +#endif /* UART5_DMA_RX_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ #ifdef __cplusplus 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 7e4c87a61e..2fefa1344c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h @@ -30,15 +30,15 @@ extern "C" { #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .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 /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -53,15 +53,15 @@ extern "C" { #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .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 /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #if defined(BSP_USING_UART3) @@ -76,15 +76,15 @@ extern "C" { #endif /* BSP_USING_UART3 */ #if defined(BSP_UART3_RX_USING_DMA) -#ifndef UART3_DMA_CONFIG -#define UART3_DMA_CONFIG \ +#ifndef UART3_DMA_RX_CONFIG +#define UART3_DMA_RX_CONFIG \ { \ .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 /* UART3_DMA_RX_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ #if defined(BSP_USING_UART4) @@ -99,15 +99,15 @@ extern "C" { #endif /* BSP_USING_UART4 */ #if defined(BSP_UART4_RX_USING_DMA) -#ifndef UART4_DMA_CONFIG -#define UART4_DMA_CONFIG \ +#ifndef UART4_DMA_RX_CONFIG +#define UART4_DMA_RX_CONFIG \ { \ .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 /* UART4_DMA_RX_CONFIG */ #endif /* BSP_UART4_RX_USING_DMA */ #if defined(BSP_USING_UART5) @@ -122,15 +122,15 @@ extern "C" { #endif /* BSP_USING_UART5 */ #if defined(BSP_UART5_RX_USING_DMA) -#ifndef UART5_DMA_CONFIG -#define UART5_DMA_CONFIG \ +#ifndef UART5_DMA_RX_CONFIG +#define UART5_DMA_RX_CONFIG \ { \ .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 /* UART5_DMA_RX_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/g0/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/g0/uart_config.h index a3019f5dec..f38baf0b63 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/g0/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/g0/uart_config.h @@ -48,15 +48,15 @@ #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .Instance = UART1_RX_DMA_INSTANCE, \ .request = UART1_RX_DMA_REQUEST, \ .dma_rcc = UART1_RX_DMA_RCC, \ .dma_irq = UART1_RX_DMA_IRQ, \ } -#endif /* UART1_DMA_CONFIG */ +#endif /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -71,15 +71,15 @@ #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .Instance = UART2_RX_DMA_INSTANCE, \ .request = UART2_RX_DMA_REQUEST, \ .dma_rcc = UART2_RX_DMA_RCC, \ .dma_irq = UART2_RX_DMA_IRQ, \ } -#endif /* UART2_DMA_CONFIG */ +#endif /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #if defined(BSP_USING_UART3) @@ -103,15 +103,15 @@ #endif /* BSP_USING_UART3 */ #if defined(BSP_UART3_RX_USING_DMA) -#ifndef UART3_DMA_CONFIG -#define UART3_DMA_CONFIG \ +#ifndef UART3_DMA_RX_CONFIG +#define UART3_DMA_RX_CONFIG \ { \ .Instance = UART3_RX_DMA_INSTANCE, \ .request = UART3_RX_DMA_REQUEST, \ .dma_rcc = UART3_RX_DMA_RCC, \ .dma_irq = UART3_RX_DMA_IRQ, \ } -#endif /* UART3_DMA_CONFIG */ +#endif /* UART3_DMA_RX_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ #if defined(BSP_USING_UART4) @@ -135,15 +135,15 @@ #endif /* BSP_USING_UART4 */ #if defined(BSP_UART4_RX_USING_DMA) -#ifndef UART4_DMA_CONFIG -#define UART4_DMA_CONFIG \ +#ifndef UART4_DMA_RX_CONFIG +#define UART4_DMA_RX_CONFIG \ { \ .Instance = UART4_RX_DMA_INSTANCE, \ .request = UART4_RX_DMA_REQUEST, \ .dma_rcc = UART4_RX_DMA_RCC, \ .dma_irq = UART4_RX_DMA_IRQ, \ } -#endif /* UART4_DMA_CONFIG */ +#endif /* UART4_DMA_RX_CONFIG */ #endif /* BSP_UART4_RX_USING_DMA */ #if defined(BSP_USING_UART5) @@ -158,12 +158,12 @@ #endif /* BSP_USING_UART5 */ #if defined(BSP_UART5_RX_USING_DMA) -#ifndef UART5_DMA_CONFIG -#define UART5_DMA_CONFIG \ +#ifndef UART5_DMA_RX_CONFIG +#define UART5_DMA_RX_CONFIG \ { \ .Instance = DMA_NOT_AVAILABLE, \ } -#endif /* UART5_DMA_CONFIG */ +#endif /* UART5_DMA_RX_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/h7/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/h7/uart_config.h index 7e4c87a61e..2fefa1344c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/h7/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/h7/uart_config.h @@ -30,15 +30,15 @@ extern "C" { #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .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 /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -53,15 +53,15 @@ extern "C" { #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .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 /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #if defined(BSP_USING_UART3) @@ -76,15 +76,15 @@ extern "C" { #endif /* BSP_USING_UART3 */ #if defined(BSP_UART3_RX_USING_DMA) -#ifndef UART3_DMA_CONFIG -#define UART3_DMA_CONFIG \ +#ifndef UART3_DMA_RX_CONFIG +#define UART3_DMA_RX_CONFIG \ { \ .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 /* UART3_DMA_RX_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ #if defined(BSP_USING_UART4) @@ -99,15 +99,15 @@ extern "C" { #endif /* BSP_USING_UART4 */ #if defined(BSP_UART4_RX_USING_DMA) -#ifndef UART4_DMA_CONFIG -#define UART4_DMA_CONFIG \ +#ifndef UART4_DMA_RX_CONFIG +#define UART4_DMA_RX_CONFIG \ { \ .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 /* UART4_DMA_RX_CONFIG */ #endif /* BSP_UART4_RX_USING_DMA */ #if defined(BSP_USING_UART5) @@ -122,15 +122,15 @@ extern "C" { #endif /* BSP_USING_UART5 */ #if defined(BSP_UART5_RX_USING_DMA) -#ifndef UART5_DMA_CONFIG -#define UART5_DMA_CONFIG \ +#ifndef UART5_DMA_RX_CONFIG +#define UART5_DMA_RX_CONFIG \ { \ .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 /* UART5_DMA_RX_CONFIG */ #endif /* BSP_UART5_RX_USING_DMA */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l0/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l0/uart_config.h index 04b3be7557..ea5e767aed 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l0/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l0/uart_config.h @@ -29,14 +29,14 @@ extern "C" { #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .Instance = UART1_RX_DMA_INSTANCE, \ .dma_rcc = UART1_RX_DMA_RCC, \ .dma_irq = UART1_RX_DMA_IRQ, \ } -#endif /* UART1_DMA_CONFIG */ +#endif /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -51,14 +51,14 @@ extern "C" { #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .Instance = UART2_RX_DMA_INSTANCE, \ .dma_rcc = UART2_RX_DMA_RCC, \ .dma_irq = UART2_RX_DMA_IRQ, \ } -#endif /* UART2_DMA_CONFIG */ +#endif /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #ifdef __cplusplus diff --git a/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h b/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h index 71d61065c9..d6f972e7d9 100644 --- a/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h +++ b/bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h @@ -51,15 +51,15 @@ extern "C" { #endif /* BSP_USING_UART1 */ #if defined(BSP_UART1_RX_USING_DMA) -#ifndef UART1_DMA_CONFIG -#define UART1_DMA_CONFIG \ +#ifndef UART1_DMA_RX_CONFIG +#define UART1_DMA_RX_CONFIG \ { \ .Instance = UART1_RX_DMA_INSTANCE, \ .request = UART1_RX_DMA_REQUEST, \ .dma_rcc = UART1_RX_DMA_RCC, \ .dma_irq = UART1_RX_DMA_IRQ, \ } -#endif /* UART1_DMA_CONFIG */ +#endif /* UART1_DMA_RX_CONFIG */ #endif /* BSP_UART1_RX_USING_DMA */ #if defined(BSP_USING_UART2) @@ -74,15 +74,15 @@ extern "C" { #endif /* BSP_USING_UART2 */ #if defined(BSP_UART2_RX_USING_DMA) -#ifndef UART2_DMA_CONFIG -#define UART2_DMA_CONFIG \ +#ifndef UART2_DMA_RX_CONFIG +#define UART2_DMA_RX_CONFIG \ { \ .Instance = UART2_RX_DMA_INSTANCE, \ .request = UART2_RX_DMA_REQUEST, \ .dma_rcc = UART2_RX_DMA_RCC, \ .dma_irq = UART2_RX_DMA_IRQ, \ } -#endif /* UART2_DMA_CONFIG */ +#endif /* UART2_DMA_RX_CONFIG */ #endif /* BSP_UART2_RX_USING_DMA */ #if defined(BSP_USING_UART3) @@ -97,15 +97,15 @@ extern "C" { #endif /* BSP_USING_UART3 */ #if defined(BSP_UART3_RX_USING_DMA) -#ifndef UART3_DMA_CONFIG -#define UART3_DMA_CONFIG \ +#ifndef UART3_DMA_RX_CONFIG +#define UART3_DMA_RX_CONFIG \ { \ .Instance = UART3_RX_DMA_INSTANCE, \ .request = UART3_RX_DMA_REQUEST, \ .dma_rcc = UART3_RX_DMA_RCC, \ .dma_irq = UART3_RX_DMA_IRQ, \ } -#endif /* UART3_DMA_CONFIG */ +#endif /* UART3_DMA_RX_CONFIG */ #endif /* BSP_UART3_RX_USING_DMA */ #ifdef __cplusplus