Add progmem datatypes; PSTR() definition.

[bertos.git] / drv / ser.h

diff --git a/drv/ser.h b/drv/ser.h
index ad43d47cf8238eade0a5315d259f68a69bec37f3..64a84b0fb5db18e9579ac4f04e10aa1935247757 100755 (executable)
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -66,6 +75,7 @@
 #include <mware/fifobuf.h>
 #include <compiler.h>
 #include <config.h>
+#include <macros.h> /* BV() */
 
 /*! \name Serial Error/status flags. */
 /*\{*/
@@ -101,6 +111,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
@@ -146,8 +164,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
@@ -183,10 +208,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. */
@@ -213,8 +238,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);