X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=3b3edd5c980fd0b387c8890bae638d0b50fca732;hb=af9c555446161016fdd76c1cdff96ce76bb6cba2;hp=167bb959073c7a0a89d87fec58e782d4c47539dc;hpb=4e792da43f76c20964c18eec2a5a05f96e12b5d9;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index 167bb959..3b3edd5c 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* 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
+ *#*
+ *#* Revision 1.18  2004/12/08 08:57:17  bernie
+ *#* Rename time_t to mtime_t.
+ *#*
  *#* Revision 1.17  2004/11/16 21:54:56  bernie
  *#* Changes for SC Monoboard support.
  *#*
@@ -67,8 +79,9 @@
 #define DRV_SER_H
 
 #include <mware/fifobuf.h>
-#include <compiler.h>
-#include <config.h>
+#include <cfg/compiler.h>
+#include <cfg/config.h>
+#include <cfg/macros.h> /* BV() */
 
 /*! \name Serial Error/status flags. */
 /*\{*/
@@ -82,7 +95,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 */
@@ -104,6 +117,14 @@
 	#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)
+	typedef uint16_t serstatus_t;
+
+	/* Software errors */
+	#define SERRF_RXFIFOOVERRUN  BV(0)  /*!< Rx FIFO buffer overrun */
+	#define SERRF_RXTIMEOUT      BV(1)  /*!< Receive timeout */
+	#define SERRF_TXTIMEOUT      BV(2)  /*!< Transmit timeout */
+
 #else
 	#error unknown architecture
 #endif
@@ -111,7 +132,8 @@
 
 /*! \name Masks to group TX/RX errors. */
 /*\{*/
-#define SERRF_RX  (SERRF_RXFIFOOVERRUN \
+#define SERRF_RX \
+	( SERRF_RXFIFOOVERRUN \
 	| SERRF_RXTIMEOUT \
 	| SERRF_RXSROVERRUN \
 	| SERRF_PARITYERROR \
@@ -153,6 +175,11 @@ enum
 	SER_UART0,
 	SER_PUNTALI,
 	SER_BARCODE,
+#elif defined(_EMUL)
+	SER_UART0,
+	#if CONFIG_EMUL_UART1
+		SER_UART1,
+	#endif
 #else
 	#error unknown architecture
 #endif
@@ -188,10 +215,10 @@ struct Serial
 	/* \} */
 
 #if CONFIG_SER_RXTIMEOUT != -1
-	time_t rxtimeout;
+	mtime_t rxtimeout;
 #endif
 #if CONFIG_SER_TXTIMEOUT != -1
-	time_t txtimeout;
+	mtime_t txtimeout;
 #endif
 
 	/*! Holds the flags defined above.  Will be 0 when no errors have occurred. */
@@ -218,8 +245,8 @@ extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo);
 
 extern void ser_setbaudrate(struct Serial *port, unsigned long rate);
 extern void ser_setparity(struct Serial *port, int parity);
-extern void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout);
-extern void ser_resync(struct Serial *port, time_t delay);
+extern void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout);
+extern void ser_resync(struct Serial *port, mtime_t delay);
 extern void ser_purge(struct Serial *port);
 extern void ser_drain(struct Serial *port);