X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=f18a7006769f164dff0db3c8a06a9e1fb4af01a1;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=03c6db8102b00efd79a9575bdbd511dc72c2c034;hpb=cd8628e611877d99fc33609a2a3d4401b69222a4;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c old mode 100755 new mode 100644 index 03c6db81..f18a7006 --- a/drv/ser.c +++ b/drv/ser.c @@ -1,7 +1,7 @@ -/*! +/** * \file * @@ -28,6 +28,36 @@ /*#* *#* $Log$ + *#* Revision 1.38 2007/06/21 17:07:21 batt + *#* Remove CONFIG_WATCHDOG stuff: watchdog macros expand to nothing when wdt is active. + *#* + *#* Revision 1.37 2007/06/07 14:35:12 batt + *#* Merge from project_ks. + *#* + *#* Revision 1.36 2007/01/29 11:30:29 batt + *#* Reimplement ser_clearstatus as a macro. + *#* + *#* Revision 1.35 2007/01/27 20:47:12 batt + *#* Add clear status. + *#* + *#* Revision 1.34 2006/11/20 15:07:40 batt + *#* Revert unneeded locked functions. + *#* + *#* Revision 1.33 2006/11/17 18:15:55 batt + *#* Avoid race conditions. + *#* + *#* Revision 1.32 2006/11/17 17:03:58 batt + *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions. + *#* + *#* Revision 1.31 2006/07/21 10:58:00 batt + *#* Use timer_clock() instead of obsolete timer_ticks(). + *#* + *#* Revision 1.30 2006/07/19 12:56:26 bernie + *#* Convert to new Doxygen style. + *#* + *#* 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. *#* @@ -112,10 +142,12 @@ *#*/ #include "ser.h" + +#include "wdt.h" + #include "ser_p.h" #include #include -//#include #include /* @@ -150,15 +182,15 @@ /* Serial configuration parameters */ -#define SER_CTSDELAY 70 /*!< CTS line retry interval (ms) */ -#define SER_TXPOLLDELAY 2 /*!< Transmit buffer full retry interval (ms) */ -#define SER_RXPOLLDELAY 2 /*!< Receive buffer empty retry interval (ms) */ +#define SER_CTSDELAY 70 /**< CTS line retry interval (ms) */ +#define SER_TXPOLLDELAY 2 /**< Transmit buffer full retry interval (ms) */ +#define SER_RXPOLLDELAY 2 /**< Receive buffer empty retry interval (ms) */ struct Serial ser_handles[SER_CNT]; -/*! +/** * Inserisce il carattere c nel buffer di trasmissione. * Questa funzione mette il processo chiamante in attesa * quando il buffer e' pieno. @@ -172,20 +204,21 @@ int ser_putchar(int c, struct Serial *port) if (fifo_isfull_locked(&port->txfifo)) { #if CONFIG_SER_TXTIMEOUT != -1 - mtime_t start_time = timer_ticks(); + ticks_t start_time = timer_clock(); #endif /* Attende finche' il buffer e' pieno... */ do { + wdt_reset(); #if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif #if CONFIG_SER_TXTIMEOUT != -1 - if (timer_ticks() - start_time >= port->txtimeout) + if (timer_clock() - start_time >= port->txtimeout) { - port->status |= SERRF_TXTIMEOUT; + ATOMIC(port->status |= SERRF_TXTIMEOUT); return EOF; } #endif /* CONFIG_SER_TXTIMEOUT */ @@ -203,7 +236,7 @@ int ser_putchar(int c, struct Serial *port) } -/*! +/** * Preleva un carattere dal buffer di ricezione. * Questa funzione mette il processo chiamante in attesa * quando il buffer e' vuoto. L'attesa ha un timeout @@ -217,37 +250,38 @@ int ser_getchar(struct Serial *port) if (fifo_isempty_locked(&port->rxfifo)) { #if CONFIG_SER_RXTIMEOUT != -1 - mtime_t start_time = timer_ticks(); + ticks_t start_time = timer_clock(); #endif /* Wait while buffer is empty */ do { + wdt_reset(); #if CONFIG_KERNEL && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ proc_switch(); #endif #if CONFIG_SER_RXTIMEOUT != -1 - if (timer_ticks() - start_time >= port->rxtimeout) + if (timer_clock() - start_time >= port->rxtimeout) { - port->status |= SERRF_RXTIMEOUT; + ATOMIC(port->status |= SERRF_RXTIMEOUT); return EOF; } #endif /* CONFIG_SER_RXTIMEOUT */ } - while (fifo_isempty_locked(&port->rxfifo) && (port->status & SERRF_RX) == 0); + while (fifo_isempty_locked(&port->rxfifo) && (ser_getstatus(port) & SERRF_RX) == 0); } /* * Get a byte from the FIFO (avoiding sign-extension), * re-enable RTS, then return result. */ - if (port->status & SERRF_RX) + if (ser_getstatus(port) & SERRF_RX) return EOF; return (int)(unsigned char)fifo_pop_locked(&port->rxfifo); } -/*! +/** * Preleva un carattere dal buffer di ricezione. * Se il buffer e' vuoto, ser_getchar_nowait() ritorna * immediatamente EOF. @@ -263,7 +297,7 @@ int ser_getchar_nowait(struct Serial *port) #if CONFIG_SER_GETS -/*! +/** * Read a line long at most as size and put it * in buf. * \return number of chars read or EOF in case @@ -275,7 +309,7 @@ int ser_gets(struct Serial *port, char *buf, int size) } -/*! +/** * Read a line long at most as size and put it * in buf, with optional echo. * @@ -313,7 +347,7 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo) #endif /* !CONFIG_SER_GETS */ -/*! +/** * Read at most \a size bytes from \a port and put them in \a buf * * \return number of bytes actually read, or EOF in @@ -336,7 +370,7 @@ int ser_read(struct Serial *port, void *buf, size_t size) } -/*! +/** * Write a string to serial. * \return 0 if OK, EOF in case of error. */ @@ -351,7 +385,7 @@ int ser_print(struct Serial *port, const char *s) } -/*! +/** * \brief Write a buffer to serial. * * \return 0 if OK, EOF in case of error. @@ -372,7 +406,7 @@ int ser_write(struct Serial *port, const void *_buf, size_t len) #if CONFIG_PRINTF -/*! +/** * Formatted write */ int ser_printf(struct Serial *port, const char *format, ...) @@ -392,13 +426,13 @@ int ser_printf(struct Serial *port, const char *format, ...) #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1 void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout) { - port->rxtimeout = rxtimeout; - port->txtimeout = txtimeout; + port->rxtimeout = ms_to_ticks(rxtimeout); + port->txtimeout = ms_to_ticks(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 @@ -408,9 +442,9 @@ void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout) */ void ser_resync(struct Serial *port, mtime_t delay) { - mtime_t old_rxtimeout = port->rxtimeout; + mtime_t old_rxtimeout = ticks_to_ms(port->rxtimeout); - ser_settimeouts(port, delay, port->txtimeout); + ser_settimeouts(port, delay, ticks_to_ms(port->txtimeout)); do { ser_setstatus(port, 0); @@ -420,7 +454,7 @@ void ser_resync(struct Serial *port, mtime_t delay) /* Restore port to an usable status */ ser_setstatus(port, 0); - ser_settimeouts(port, old_rxtimeout, port->txtimeout); + ser_settimeouts(port, old_rxtimeout, ticks_to_ms(port->txtimeout)); } #endif /* CONFIG_SER_RXTIMEOUT */ @@ -437,7 +471,7 @@ void ser_setparity(struct Serial *port, int parity) } -/*! +/** * Flush both the RX and TX buffers. */ void ser_purge(struct Serial *port) @@ -447,7 +481,7 @@ void ser_purge(struct Serial *port) } -/*! +/** * Wait until all pending output is completely * transmitted to the other end. * @@ -458,7 +492,7 @@ void ser_purge(struct Serial *port) void ser_drain(struct Serial *ser) { /* - * Wait until the FIFO is empty, and then until the byte currently in + * Wait until the FIFO becomes empty, and then until the byte currently in * the hardware register gets shifted out. */ while (!fifo_isempty(&ser->txfifo) @@ -468,12 +502,15 @@ void ser_drain(struct Serial *ser) /* Give up timeslice to other processes. */ proc_switch(); #endif + wdt_reset(); } } -/*! - * Initialize serial +/** + * Initialize a serial port. + * + * \param unit Serial unit to open. Possible values are architecture dependant. */ struct Serial *ser_open(unsigned int unit) { @@ -512,7 +549,7 @@ struct Serial *ser_open(unsigned int unit) } -/*! +/** * Clean up serial port, disabling the associated hardware. */ void ser_close(struct Serial *port)