From 9f411c91637c328ec9475ce6732df2e66c8b53de Mon Sep 17 00:00:00 2001 From: bernie Date: Sun, 15 Aug 2004 05:32:22 +0000 Subject: [PATCH] ser_resync(): New function. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@143 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/ser.c | 35 +++++++++++++++++++++++++++++++++-- drv/ser.h | 4 ++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drv/ser.c b/drv/ser.c index ca2b3592..3e0c3440 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -28,6 +28,9 @@ /* * $Log$ + * 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(). * @@ -319,6 +322,33 @@ void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t 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(delay, ser->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(old_rxtimeout, ser->txtimeout); +} +#endif /* CONFIG_SER_RXTIMEOUT */ + void ser_setbaudrate(struct Serial *port, unsigned long rate) { @@ -335,12 +365,13 @@ 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_locked(&ser->rxfifo); fifo_flush_locked(&ser->txfifo); } + /*! * Wait until all pending output is completely * transmitted to the other end. @@ -351,7 +382,7 @@ void ser_purge(struct Serial *ser) */ void ser_drain(struct Serial *ser) { - while(!fifo_isempty(&ser->txfifo)) + while (!fifo_isempty(&ser->txfifo)) { #if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED /* Give up timeslice to other processes. */ diff --git a/drv/ser.h b/drv/ser.h index dd38f3e0..3af458d4 100755 --- a/drv/ser.h +++ b/drv/ser.h @@ -14,6 +14,9 @@ /* * $Log$ + * Revision 1.9 2004/08/15 05:32:22 bernie + * ser_resync(): New function. + * * Revision 1.8 2004/08/02 20:20:29 aleph * Merge from project_ks * @@ -174,6 +177,7 @@ extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo); extern void ser_setbaudrate(struct Serial *port, unsigned long rate); extern void ser_setparity(struct Serial *port, int parity); extern void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout); +extern void ser_resync(struct Serial *port, time_t delay); extern void ser_purge(struct Serial *port); extern void ser_drain(struct Serial *port); -- 2.25.1