X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=c06493dbb5e94ad3e20c4f315c8aa538f6693cf6;hb=02fde028c0bf13359b5b1fd993cb99a920ff5786;hp=64a84b0fb5db18e9579ac4f04e10aa1935247757;hpb=ef27d1caf51bb56021a4df286d84b454b6d0e601;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index 64a84b0f..c06493db 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief High level serial I/O API
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.25  2006/02/17 22:28:00  bernie
+ *#* Rename ser_emul.c to ser_posix.c.
+ *#*
+ *#* Revision 1.24  2006/02/17 22:23:06  bernie
+ *#* Update POSIX serial emulator.
+ *#*
+ *#* Revision 1.23  2005/11/27 23:33:40  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
+ *#* Revision 1.22  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.21  2005/04/11 19:10:27  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.20  2005/01/22 04:20:01  bernie
+ *#* Reformat.
+ *#*
  *#* Revision 1.19  2005/01/11 18:08:16  aleph
  *#* Add missing include
  *#*
@@ -73,9 +91,10 @@
 #define DRV_SER_H
 
 #include <mware/fifobuf.h>
-#include <compiler.h>
-#include <config.h>
-#include <macros.h> /* BV() */
+#include <cfg/compiler.h>
+#include <cfg/macros.h> /* BV() */
+#include <cfg/os.h>
+#include <appconfig.h>
 
 /*! \name Serial Error/status flags. */
 /*\{*/
@@ -89,7 +108,7 @@
 
 	/*
 	 * Hardware errors.
-         * These flags map directly to the AVR UART Status Register (USR).
+	 * These flags map directly to the AVR UART Status Register (USR).
 	 */
 	#define SERRF_RXSROVERRUN    BV(3)  /*!< Rx shift register overrun */
 	#define SERRF_FRAMEERROR     BV(4)  /*!< Stop bit missing */
@@ -111,7 +130,7 @@
 	#define SERRF_FRAMEERROR     BV(9)  /*!< Stop bit missing */
 	#define SERRF_NOISEERROR     BV(10) /*!< Noise error */
 	#define SERRF_RXSROVERRUN    BV(11) /*!< Rx shift register overrun */
-#elif defined(_EMUL)
+#elif OS_HOSTED
 	typedef uint16_t serstatus_t;
 
 	/* Software errors */
@@ -119,21 +138,28 @@
 	#define SERRF_RXTIMEOUT      BV(1)  /*!< Receive timeout */
 	#define SERRF_TXTIMEOUT      BV(2)  /*!< Transmit timeout */
 
+	/* Hardware errors */
+	#define SERRF_RXSROVERRUN    0      /*!< Unsupported in emulated serial port. */
+	#define SERRF_FRAMEERROR     0      /*!< Unsupported in emulated serial port. */
+	#define SERRF_PARITYERROR    0      /*!< Unsupported in emulated serial port. */
+	#define SERRF_NOISEERROR     0      /*!< Unsupported in emulated serial port. */
+
 #else
 	#error unknown architecture
 #endif
 /*\}*/
 
-/*! \name Masks to group TX/RX errors. */
-/*\{*/
-#define SERRF_RX  (SERRF_RXFIFOOVERRUN \
+/** Mask to group all RX errors. */
+#define SERRF_RX \
+	( SERRF_RXFIFOOVERRUN \
 	| SERRF_RXTIMEOUT \
 	| SERRF_RXSROVERRUN \
 	| SERRF_PARITYERROR \
 	| SERRF_FRAMEERROR \
 	| SERRF_NOISEERROR)
+
+/** Mask to group all TX errors. */
 #define SERRF_TX  (SERRF_TXTIMEOUT)
-/*\}*/
 
 
 /*!
@@ -168,11 +194,9 @@ enum
 	SER_UART0,
 	SER_PUNTALI,
 	SER_BARCODE,
-#elif defined(_EMUL)
+#elif OS_HOSTED
 	SER_UART0,
-	#if CONFIG_EMUL_UART1
-		SER_UART1,
-	#endif
+	SER_UART1,
 #else
 	#error unknown architecture
 #endif