uart: fix compilation on recent avr-gcc

[aversive.git] / modules / comm / uart / uart_defs.h

diff --git a/modules/comm/uart/uart_defs.h b/modules/comm/uart/uart_defs.h
index e8d6171..9a7e437 100644 (file)
--- a/modules/comm/uart/uart_defs.h
+++ b/modules/comm/uart/uart_defs.h
@@ -44,23 +44,6 @@
 #endif\r
 \r
 \r
-/* For arch with only one UART, we consider that UART0 = UART */\r
-#if !defined(SIG_UART0_DATA) && !defined(SIG_USART0_DATA)\r
-#if defined SIG_UART_DATA\r
-#define SIG_UART0_DATA SIG_UART_DATA\r
-#elif defined SIG_USART_DATA\r
-#define SIG_UART0_DATA SIG_USART_DATA\r
-#endif\r
-#endif\r
-\r
-#if !defined(SIG_UART0_RECV) && !defined(SIG_USART0_RECV)\r
-#if defined SIG_UART_RECV\r
-#define SIG_UART0_RECV  SIG_UART_RECV\r
-#elif defined SIG_USART_RECV\r
-#define SIG_UART0_RECV  SIG_USART_RECV\r
-#endif\r
-#endif\r
-\r
 #if !defined(UDR0) && defined(UDR)\r
 #define UDR0 UDR\r
 #endif\r
@@ -214,14 +197,10 @@
 \r
 \r
 /* if the signal USART is defined, the uC has a USART. */\r
-#if ( defined SIG_USART0_RECV ) || ( defined SIG_USART_RECV )\r
-#define UART_IS_USART 1\r
-#elif (defined USART_UDRE_vect) || (defined USART_TXC_vect) || (defined USART_RXC_vect)\r
-#define UART_IS_USART 1\r
-#elif (defined USART1_UDRE_vect) || (defined USART1_TXC_vect) || (defined USART1_RXC_vect)\r
-#define UART_IS_USART 1\r
-#else\r
+#if defined(UART_TX_vect)\r
 #define UART_IS_USART 0\r
+#else\r
+#define UART_IS_USART 1\r
 #endif\r
 \r
 /* if the U2X macro is defined, the uC has the U2X option. */\r