From 0166f097ad19cf341321966ca0ebb8cfe383eb3c Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Fri, 27 Dec 2013 18:59:34 +0100 Subject: [PATCH] [uart] replace #ifdef USE_UARTx with #if USE_UARTx --- conf/modules/ahrs_chimu_uart.xml | 2 +- conf/modules/extra_dl.xml | 2 +- conf/modules/ins_xsens_MTiG_Uart0.xml | 2 +- conf/modules/ins_xsens_MTi_Uart0.xml | 2 +- sw/airborne/arch/lpc21/mcu_periph/uart_arch.c | 4 ++-- sw/airborne/arch/lpc21/usb_ser_hw.c | 4 ++-- sw/airborne/arch/lpc21/usb_tunnel.c | 2 +- sw/airborne/arch/omap/mcu_periph/uart_arch.c | 4 ++-- sw/airborne/arch/stm32/mcu_periph/uart_arch.c | 8 ++++---- sw/airborne/firmwares/beth/overo_test_uart.c | 4 ++-- sw/airborne/firmwares/beth/uart_hw.c | 12 ++++++------ sw/airborne/firmwares/beth/uart_hw.h | 4 ++-- sw/airborne/firmwares/logger/main_logger.c | 4 ++-- sw/airborne/mcu.c | 14 +++++++------- sw/airborne/mcu_periph/uart.c | 14 +++++++------- sw/airborne/mcu_periph/uart.h | 14 +++++++------- sw/airborne/subsystems/datalink/uart_print.h | 14 +++++++------- sw/airborne/subsystems/imu/imu_ardrone2_raw.c | 2 +- sw/airborne/test/test_adcs.c | 4 ++-- 19 files changed, 58 insertions(+), 58 deletions(-) diff --git a/conf/modules/ahrs_chimu_uart.xml b/conf/modules/ahrs_chimu_uart.xml index b0916a91957..8fc93dc5359 100644 --- a/conf/modules/ahrs_chimu_uart.xml +++ b/conf/modules/ahrs_chimu_uart.xml @@ -17,7 +17,7 @@ - + diff --git a/conf/modules/extra_dl.xml b/conf/modules/extra_dl.xml index 690fb1ff467..66792ec7fe2 100644 --- a/conf/modules/extra_dl.xml +++ b/conf/modules/extra_dl.xml @@ -11,7 +11,7 @@ - + diff --git a/conf/modules/ins_xsens_MTiG_Uart0.xml b/conf/modules/ins_xsens_MTiG_Uart0.xml index 5f0a4d12078..9a8162d3881 100644 --- a/conf/modules/ins_xsens_MTiG_Uart0.xml +++ b/conf/modules/ins_xsens_MTiG_Uart0.xml @@ -12,7 +12,7 @@ - + diff --git a/conf/modules/ins_xsens_MTi_Uart0.xml b/conf/modules/ins_xsens_MTi_Uart0.xml index daca33576ee..3eaa182b88d 100644 --- a/conf/modules/ins_xsens_MTi_Uart0.xml +++ b/conf/modules/ins_xsens_MTi_Uart0.xml @@ -11,7 +11,7 @@ - + diff --git a/sw/airborne/arch/lpc21/mcu_periph/uart_arch.c b/sw/airborne/arch/lpc21/mcu_periph/uart_arch.c index 5d594566c32..4af82a128b5 100644 --- a/sw/airborne/arch/lpc21/mcu_periph/uart_arch.c +++ b/sw/airborne/arch/lpc21/mcu_periph/uart_arch.c @@ -161,7 +161,7 @@ static inline void uart_ISR(struct uart_periph* p) } } -#ifdef USE_UART0 +#if USE_UART0 #ifndef UART0_VIC_SLOT #define UART0_VIC_SLOT 5 @@ -222,7 +222,7 @@ void uart0_init( void ) { #endif /* USE_UART0 */ -#ifdef USE_UART1 +#if USE_UART1 #ifndef UART1_VIC_SLOT #define UART1_VIC_SLOT 6 diff --git a/sw/airborne/arch/lpc21/usb_ser_hw.c b/sw/airborne/arch/lpc21/usb_ser_hw.c index 55f1e98d83d..f848426fb59 100644 --- a/sw/airborne/arch/lpc21/usb_ser_hw.c +++ b/sw/airborne/arch/lpc21/usb_ser_hw.c @@ -350,13 +350,13 @@ void set_linecoding(TLineCoding linecoding) break; } -#ifdef USE_UART0 +#if USE_UART0 U0LCR = ULCR_DLAB_ENABLE; // select divisor latches U0DLL = (uint8_t)baud; // set for baud low byte U0DLM = (uint8_t)(baud >> 8); // set for baud high byte U0LCR = (mode & ~ULCR_DLAB_ENABLE); #endif -#ifdef USE_UART1 +#if USE_UART1 U1LCR = ULCR_DLAB_ENABLE; // select divisor latches U1DLL = (uint8_t)baud; // set for baud low byte U1DLM = (uint8_t)(baud >> 8); // set for baud high byte diff --git a/sw/airborne/arch/lpc21/usb_tunnel.c b/sw/airborne/arch/lpc21/usb_tunnel.c index f93af9dba24..055cf89a7ce 100644 --- a/sw/airborne/arch/lpc21/usb_tunnel.c +++ b/sw/airborne/arch/lpc21/usb_tunnel.c @@ -55,7 +55,7 @@ int main( void ) { LED_ON(3); -#ifdef USE_UART0 +#if USE_UART0 while(1) { if (T0TC > (rx_time+((PCLK / T0_PCLK_DIV) / BLINK_MIN))) LED_OFF(1); if (T0TC > (tx_time+((PCLK / T0_PCLK_DIV) / BLINK_MIN))) LED_OFF(2); diff --git a/sw/airborne/arch/omap/mcu_periph/uart_arch.c b/sw/airborne/arch/omap/mcu_periph/uart_arch.c index ad6e85390a5..5e2b0564e47 100644 --- a/sw/airborne/arch/omap/mcu_periph/uart_arch.c +++ b/sw/airborne/arch/omap/mcu_periph/uart_arch.c @@ -117,7 +117,7 @@ static inline void uart_handler(struct uart_periph* periph) { } -#ifdef USE_UART0 +#if USE_UART0 void uart0_init( void ) { uart_periph_init(&uart0); @@ -132,7 +132,7 @@ void uart0_handler(void) { #endif /* USE_UART0 */ -#ifdef USE_UART1 +#if USE_UART1 void uart1_init( void ) { uart_periph_init(&uart1); diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c index ed6d1110e53..416254ca316 100644 --- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c +++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c @@ -183,7 +183,7 @@ static inline void usart_enable_irq(uint8_t IRQn) { } -#ifdef USE_UART1 +#if USE_UART1 /* by default enable UART Tx and Rx */ #ifndef USE_UART1_TX @@ -247,7 +247,7 @@ void usart1_isr(void) { usart_isr(&uart1); } #endif /* USE_UART1 */ -#ifdef USE_UART2 +#if USE_UART2 /* by default enable UART Tx and Rx */ #ifndef USE_UART2_TX @@ -311,7 +311,7 @@ void usart2_isr(void) { usart_isr(&uart2); } #endif /* USE_UART2 */ -#ifdef USE_UART3 +#if USE_UART3 /* by default enable UART Tx and Rx */ #ifndef USE_UART3_TX @@ -426,7 +426,7 @@ void uart4_isr(void) { usart_isr(&uart4); } #endif /* USE_UART4 */ -#ifdef USE_UART5 +#if USE_UART5 /* by default enable UART Tx and Rx */ #ifndef USE_UART5_TX diff --git a/sw/airborne/firmwares/beth/overo_test_uart.c b/sw/airborne/firmwares/beth/overo_test_uart.c index 572696f762f..b8dc51ffe7a 100644 --- a/sw/airborne/firmwares/beth/overo_test_uart.c +++ b/sw/airborne/firmwares/beth/overo_test_uart.c @@ -130,10 +130,10 @@ static void main_periodic(int my_sig_num) { RunOnceEvery(50, {DOWNLINK_SEND_ALIVE(gcs_com.udp_transport, 16, MD5SUM);}); RunOnceEvery(5, {DOWNLINK_SEND_ADC_GENERIC(gcs_com.udp_transport,&adc1,&adc2);}); -#ifdef USE_UART0 +#if USE_UART0 uart0_handler(); #endif -#ifdef USE_UART1 +#if USE_UART1 uart1_handler(); #endif DatalinkEvent() diff --git a/sw/airborne/firmwares/beth/uart_hw.c b/sw/airborne/firmwares/beth/uart_hw.c index 2d052312215..0bb74135316 100644 --- a/sw/airborne/firmwares/beth/uart_hw.c +++ b/sw/airborne/firmwares/beth/uart_hw.c @@ -30,7 +30,7 @@ #include "serial_port.h" -#ifdef USE_UART0 +#if USE_UART0 volatile uint16_t uart0_rx_insert_idx, uart0_rx_extract_idx; uint8_t uart0_rx_buffer[UART0_RX_BUFFER_SIZE]; @@ -156,7 +156,7 @@ void uart0_handler(void) { #endif /* USE_UART0 */ -#ifdef USE_UART1 +#if USE_UART1 volatile uint16_t uart1_rx_insert_idx, uart1_rx_extract_idx; uint8_t uart1_rx_buffer[UART1_RX_BUFFER_SIZE]; @@ -250,17 +250,17 @@ void uart1_handler(void) { void uart_init( void ) { -#ifdef USE_UART0 +#if USE_UART0 uart0_init(); #endif -#ifdef USE_UART1 +#if USE_UART1 uart1_init(); #endif //TODO: add uart2 and greater -#ifdef USE_UART2 +#if USE_UART2 uart2_init(); #endif -#ifdef USE_UART3 +#if USE_UART3 uart3_init(); #endif } diff --git a/sw/airborne/firmwares/beth/uart_hw.h b/sw/airborne/firmwares/beth/uart_hw.h index 10bc20184fc..e44b5334b28 100644 --- a/sw/airborne/firmwares/beth/uart_hw.h +++ b/sw/airborne/firmwares/beth/uart_hw.h @@ -44,7 +44,7 @@ extern void uart0_handler(void); #endif -#ifdef USE_UART0 +#if USE_UART0 #define UART0_RX_BUFFER_SIZE 128 #define UART0_TX_BUFFER_SIZE 128 @@ -69,7 +69,7 @@ extern void uart1_handler(void); #endif -#ifdef USE_UART1 +#if USE_UART1 #define UART1_RX_BUFFER_SIZE 128 #define UART1_TX_BUFFER_SIZE 128 diff --git a/sw/airborne/firmwares/logger/main_logger.c b/sw/airborne/firmwares/logger/main_logger.c index b7fd9abd9b5..03a87f34a5c 100644 --- a/sw/airborne/firmwares/logger/main_logger.c +++ b/sw/airborne/firmwares/logger/main_logger.c @@ -447,7 +447,7 @@ int do_log(void) } #endif -#ifdef USE_UART0 +#if USE_UART0 temp = 0; while (uart_char_available(&uart0) && (temp++ < 128)) { @@ -464,7 +464,7 @@ int do_log(void) #endif } #endif -#ifdef USE_UART1 +#if USE_UART1 temp = 0; while (uart_char_available(&uart1) && (temp++ < 128)) { diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c index e10967fc340..9e0df30b4dc 100644 --- a/sw/airborne/mcu.c +++ b/sw/airborne/mcu.c @@ -71,25 +71,25 @@ void mcu_init(void) { #if defined RADIO_CONTROL & defined RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT & defined RADIO_CONTROL_BIND_IMPL_FUNC RADIO_CONTROL_BIND_IMPL_FUNC(); #endif -#ifdef USE_UART0 +#if USE_UART0 uart0_init(); #endif -#ifdef USE_UART1 +#if USE_UART1 uart1_init(); #endif -#ifdef USE_UART2 +#if USE_UART2 uart2_init(); #endif -#ifdef USE_UART3 +#if USE_UART3 uart3_init(); #endif -#ifdef USE_UART4 +#if USE_UART4 uart4_init(); #endif -#ifdef USE_UART5 +#if USE_UART5 uart5_init(); #endif -#ifdef USE_UART6 +#if USE_UART6 uart6_init(); #endif #ifdef USE_I2C0 diff --git a/sw/airborne/mcu_periph/uart.c b/sw/airborne/mcu_periph/uart.c index 87667602f91..0f9f844e1f6 100644 --- a/sw/airborne/mcu_periph/uart.c +++ b/sw/airborne/mcu_periph/uart.c @@ -26,7 +26,7 @@ #include "subsystems/datalink/telemetry.h" #endif -#ifdef USE_UART0 +#if USE_UART0 struct uart_periph uart0; #if DOWNLINK @@ -42,7 +42,7 @@ static void send_uart0_err(void) { #endif -#ifdef USE_UART1 +#if USE_UART1 struct uart_periph uart1; #if DOWNLINK @@ -58,7 +58,7 @@ static void send_uart1_err(void) { #endif -#ifdef USE_UART2 +#if USE_UART2 struct uart_periph uart2; #if DOWNLINK @@ -74,7 +74,7 @@ static void send_uart2_err(void) { #endif -#ifdef USE_UART3 +#if USE_UART3 struct uart_periph uart3; #if DOWNLINK @@ -90,7 +90,7 @@ static void send_uart3_err(void) { #endif -#ifdef USE_UART4 +#if USE_UART4 struct uart_periph uart4; #if DOWNLINK @@ -106,7 +106,7 @@ static void send_uart4_err(void) { #endif -#ifdef USE_UART5 +#if USE_UART5 struct uart_periph uart5; #if DOWNLINK @@ -122,7 +122,7 @@ static void send_uart5_err(void) { #endif -#ifdef USE_UART6 +#if USE_UART6 struct uart_periph uart6; #if DOWNLINK diff --git a/sw/airborne/mcu_periph/uart.h b/sw/airborne/mcu_periph/uart.h index a508a0c4ceb..83cee5bdd56 100644 --- a/sw/airborne/mcu_periph/uart.h +++ b/sw/airborne/mcu_periph/uart.h @@ -92,7 +92,7 @@ static inline uint16_t uart_char_available(struct uart_periph* p) { } -#ifdef USE_UART0 +#if USE_UART0 extern struct uart_periph uart0; extern void uart0_init(void); @@ -108,7 +108,7 @@ extern void uart0_init(void); #endif // USE_UART0 -#ifdef USE_UART1 +#if USE_UART1 extern struct uart_periph uart1; extern void uart1_init(void); @@ -124,7 +124,7 @@ extern void uart1_init(void); #endif // USE_UART1 -#ifdef USE_UART2 +#if USE_UART2 extern struct uart_periph uart2; extern void uart2_init(void); @@ -140,7 +140,7 @@ extern void uart2_init(void); #endif // USE_UART2 -#ifdef USE_UART3 +#if USE_UART3 extern struct uart_periph uart3; extern void uart3_init(void); @@ -156,7 +156,7 @@ extern void uart3_init(void); #endif // USE_UART3 -#ifdef USE_UART4 +#if USE_UART4 extern struct uart_periph uart4; extern void uart4_init(void); @@ -172,7 +172,7 @@ extern void uart4_init(void); #endif // USE_UART4 -#ifdef USE_UART5 +#if USE_UART5 extern struct uart_periph uart5; extern void uart5_init(void); @@ -188,7 +188,7 @@ extern void uart5_init(void); #endif // USE_UART5 -#ifdef USE_UART6 +#if USE_UART6 extern struct uart_periph uart6; extern void uart6_init(void); diff --git a/sw/airborne/subsystems/datalink/uart_print.h b/sw/airborne/subsystems/datalink/uart_print.h index 21fa6308b5c..b8da58accb5 100644 --- a/sw/airborne/subsystems/datalink/uart_print.h +++ b/sw/airborne/subsystems/datalink/uart_print.h @@ -56,7 +56,7 @@ _PrintHex16(out_fun, low32); \ } -#ifdef USE_UART0 +#if USE_UART0 #define UART0PrintHex(c) _PrintHex(UART0Transmit, c) #define UART0PrintHex16(c) _PrintHex16(UART0Transmit, c) @@ -65,7 +65,7 @@ #endif /* USE_UART0 */ -#ifdef USE_UART1 +#if USE_UART1 #define UART1PrintHex(c) _PrintHex(UART1Transmit, c) #define UART1PrintHex16(c) _PrintHex16(UART1Transmit, c) @@ -74,7 +74,7 @@ #endif /* USE_UART1 */ -#ifdef USE_UART2 +#if USE_UART2 #define UART2PrintHex(c) _PrintHex(UART2Transmit, c) #define UART2PrintHex16(c) _PrintHex16(UART2Transmit, c) @@ -83,7 +83,7 @@ #endif /* USE_UART2 */ -#ifdef USE_UART3 +#if USE_UART3 #define UART3PrintHex(c) _PrintHex(UART3Transmit, c) #define UART3PrintHex16(c) _PrintHex16(UART3Transmit, c) @@ -92,7 +92,7 @@ #endif /* USE_UART3 */ -#ifdef USE_UART4 +#if USE_UART4 #define UART4PrintHex(c) _PrintHex(UART4Transmit, c) #define UART4PrintHex16(c) _PrintHex16(UART4Transmit, c) @@ -101,7 +101,7 @@ #endif /* USE_UART4 */ -#ifdef USE_UART5 +#if USE_UART5 #define UART5PrintHex(c) _PrintHex(UART5Transmit, c) #define UART5PrintHex16(c) _PrintHex16(UART5Transmit, c) @@ -110,7 +110,7 @@ #endif /* USE_UART5 */ -#ifdef USE_UART6 +#if USE_UART6 #define UART6PrintHex(c) _PrintHex(UART6Transmit, c) #define UART6PrintHex16(c) _PrintHex16(UART6Transmit, c) diff --git a/sw/airborne/subsystems/imu/imu_ardrone2_raw.c b/sw/airborne/subsystems/imu/imu_ardrone2_raw.c index a16afa49385..860de29c096 100644 --- a/sw/airborne/subsystems/imu/imu_ardrone2_raw.c +++ b/sw/airborne/subsystems/imu/imu_ardrone2_raw.c @@ -38,7 +38,7 @@ void imu_periodic(void) { void navdata_event(void) { -#ifdef USE_UART1 +#if USE_UART1 uart1_handler(); #endif } diff --git a/sw/airborne/test/test_adcs.c b/sw/airborne/test/test_adcs.c index ddf69c035ba..39d2b76d5f1 100644 --- a/sw/airborne/test/test_adcs.c +++ b/sw/airborne/test/test_adcs.c @@ -41,10 +41,10 @@ int main (int argc, char** argv) { #error "8 ADCs expected !" #endif -#ifdef USE_UART0 +#if USE_UART0 uart_periph_init(&uart0); #endif -#ifdef USE_UART1 +#if USE_UART1 uart_periph_init(&uart1); #endif