X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=modules%2Fcomm%2Fuart%2Fuart_defs.h;h=9a7e437b9eec6daf55558e42b02eeb620f9ecb16;hp=e8d617119490e1dc4e98ce4b7b2b774fd521c24f;hb=3b7b449237422537c8cdf124b0f4dde827787e14;hpb=92b0749bee9fba8b5105590bf2c2f15786c55cee

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