Declaration fix for build with GCC 3.4

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index 6d16b93c1b5dc685b4d0df0c9885e625efad42b1..1adda23b20404e10f4e5986690146af33df3316c 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * All Rights Reserved.
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \brief Buffered serial I/O driver
@@ -28,6 +28,18 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -90,7 +102,7 @@ int ser_putchar(int c, struct Serial *port)
                while (fifo_isfull_locked(&port->txfifo));
        }
 
-       fifo_push(&port->txfifo, (unsigned char)c);
+       fifo_push_locked(&port->txfifo, (unsigned char)c);
 
        /* (re)trigger tx interrupt */
        port->hw->table->enabletxirq(port->hw);
@@ -245,12 +257,16 @@ int ser_print(struct Serial *port, const char *s)
  * \brief Write a buffer to serial.
  *
  * \return 0 if OK, EOF in case of error.
+ *
+ * \todo Optimize with fifo_pushblock()
  */
-int ser_write(struct Serial *port, const void *buf, size_t len)
+int ser_write(struct Serial *port, const void *_buf, size_t len)
 {
+       const char *buf = _buf;
+
        while (len--)
        {
-               if (ser_putchar(*((const char *)buf)++, port) == EOF)
+               if (ser_putchar(*buf++, port) == EOF)
                        return EOF;
        }
        return 0;
@@ -346,5 +362,5 @@ void ser_close(struct Serial *port)
 
        port->is_open = false;
        port->hw->table->cleanup(port->hw);
-       port->hw = NULL;        
+       port->hw = NULL;
 }