projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PROGMEM: Define to nothing for non-Harvard processors.
[bertos.git]
/
drv
/
ser.h
diff --git
a/drv/ser.h
b/drv/ser.h
index 738c572b92cdc35fe77d10d7a4593cfe4c8d6b83..1f611646bfbc3b581f268afc7309bdf9b2d7991f 100755
(executable)
--- a/
drv/ser.h
+++ b/
drv/ser.h
@@
-14,6
+14,15
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.15 2004/10/19 08:11:53 bernie
*#* SERRF_TX, SERRF_RX: New macros; Enhance documentation.
*#*
@@
-92,12
+101,20
@@
/*
* Hardware errors.
/*
* Hardware errors.
-
* These flags map directly to the SCI Control Register.
+ * 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 */
*/
#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
#else
#error unknown architecture
#endif
@@
-143,8
+160,15
@@
enum
SER_UART0,
SER_SPI,
#elif CPU_DSP56K
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_UART0,
- SER_UART1,
+ SER_PUNTALI,
+ SER_BARCODE,
+#elif defined(_EMUL)
+ SER_UART0,
+ #if CONFIG_EMUL_UART1
+ SER_UART1,
+ #endif
#else
#error unknown architecture
#endif
#else
#error unknown architecture
#endif
@@
-180,10
+204,10
@@
struct Serial
/* \} */
#if CONFIG_SER_RXTIMEOUT != -1
/* \} */
#if CONFIG_SER_RXTIMEOUT != -1
- time_t rxtimeout;
+
m
time_t rxtimeout;
#endif
#if CONFIG_SER_TXTIMEOUT != -1
#endif
#if CONFIG_SER_TXTIMEOUT != -1
- time_t txtimeout;
+
m
time_t txtimeout;
#endif
/*! Holds the flags defined above. Will be 0 when no errors have occurred. */
#endif
/*! Holds the flags defined above. Will be 0 when no errors have occurred. */
@@
-210,8
+234,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_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, m
time_t txtimeout);
+extern void ser_resync(struct Serial *port,
m
time_t delay);
extern void ser_purge(struct Serial *port);
extern void ser_drain(struct Serial *port);
extern void ser_purge(struct Serial *port);
extern void ser_drain(struct Serial *port);