X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=a315562ab01a02fe30c600dd0fedbcf5f6ca3828;hb=6ca5e6259460b1541d1b6e6d3f1ac9734901f573;hp=fd640b0044390d46b034779b143448dad239a931;hpb=888d1c49ed7cea0f272f520a74be35a32032bd6e;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index fd640b00..a315562a 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.26  2006/05/18 00:39:13  bernie
+ *#* Add struct Serial friendly typedef.
+ *#*
+ *#* 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.
  *#*
@@ -87,6 +96,7 @@
 #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. */
@@ -123,7 +133,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 */
@@ -131,13 +141,18 @@
 	#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. */
-/*\{*/
+/** Mask to group all RX errors. */
 #define SERRF_RX \
 	( SERRF_RXFIFOOVERRUN \
 	| SERRF_RXTIMEOUT \
@@ -145,8 +160,9 @@
 	| SERRF_PARITYERROR \
 	| SERRF_FRAMEERROR \
 	| SERRF_NOISEERROR)
+
+/** Mask to group all TX errors. */
 #define SERRF_TX  (SERRF_TXTIMEOUT)
-/*\}*/
 
 
 /*!
@@ -181,11 +197,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
@@ -200,7 +214,7 @@ struct SerialHardware;
 extern const char * const serial_errors[8];
 
 /*! Serial handle structure */
-struct Serial
+typedef struct Serial
 {
 	/*! Physical port number */
 	unsigned int unit;
@@ -232,7 +246,7 @@ struct Serial
 
 	/*! Low-level interface to hardware. */
 	struct SerialHardware* hw;
-};
+} Serial;
 
 
 /* Function prototypes */