X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=03c6db8102b00efd79a9575bdbd511dc72c2c034;hb=0c154bc0927a32f77467f32aac3cc3507baa97ca;hp=a65d078a64bcd0c5d2b8d8a93fd76764827181ef;hpb=7453dd6f0dd60211a8a947017b0544dc4dd454ac;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c index a65d078a..03c6db81 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -3,7 +3,7 @@ * * * \brief Buffered serial I/O driver @@ -28,6 +28,33 @@ /*#* *#* $Log$ + *#* Revision 1.28 2006/02/17 22:23:06 bernie + *#* Update POSIX serial emulator. + *#* + *#* Revision 1.27 2005/11/27 23:33:40 bernie + *#* Use appconfig.h instead of cfg/config.h. + *#* + *#* Revision 1.26 2005/11/04 16:20:02 bernie + *#* Fix reference to README.devlib in header. + *#* + *#* Revision 1.25 2005/04/11 19:10:27 bernie + *#* Include top-level headers from cfg/ subdir. + *#* + *#* Revision 1.24 2005/01/21 20:13:15 aleph + *#* Fix drain at ser_close() + *#* + *#* Revision 1.23 2005/01/14 00:47:07 aleph + *#* ser_drain(): Wait for hw transmission complete. + *#* + *#* Revision 1.22 2004/12/08 08:56:14 bernie + *#* Rename time_t to mtime_t. + *#* + *#* Revision 1.21 2004/11/16 18:10:13 bernie + *#* Add sanity checks for missing configuration parameters. + *#* + *#* Revision 1.20 2004/10/19 11:48:00 bernie + *#* Remove unused variable. + *#* *#* Revision 1.19 2004/10/19 08:14:13 bernie *#* Fix a few longstanding bugs wrt status handling (made by rasky on scfirm). *#* @@ -84,15 +111,39 @@ *#* *#*/ -#include -#include #include "ser.h" #include "ser_p.h" -#include "hw.h" +#include +#include +//#include +#include -#ifdef CONFIG_KERNEL +/* + * Sanity check for config parameters required by this module. + */ +#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1) + #error CONFIG_KERNEL must be set to either 0 or 1 in config.h +#endif +#if !defined(CONFIG_SER_RXTIMEOUT) + #error CONFIG_SER_TXTIMEOUT missing in config.h +#endif +#if !defined(CONFIG_SER_RXTIMEOUT) + #error CONFIG_SER_RXTIMEOUT missing in config.h +#endif +#if !defined(CONFIG_SER_GETS) || ((CONFIG_SER_GETS != 0) && CONFIG_SER_GETS != 1) + #error CONFIG_SER_GETS must be set to either 0 or 1 in config.h +#endif +#if !defined(CONFIG_SER_DEFBAUDRATE) + #error CONFIG_SER_DEFBAUDRATE missing in config.h +#endif +#if !defined(CONFIG_PRINTF) + #error CONFIG_PRINTF missing in config.h +#endif + +#if CONFIG_KERNEL #include #endif + #if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1 #include #endif @@ -121,13 +172,13 @@ int ser_putchar(int c, struct Serial *port) if (fifo_isfull_locked(&port->txfifo)) { #if CONFIG_SER_TXTIMEOUT != -1 - time_t start_time = timer_ticks(); + mtime_t start_time = timer_ticks(); #endif /* Attende finche' il buffer e' pieno... */ do { -#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED +#if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif @@ -145,7 +196,7 @@ int ser_putchar(int c, struct Serial *port) fifo_push_locked(&port->txfifo, (unsigned char)c); /* (re)trigger tx interrupt */ - port->hw->table->enabletxirq(port->hw); + port->hw->table->txStart(port->hw); /* Avoid returning signed extended char */ return (int)((unsigned char)c); @@ -163,17 +214,15 @@ int ser_putchar(int c, struct Serial *port) */ int ser_getchar(struct Serial *port) { - int result; - if (fifo_isempty_locked(&port->rxfifo)) { #if CONFIG_SER_RXTIMEOUT != -1 - time_t start_time = timer_ticks(); + mtime_t start_time = timer_ticks(); #endif /* Wait while buffer is empty */ do { -#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED +#if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif @@ -215,7 +264,7 @@ int ser_getchar_nowait(struct Serial *port) #if CONFIG_SER_GETS /*! - * Read a line long at most as size and puts it + * Read a line long at most as size and put it * in buf. * \return number of chars read or EOF in case * of error. @@ -341,7 +390,7 @@ int ser_printf(struct Serial *port, const char *format, ...) #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1 -void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout) +void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout) { port->rxtimeout = rxtimeout; port->txtimeout = txtimeout; @@ -357,9 +406,9 @@ void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout) * * \note Serial errors are reset before and after executing the purge. */ -void ser_resync(struct Serial *port, time_t delay) +void ser_resync(struct Serial *port, mtime_t delay) { - time_t old_rxtimeout = port->rxtimeout; + mtime_t old_rxtimeout = port->rxtimeout; ser_settimeouts(port, delay, port->txtimeout); do @@ -378,13 +427,13 @@ void ser_resync(struct Serial *port, time_t delay) void ser_setbaudrate(struct Serial *port, unsigned long rate) { - port->hw->table->setbaudrate(port->hw, rate); + port->hw->table->setBaudrate(port->hw, rate); } void ser_setparity(struct Serial *port, int parity) { - port->hw->table->setparity(port->hw, parity); + port->hw->table->setParity(port->hw, parity); } @@ -408,12 +457,17 @@ void ser_purge(struct Serial *port) */ void ser_drain(struct Serial *ser) { - while (!fifo_isempty(&ser->txfifo)) + /* + * Wait until the FIFO is empty, and then until the byte currently in + * the hardware register gets shifted out. + */ + while (!fifo_isempty(&ser->txfifo) + || ser->hw->table->txSending(ser->hw)) { -#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED + #if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); -#endif + #endif } } @@ -451,6 +505,9 @@ struct Serial *ser_open(unsigned int unit) ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE); #endif + /* Clear error flags */ + ser_setstatus(port, 0); + return port; } @@ -463,6 +520,15 @@ void ser_close(struct Serial *port) ASSERT(port->is_open); DB(port->is_open = false;) + // Wait until we finish sending everything + ser_drain(port); + port->hw->table->cleanup(port->hw); - port->hw = NULL; + DB(port->hw = NULL;) + + /* + * We purge the FIFO buffer only after the low-level cleanup, so that + * we are sure that there are no more interrupts. + */ + ser_purge(port); }