X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=9e7e96d6d9592b6268fe2760e7456ab94b95f8b5;hb=380bc36d2969fd9d730fee770ce16d7f859ec211;hp=52e5652eb0b89074ceaa01e1b62e9db5d5c11316;hpb=1582011bad013136914824faf520b8fbac35e3c8;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 52e5652e..9e7e96d6 100755
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -26,42 +26,51 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * 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.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.15  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* 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.
+ *#*
+ *#*/
 
 #include <mware/formatwr.h>
 #include <drv/kdebug.h>
@@ -242,21 +251,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;
@@ -338,7 +348,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);
@@ -348,7 +358,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 */