X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=3b3edd5c980fd0b387c8890bae638d0b50fca732;hb=528790e0e4433fa1e1394cdfa23eb33dfd934185;hp=a11e0fb6e09f32e46e45ab60f1abf233bbf4e943;hpb=a20f20b1fe5e88070863392955bda50e23c758e3;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index a11e0fb6..3b3edd5c 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,27 @@
 
 /*#*
  *#* $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.
+ *#*
+ *#* Revision 1.16  2004/10/19 11:48:05  bernie
+ *#* Reformat.
+ *#*
+ *#* Revision 1.15  2004/10/19 08:11:53  bernie
+ *#* SERRF_TX, SERRF_RX: New macros; Enhance documentation.
+ *#*
  *#* Revision 1.14  2004/10/03 18:43:18  bernie
  *#* Fix a nasty bug caused by confusion between old-style and new-style configuration macros.
  *#*
@@ -58,18 +79,11 @@
 #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
- *
- * Some of these flags map directly to the flags
- * in AVR UART Status Register(USR).
- * \todo  flags of DSP56k aren't mapped to these flags. Luckily
- *        these flags doesn't collide with the DSP56k ones,
- *        which are from 0x0100 to 0x8000
- */
+/*! \name Serial Error/status flags. */
 /*\{*/
 #if CPU_AVR
 	typedef uint8_t serstatus_t;
@@ -79,10 +93,14 @@
 	#define SERRF_RXTIMEOUT      BV(5)  /*!< Receive timeout */
 	#define SERRF_TXTIMEOUT      BV(6)  /*!< Transmit timeout */
 
-	/* Hardware errors */
+	/*
+	 * Hardware errors.
+	 * 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 */
 	#define SERRF_PARITYERROR    BV(7)  /*!< Parity error */
+	#define SERRF_NOISEERROR     0      /*!< Unsupported */
 #elif CPU_DSP56K
 	typedef uint16_t serstatus_t;
 
@@ -91,17 +109,47 @@
 	#define SERRF_RXTIMEOUT      BV(1)  /*!< Receive timeout */
 	#define SERRF_TXTIMEOUT      BV(2)  /*!< Transmit timeout */
 
-	/* Hardware errors */
+	/*
+	 * Hardware errors.
+	 * These flags map directly to the SCI Control Register.
+	 */
 	#define SERRF_PARITYERROR    BV(8)  /*!< Parity error */
 	#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
 /*\}*/
 
-/*! \name Parity settings for ser_setparity() */
+/*! \name Masks to group TX/RX errors. */
+/*\{*/
+#define SERRF_RX \
+	( SERRF_RXFIFOOVERRUN \
+	| SERRF_RXTIMEOUT \
+	| SERRF_RXSROVERRUN \
+	| SERRF_PARITYERROR \
+	| SERRF_FRAMEERROR \
+	| SERRF_NOISEERROR)
+#define SERRF_TX  (SERRF_TXTIMEOUT)
+/*\}*/
+
+
+/*!
+ * \name Parity settings for ser_setparity().
+ *
+ * \note Values are AVR-specific for performance reasons.
+ *       Other processors should either decode them or
+ *       redefine these macros.
+ */
 /*\{*/
 #define SER_PARITY_NONE  0
 #define SER_PARITY_EVEN  2
@@ -123,8 +171,15 @@ enum
 	SER_UART0,
 	SER_SPI,
 #elif CPU_DSP56K
+	// \todo since we now support "fake" multiplexed serials, this should be moved to hw.h
 	SER_UART0,
-	SER_UART1,
+	SER_PUNTALI,
+	SER_BARCODE,
+#elif defined(_EMUL)
+	SER_UART0,
+	#if CONFIG_EMUL_UART1
+		SER_UART1,
+	#endif
 #else
 	#error unknown architecture
 #endif
@@ -160,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. */
@@ -190,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);