X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=578de3e83156c88898364a308d069b2a37a8768b;hb=f78e7b82ce293dabb9695e3656c244b955fbb9d2;hp=3e0c3440d4a1c88ec39dfebd6465f252df61f7a4;hpb=9f411c91637c328ec9475ce6732df2e66c8b53de;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 3e0c3440..578de3e8 100755
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,15 @@
 
 /*
  * $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.
  *
@@ -239,21 +248,22 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo)
 
 
 /*!
- * 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;
@@ -335,7 +345,7 @@ void ser_resync(struct Serial *port, time_t delay)
 {
 	time_t old_rxtimeout = port->rxtimeout;
 
-	ser_settimeouts(delay, ser->txtimeout);
+	ser_settimeouts(port, delay, port->txtimeout);
 	do
 	{
 		ser_setstatus(port, 0);
@@ -345,7 +355,7 @@ void ser_resync(struct Serial *port, time_t delay)
 
 	/* Restore port to an usable status */
 	ser_setstatus(port, 0);
-	ser_settimeouts(old_rxtimeout, ser->txtimeout);
+	ser_settimeouts(port, old_rxtimeout, port->txtimeout);
 }
 #endif /* CONFIG_SER_RXTIMEOUT */
 
@@ -367,8 +377,8 @@ void ser_setparity(struct Serial *port, int parity)
  */
 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);
 }