From 0c81552866f2330755916fd5e66ea9dde6b40451 Mon Sep 17 00:00:00 2001 From: LYH-ux <1780328728@qq.com> Date: Thu, 2 Jul 2020 14:43:10 +0800 Subject: [PATCH] modify the incident in config/*.h --- .../libraries/Drivers/config/adc_config.h | 12 +- .../libraries/Drivers/config/pwm_config.h | 114 +++++++++--------- .../libraries/Drivers/config/spi_config.h | 14 +-- .../libraries/Drivers/config/uart_config.h | 34 +++--- 4 files changed, 87 insertions(+), 87 deletions(-) diff --git a/bsp/tm4c123bsp/libraries/Drivers/config/adc_config.h b/bsp/tm4c123bsp/libraries/Drivers/config/adc_config.h index c0f2d12ca1..cfeb256020 100644 --- a/bsp/tm4c123bsp/libraries/Drivers/config/adc_config.h +++ b/bsp/tm4c123bsp/libraries/Drivers/config/adc_config.h @@ -22,8 +22,8 @@ extern "C" { .name ="adc0", \ .adcbase = ADC0_BASE, \ .channel = 0 , \ - .sequence = 2 , \ - .trigermode = ADC_TRIGGER_PROCESSOR, \ + .sequence = 2 , \ + .trigermode = ADC_TRIGGER_PROCESSOR, \ .sequencepriority = 0 \ } #endif /* ADC0_CONFIG */ @@ -36,13 +36,13 @@ extern "C" { .name = "adc1", \ .adcbase = ADC1_BASE, \ .channel = 0 , \ - .sequence = 3 , \ - .syncMode = ADC_TRIGGER_PROCESSOR, \ + .sequence = 3 , \ + .syncMode = ADC_TRIGGER_PROCESSOR, \ .sequencepriority = 0 \ } #endif /* ADC1_CONFIG */ -#endif /* BSP_USING_ADC1 */ - +#endif /* BSP_USING_ADC1 */ + #ifdef __cplusplus } #endif diff --git a/bsp/tm4c123bsp/libraries/Drivers/config/pwm_config.h b/bsp/tm4c123bsp/libraries/Drivers/config/pwm_config.h index 92dcdeabc6..e44eb372e4 100644 --- a/bsp/tm4c123bsp/libraries/Drivers/config/pwm_config.h +++ b/bsp/tm4c123bsp/libraries/Drivers/config/pwm_config.h @@ -14,103 +14,103 @@ #ifdef __cplusplus extern "C" { #endif - + #ifdef BSP_USING_PWM0 #ifndef PWM0_CONFIG -#define PWM0_CONFIG \ - { \ - .name = "pwm0", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM0_CONFIG \ + { \ + .name = "pwm0", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM0_CONFIG */ #endif /* BSP_USING_PWM0 */ #ifdef BSP_USING_PWM1 #ifndef PWM1_CONFIG -#define PWM1_CONFIG \ - { \ - .name = "pwm1", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM1_CONFIG \ + { \ + .name = "pwm1", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM1_CONFIG */ -#endif /* BSP_USING_PWM1 */ - +#endif /* BSP_USING_PWM1 */ + #ifdef BSP_USING_PWM2 #ifndef PWM2_CONFIG -#define PWM2_CONFIG \ - { \ - .name = "pwm2", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM2_CONFIG \ + { \ + .name = "pwm2", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM2_CONFIG */ #endif /* BSP_USING_PWM2 */ #ifdef BSP_USING_PWM3 #ifndef PWM3_CONFIG -#define PWM3_CONFIG \ - { \ - .name = "pwm3", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM3_CONFIG \ + { \ + .name = "pwm3", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM3_CONFIG */ #endif /* BSP_USING_PWM3 */ #ifdef BSP_USING_PWM4 #ifndef PWM4_CONFIG -#define PWM4_CONFIG \ - { \ - .name = "pwm4", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM4_CONFIG \ + { \ + .name = "pwm4", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM4_CONFIG */ #endif /* BSP_USING_PWM4 */ #ifdef BSP_USING_PWM5 #ifndef PWM5_CONFIG -#define PWM5_CONFIG \ - { \ - .name = "pwm5", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM5_CONFIG \ + { \ + .name = "pwm5", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM5_CONFIG */ -#endif /* BSP_USING_PWM5 */ - +#endif /* BSP_USING_PWM5 */ + #ifdef BSP_USING_PWM6 #ifndef PWM6_CONFIG -#define PWM6_CONFIG \ - { \ - .name = "pwm6", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM6_CONFIG \ + { \ + .name = "pwm6", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM6_CONFIG */ -#endif /* BSP_USING_PWM6 */ - +#endif /* BSP_USING_PWM6 */ + #ifdef BSP_USING_PWM7 #ifndef PWM7_CONFIG -#define PWM7_CONFIG \ - { \ - .name = "pwm7", \ - .channel = 0 , \ - .counterMode = PWM_GEN_MODE_UP_DOWN , \ - .syncMode = PWM_GEN_MODE_NO_SYNC \ +#define PWM7_CONFIG \ + { \ + .name = "pwm7", \ + .channel = 0 , \ + .counterMode = PWM_GEN_MODE_UP_DOWN , \ + .syncMode = PWM_GEN_MODE_NO_SYNC \ } #endif /* PWM7_CONFIG */ -#endif /* BSP_USING_PWM7 */ - +#endif /* BSP_USING_PWM7 */ + #ifdef __cplusplus } #endif diff --git a/bsp/tm4c123bsp/libraries/Drivers/config/spi_config.h b/bsp/tm4c123bsp/libraries/Drivers/config/spi_config.h index 8a4cfcbc4e..7da0b7852f 100644 --- a/bsp/tm4c123bsp/libraries/Drivers/config/spi_config.h +++ b/bsp/tm4c123bsp/libraries/Drivers/config/spi_config.h @@ -21,7 +21,7 @@ extern "C" { #ifndef SPI0_BUS_CONFIG #define SPI0_BUS_CONFIG \ { \ - .base = SSI0_BASE, \ + .base = SSI0_BASE, \ .bus_name = "spi0", \ } #endif /* SPI0_BUS_CONFIG */ @@ -31,32 +31,32 @@ extern "C" { #ifndef SPI1_BUS_CONFIG #define SPI1_BUS_CONFIG \ { \ - .base = SSI1_BASE, \ + .base = SSI1_BASE, \ .bus_name = "spi1", \ } #endif /* SPI1_BUS_CONFIG */ #endif /* BSP_USING_SPI1 */ - + #ifdef BSP_USING_SPI2 #ifndef SPI2_BUS_CONFIG #define SPI2_BUS_CONFIG \ { \ - .base = SSI2_BASE, \ + .base = SSI2_BASE, \ .bus_name = "spi2", \ } #endif /* SPI2_BUS_CONFIG */ #endif /* BSP_USING_SPI2 */ - + #ifdef BSP_USING_SPI3 #ifndef SPI3_BUS_CONFIG #define SPI3_BUS_CONFIG \ { \ - .base = SSI3_BASE, \ + .base = SSI3_BASE, \ .bus_name = "spi3", \ } #endif /* SPI3_BUS_CONFIG */ #endif /* BSP_USING_SPI3 */ - + #ifdef __cplusplus } #endif diff --git a/bsp/tm4c123bsp/libraries/Drivers/config/uart_config.h b/bsp/tm4c123bsp/libraries/Drivers/config/uart_config.h index f583569f72..b8fd375d07 100644 --- a/bsp/tm4c123bsp/libraries/Drivers/config/uart_config.h +++ b/bsp/tm4c123bsp/libraries/Drivers/config/uart_config.h @@ -20,22 +20,22 @@ extern "C" { #define UART0_CONFIG \ { \ .name = "uart0", \ - .uartbase = UART0_BASE, \ - .baudrate = 115200, \ - .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ + .uartbase = UART0_BASE, \ + .baudrate = 115200, \ + .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ UART_CONFIG_PAR_NONE \ } #endif /* UART1_CONFIG */ -#endif /* BSP_USING_UART1*/ - +#endif /* BSP_USING_UART1*/ + #if defined(BSP_USING_UART1) #ifndef UART1_CONFIG #define UART1_CONFIG \ { \ .name = "uart1", \ - .uartbase = UART1_BASE, \ - .baudrate = 115200, \ - .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ + .uartbase = UART1_BASE, \ + .baudrate = 115200, \ + .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ UART_CONFIG_PAR_NONE \ } #endif /* UART1_CONFIG */ @@ -46,27 +46,27 @@ extern "C" { #define UART2_CONFIG \ { \ .name = "uart2", \ - .uartbase = UART2_BASE, \ - .baudrate = 115200, \ - .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ + .uartbase = UART2_BASE, \ + .baudrate = 115200, \ + .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ UART_CONFIG_PAR_NONE \ } #endif /* UART2_CONFIG */ #endif /* BSP_USING_UART2*/ - + #if defined(BSP_USING_UART3) #ifndef UART3_CONFIG #define UART3_CONFIG \ { \ .name = "uart3", \ - .uartbase = UART3_BASE, \ - .baudrate = 115200, \ - .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ + .uartbase = UART3_BASE, \ + .baudrate = 115200, \ + .mode = UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | \ UART_CONFIG_PAR_NONE \ } #endif /* UART3_CONFIG */ -#endif /* BSP_USING_UART3*/ - +#endif /* BSP_USING_UART3*/ + #ifdef __cplusplus } #endif