From 6f22616cf7d4daae2efa3e4d933f3fc195b13ebe Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Sun, 29 Dec 2013 05:09:28 +0100 Subject: [PATCH] [uart] if USE_UARTx instead of defined USE_UARTx --- sw/airborne/arch/omap/mcu_periph/uart_arch.h | 4 ++-- sw/airborne/arch/stm32/mcu_periph/uart_arch.c | 4 ++-- sw/airborne/firmwares/beth/uart_hw.h | 4 ++-- sw/airborne/mcu.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sw/airborne/arch/omap/mcu_periph/uart_arch.h b/sw/airborne/arch/omap/mcu_periph/uart_arch.h index 24c341234f3..eec0d3ab0cd 100644 --- a/sw/airborne/arch/omap/mcu_periph/uart_arch.h +++ b/sw/airborne/arch/omap/mcu_periph/uart_arch.h @@ -36,11 +36,11 @@ #define UART3_irq_handler usart3_irq_handler #define UART5_irq_handler usart5_irq_handler -#if defined USE_UART0 || OVERRIDE_UART0_IRQ_HANDLER +#if USE_UART0 || OVERRIDE_UART0_IRQ_HANDLER extern void uart0_handler(void); #endif -#if defined USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER +#if USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER extern void uart1_handler(void); #endif diff --git a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c index 416254ca316..498ca3b9b83 100644 --- a/sw/airborne/arch/stm32/mcu_periph/uart_arch.c +++ b/sw/airborne/arch/stm32/mcu_periph/uart_arch.c @@ -375,7 +375,7 @@ void usart3_isr(void) { usart_isr(&uart3); } #endif /* USE_UART3 */ -#if defined USE_UART4 && defined STM32F4 +#if USE_UART4 && defined STM32F4 /* by default enable UART Tx and Rx */ #ifndef USE_UART4_TX @@ -477,7 +477,7 @@ void uart5_isr(void) { usart_isr(&uart5); } #endif /* USE_UART5 */ -#if defined USE_UART6 && defined STM32F4 +#if USE_UART6 && defined STM32F4 /* by default enable UART Tx and Rx */ #ifndef USE_UART6_TX diff --git a/sw/airborne/firmwares/beth/uart_hw.h b/sw/airborne/firmwares/beth/uart_hw.h index e44b5334b28..ba4eaf89637 100644 --- a/sw/airborne/firmwares/beth/uart_hw.h +++ b/sw/airborne/firmwares/beth/uart_hw.h @@ -39,7 +39,7 @@ #define UART3_irq_handler usart3_irq_handler #define UART5_irq_handler usart5_irq_handler -#if defined USE_UART0 || OVERRIDE_UART0_IRQ_HANDLER +#if USE_UART0 || OVERRIDE_UART0_IRQ_HANDLER extern void uart0_handler(void); #endif @@ -64,7 +64,7 @@ extern uint8_t uart0_tx_buffer[UART0_TX_BUFFER_SIZE]; #endif /* USE_UART0 */ -#if defined USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER +#if USE_UART1 || OVERRIDE_UART1_IRQ_HANDLER extern void uart1_handler(void); #endif diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c index 9e0df30b4dc..7e98fc471f8 100644 --- a/sw/airborne/mcu.c +++ b/sw/airborne/mcu.c @@ -38,7 +38,7 @@ #include "subsystems/radio_control.h" #endif #endif -#if defined USE_UART0 || defined USE_UART1 || defined USE_UART2 || defined USE_UART3 || defined USE_UART4 || defined USE_UART5 || defined USE_UART6 +#if USE_UART0 || USE_UART1 || USE_UART2 || USE_UART3 || USE_UART4 || USE_UART5 || USE_UART6 #include "mcu_periph/uart.h" #endif #if defined USE_I2C0 || defined USE_I2C1 || defined USE_I2C2