X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=dfab067e14dbb08066e46689acbb0851247aeb7d;hb=786e425376d8be2cccf40a7f2a62a598ea062df3;hp=1054f4fdd3ec16abce8f59888840d0e26d2e0374;hpb=ef6745f0a1c451a11d9221fbf42481db3cfb4521;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index 1054f4fd..dfab067e 100644
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -148,15 +148,17 @@
 #ifndef DRV_SER_H
 #define DRV_SER_H
 
+#include <cpu/detect.h>
 #include <mware/fifobuf.h>
 #include <cfg/compiler.h>
 #include <cfg/macros.h> /* BV() */
 #include <cfg/os.h>
+
 #include <appconfig.h>
 
 /** \name Serial Error/status flags. */
 /*\{*/
-#if CPU_ARM
+#if CPU_ARM_AT91
 	typedef uint32_t serstatus_t;
 
 	/* Software errors */
@@ -173,7 +175,7 @@
 	#define SERRF_PARITYERROR    BV(7)  /**< Parity error */
 	#define SERRF_NOISEERROR     0      /**< Unsupported */
 
-#if CPU_AVR
+#elif CPU_AVR
 	typedef uint8_t serstatus_t;
 
 	/* Software errors */
@@ -270,7 +272,7 @@ enum
 	SER_UART0,
 	SER_UART1,
 	SER_SPI,
-#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281
+#elif CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281
 	SER_UART0,
 	SER_UART1,
 	SER_SPI,