ser_read(): Make buffer argument void * for consistency with ANSI C and ser_write()

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index ca2b35925975e1093c2d47917152b71745ef44bc..ed04848f1c60b22a69edefaac024bbe69f2a5905 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,15 @@
 
 /*
  * $Log$
+ * 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().
  *
@@ -241,7 +250,7 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo)
  * \return number of bytes 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;
        int c;
@@ -319,6 +328,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 +371,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);
+       fifo_flush_locked(&port->rxfifo);
+       fifo_flush_locked(&port->txfifo);
 }
 
+
 /*!
  * Wait until all pending output is completely
  * transmitted to the other end.
@@ -351,7 +388,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. */