X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=578de3e83156c88898364a308d069b2a37a8768b;hb=f78e7b82ce293dabb9695e3656c244b955fbb9d2;hp=6d16b93c1b5dc685b4d0df0c9885e625efad42b1;hpb=7ee3b3c3da60b181d18336e892d8d0920166f5ae;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c index 6d16b93c..578de3e8 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -1,9 +1,9 @@ /*! * \file * * * \brief Buffered serial I/O driver @@ -16,9 +16,9 @@ * 38400bps on a 16MHz 80196. * * MODULE CONFIGURATION - * \li \c CONFIG_SER_HWHANDSHAKE define this preprocessor symbol to enable - * support for RTS/CTS handshake. Support is incomplete/untested - * for 80196. + * + * \li \c CONFIG_SER_HWHANDSHAKE - set to 1 to enable RTS/CTS handshake. + * Support is incomplete/untested. * \li \c CONFIG_SER_TXTIMEOUT - Enable software serial transmission timeouts * * @@ -28,6 +28,42 @@ /* * $Log$ + * Revision 1.14 2004/08/24 16:22:57 bernie + * Thinkos; Doxygen fixes + * + * Revision 1.13 2004/08/24 16:20:48 bernie + * ser_read(): Make buffer argument void * for consistency with ANSI C and ser_write() + * + * Revision 1.12 2004/08/24 13:49:39 bernie + * Fix thinko. + * + * Revision 1.11 2004/08/15 05:32:22 bernie + * ser_resync(): New function. + * + * Revision 1.10 2004/08/10 06:29:50 bernie + * Rename timer_gettick() to timer_ticks(). + * + * Revision 1.9 2004/08/08 06:06:20 bernie + * Use new-style CONFIG_ idiom; Fix module-wide documentation. + * + * Revision 1.8 2004/07/29 22:57:09 bernie + * ser_drain(): New function; Make Serial::is_open a debug-only feature; Switch to new-style CONFIG_* macros. + * + * Revision 1.7 2004/07/18 21:49:03 bernie + * Make CONFIG_SER_DEFBAUDRATE optional. + * + * Revision 1.6 2004/06/07 15:56:28 aleph + * Remove cast-as-lvalue extension abuse + * + * Revision 1.5 2004/06/06 16:41:44 bernie + * ser_putchar(): Use fifo_push_locked() to fix potential race on 8bit processors. + * + * Revision 1.4 2004/06/03 11:27:09 bernie + * Add dual-license information. + * + * Revision 1.3 2004/06/02 21:35:24 aleph + * Serial enhancements: interruptible receive handler and 8 bit serial status for AVR; remove volatile attribute to FIFOBuffer, useless for new fifobuf routens + * * Revision 1.2 2004/05/23 18:21:53 bernie * Trim CVS logs and cleanup header info. * @@ -42,7 +78,7 @@ #ifdef CONFIG_KERNEL #include #endif -#if defined(CONFIG_SER_TXTIMEOUT) || defined(CONFIG_SER_RXTIMEOUT) +#if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1 #include #endif @@ -68,19 +104,19 @@ int ser_putchar(int c, struct Serial *port) { if (fifo_isfull_locked(&port->txfifo)) { -#ifdef CONFIG_SER_TXTIMEOUT - time_t start_time = timer_gettick(); +#if CONFIG_SER_TXTIMEOUT != -1 + time_t start_time = timer_ticks(); #endif /* Attende finche' il buffer e' pieno... */ do { -#ifdef CONFIG_KERN_SCHED +#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif -#ifdef CONFIG_SER_TXTIMEOUT - if (timer_gettick() - start_time >= port->txtimeout) +#if CONFIG_SER_TXTIMEOUT != -1 + if (timer_ticks() - start_time >= port->txtimeout) { port->status |= SERRF_TXTIMEOUT; return EOF; @@ -90,7 +126,7 @@ int ser_putchar(int c, struct Serial *port) while (fifo_isfull_locked(&port->txfifo)); } - fifo_push(&port->txfifo, (unsigned char)c); + fifo_push_locked(&port->txfifo, (unsigned char)c); /* (re)trigger tx interrupt */ port->hw->table->enabletxirq(port->hw); @@ -115,18 +151,18 @@ int ser_getchar(struct Serial *port) if (fifo_isempty_locked(&port->rxfifo)) { -#ifdef CONFIG_SER_RXTIMEOUT - time_t start_time = timer_gettick(); +#if CONFIG_SER_RXTIMEOUT != -1 + time_t start_time = timer_ticks(); #endif /* Wait while buffer is empty */ do { -#ifdef CONFIG_KERN_SCHED +#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif -#ifdef CONFIG_SER_RXTIMEOUT - if (timer_gettick() - start_time >= port->rxtimeout) +#if CONFIG_SER_RXTIMEOUT != -1 + if (timer_ticks() - start_time >= port->rxtimeout) { port->status |= SERRF_RXTIMEOUT; return EOF; @@ -160,6 +196,7 @@ int ser_getchar_nowait(struct Serial *port) } +#if CONFIG_SER_GETS /*! * Read a line long at most as size and puts it * in buf. @@ -173,9 +210,10 @@ int ser_gets(struct Serial *port, char *buf, int size) /*! - * Read a line long at most as size and puts it + * Read a line long at most as size and put it * in buf, with optional echo. - * \return number of chars read or EOF in case + * + * \return number of chars read, or EOF in case * of error. */ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo) @@ -186,7 +224,11 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo) for (;;) { if ((c = ser_getchar(port)) == EOF) + { + buf[i] = '\0'; return -1; + } + /* FIXME */ if (c == '\r' || c == '\n' || i >= size-1) { @@ -202,24 +244,26 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo) return i; } +#endif /* !CONFIG_SER_GETS */ /*! - * Read at most size bytes and puts them - * in buf. - * \return number of bytes read or EOF in case - * of error. + * Read at most \a size bytes from \a port and put them in \a buf + * + * \return number of bytes actually read, or EOF in + * case of error. */ -int ser_read(struct Serial *port, char *buf, size_t size) +int ser_read(struct Serial *port, void *buf, size_t size) { size_t i = 0; + char *_buf = (char *)buf; int c; while (i < size) { if ((c = ser_getchar(port)) == EOF) return EOF; - buf[i++] = c; + _buf[i++] = c; } return i; @@ -245,18 +289,23 @@ int ser_print(struct Serial *port, const char *s) * \brief Write a buffer to serial. * * \return 0 if OK, EOF in case of error. + * + * \todo Optimize with fifo_pushblock() */ -int ser_write(struct Serial *port, const void *buf, size_t len) +int ser_write(struct Serial *port, const void *_buf, size_t len) { + const char *buf = _buf; + while (len--) { - if (ser_putchar(*((const char *)buf)++, port) == EOF) + if (ser_putchar(*buf++, port) == EOF) return EOF; } return 0; } +#if CONFIG_PRINTF /*! * Formatted write */ @@ -272,14 +321,43 @@ int ser_printf(struct Serial *port, const char *format, ...) return len; } +#endif /* CONFIG_PRINTF */ + -#if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT) +#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1 void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout) { port->rxtimeout = rxtimeout; port->txtimeout = txtimeout; } -#endif /* defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT) */ +#endif /* CONFIG_SER_RXTIMEOUT || CONFIG_SER_TXTIMEOUT */ + +#if CONFIG_SER_RXTIMEOUT != -1 +/*! + * 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) +{ + time_t old_rxtimeout = port->rxtimeout; + + ser_settimeouts(port, delay, port->txtimeout); + do + { + ser_setstatus(port, 0); + ser_getchar(port); + } + while (!(ser_getstatus(port) & SERRF_RXTIMEOUT)); + + /* Restore port to an usable status */ + ser_setstatus(port, 0); + ser_settimeouts(port, old_rxtimeout, port->txtimeout); +} +#endif /* CONFIG_SER_RXTIMEOUT */ void ser_setbaudrate(struct Serial *port, unsigned long rate) @@ -297,10 +375,30 @@ void ser_setparity(struct Serial *port, int parity) /*! * Flush both the RX and TX buffers. */ -void ser_purge(struct Serial *ser) +void ser_purge(struct Serial *port) { - fifo_flush(&ser->rxfifo); - fifo_flush(&ser->txfifo); + fifo_flush_locked(&port->rxfifo); + fifo_flush_locked(&port->txfifo); +} + + +/*! + * Wait until all pending output is completely + * transmitted to the other end. + * + * \note The current implementation only checks the + * software transmission queue. Any hardware + * FIFOs are ignored. + */ +void ser_drain(struct Serial *ser) +{ + while (!fifo_isempty(&ser->txfifo)) + { +#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED + /* Give up timeslice to other processes. */ + proc_switch(); +#endif + } } @@ -312,13 +410,12 @@ struct Serial *ser_open(unsigned int unit) struct Serial *port; ASSERT(unit < countof(ser_handles)); - port = &ser_handles[unit]; ASSERT(!port->is_open); + DB(port->is_open = true;) port->unit = unit; - port->is_open = true; /* Initialize circular buffer */ fifo_init(&port->rxfifo, port->rxbuffer, sizeof(port->rxbuffer)); @@ -328,10 +425,12 @@ struct Serial *ser_open(unsigned int unit) port->hw->table->init(port->hw, port); /* Set default values */ -#if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT) +#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1 ser_settimeouts(port, CONFIG_SER_RXTIMEOUT, CONFIG_SER_TXTIMEOUT); #endif +#if CONFIG_SER_DEFBAUDRATE ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE); +#endif return port; } @@ -343,8 +442,8 @@ struct Serial *ser_open(unsigned int unit) void ser_close(struct Serial *port) { ASSERT(port->is_open); + DB(port->is_open = false;) - port->is_open = false; port->hw->table->cleanup(port->hw); - port->hw = NULL; + port->hw = NULL; }