X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=02e3e2d1519006252875ed28fb9891f7a64e77a3;hb=452db7adbd8779c9ffcb9d17ca2c1a2a9c1af464;hp=663366753d72ef5ce29e772fc83e78cd29c6ff58;hpb=977bdf19f5de44f9dfef74b640d085eee00f456a;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c index 66336675..02e3e2d1 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -3,7 +3,7 @@ * * * \brief Buffered serial I/O driver @@ -28,6 +28,45 @@ /*#* *#* $Log$ + *#* Revision 1.29 2006/05/18 00:39:30 bernie + *#* ser_open(): Document a bit more. + *#* + *#* 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). + *#* + *#* Revision 1.18 2004/09/20 03:31:15 bernie + *#* Sanitize for C++. + *#* + *#* Revision 1.17 2004/09/14 21:06:07 bernie + *#* Use debug.h instead of kdebug.h; Spelling fixes. + *#* *#* Revision 1.16 2004/09/06 21:40:50 bernie *#* Move buffer handling in chip-specific driver. *#* @@ -75,15 +114,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 @@ -112,13 +175,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 @@ -136,9 +199,9 @@ 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 estended char */ + /* Avoid returning signed extended char */ return (int)((unsigned char)c); } @@ -154,17 +217,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 @@ -176,15 +237,16 @@ int ser_getchar(struct Serial *port) } #endif /* CONFIG_SER_RXTIMEOUT */ } - while (fifo_isempty_locked(&port->rxfifo)); + while (fifo_isempty_locked(&port->rxfifo) && (port->status & SERRF_RX) == 0); } /* * Get a byte from the FIFO (avoiding sign-extension), * re-enable RTS, then return result. */ - result = (int)(unsigned char)fifo_pop_locked(&port->rxfifo); - return port->status ? EOF : result; + if (port->status & SERRF_RX) + return EOF; + return (int)(unsigned char)fifo_pop_locked(&port->rxfifo); } @@ -205,7 +267,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. @@ -301,7 +363,7 @@ int ser_print(struct Serial *port, const char *s) */ int ser_write(struct Serial *port, const void *_buf, size_t len) { - const char *buf = _buf; + const char *buf = (const char *)_buf; while (len--) { @@ -321,7 +383,6 @@ int ser_printf(struct Serial *port, const char *format, ...) va_list ap; int len; - ser_setstatus(port, 0); va_start(ap, format); len = _formatted_write(format, (void (*)(char, void *))ser_putchar, port, ap); va_end(ap); @@ -332,7 +393,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; @@ -341,16 +402,16 @@ void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout) #if CONFIG_SER_RXTIMEOUT != -1 /*! - * Discard input to resynchronize with remote end + * Discard input to resynchronize with remote end. * * Discard incoming data until the port stops receiving * characters for at least \a delay milliseconds. * * \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 @@ -369,13 +430,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); } @@ -399,18 +460,25 @@ 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 } } /*! - * Initialize serial + * Initialize a serial port. + * + * \param unit Serial unit to open. Possible values are architecture dependant. */ struct Serial *ser_open(unsigned int unit) { @@ -427,6 +495,8 @@ struct Serial *ser_open(unsigned int unit) port->hw = ser_hw_getdesc(unit); /* Initialize circular buffers */ + ASSERT(port->hw->txbuffer); + ASSERT(port->hw->rxbuffer); fifo_init(&port->txfifo, port->hw->txbuffer, port->hw->txbuffer_size); fifo_init(&port->rxfifo, port->hw->rxbuffer, port->hw->rxbuffer_size); @@ -440,6 +510,9 @@ struct Serial *ser_open(unsigned int unit) ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE); #endif + /* Clear error flags */ + ser_setstatus(port, 0); + return port; } @@ -452,6 +525,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); }