X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=4da6c5bc7da2139237a0480d60e60cd767028ddb;hb=5b25ae54d86d894e5d01adeef10938df1bb10e16;hp=9e7e96d6d9592b6268fe2760e7456ab94b95f8b5;hpb=277b540c0764dd376dcf583acdc97a2b2fd3d8e6;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c index 9e7e96d6..4da6c5bc 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -28,6 +28,27 @@ /*#* *#* $Log$ + *#* 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. + *#* *#* Revision 1.15 2004/08/25 14:12:08 rasky *#* Aggiornato il comment block dei log RCS *#* @@ -72,15 +93,39 @@ *#* *#*/ -#include -#include #include "ser.h" #include "ser_p.h" -#include "hw.h" +#include +#include +#include +#include + +/* + * 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 -#ifdef CONFIG_KERNEL +#if CONFIG_KERNEL #include #endif + #if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1 #include #endif @@ -105,16 +150,17 @@ struct Serial ser_handles[SER_CNT]; */ int ser_putchar(int c, struct Serial *port) { + //ASSERT_VALID_FIFO(&port->txfifo); 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 @@ -134,7 +180,7 @@ int ser_putchar(int c, struct Serial *port) /* (re)trigger tx interrupt */ port->hw->table->enabletxirq(port->hw); - /* Avoid returning signed estended char */ + /* Avoid returning signed extended char */ return (int)((unsigned char)c); } @@ -150,17 +196,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 @@ -172,15 +216,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(&port->rxfifo); - return port->status ? EOF : result; + if (port->status & SERRF_RX) + return EOF; + return (int)(unsigned char)fifo_pop_locked(&port->rxfifo); } @@ -195,13 +240,13 @@ int ser_getchar_nowait(struct Serial *port) return EOF; /* NOTE: the double cast prevents unwanted sign extension */ - return (int)(unsigned char)fifo_pop(&port->rxfifo); + return (int)(unsigned char)fifo_pop_locked(&port->rxfifo); } #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. @@ -297,7 +342,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--) { @@ -317,7 +362,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); @@ -328,7 +372,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; @@ -337,16 +381,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 @@ -397,10 +441,10 @@ void ser_drain(struct Serial *ser) { while (!fifo_isempty(&ser->txfifo)) { -#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED + #if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); -#endif + #endif } } @@ -420,11 +464,14 @@ struct Serial *ser_open(unsigned int unit) port->unit = unit; - /* Initialize circular buffer */ - fifo_init(&port->rxfifo, port->rxbuffer, sizeof(port->rxbuffer)); - fifo_init(&port->txfifo, port->txbuffer, sizeof(port->txbuffer)); - 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); + port->hw->table->init(port->hw, port); /* Set default values */ @@ -435,6 +482,9 @@ struct Serial *ser_open(unsigned int unit) ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE); #endif + /* Clear error flags */ + ser_setstatus(port, 0); + return port; }