Declaration fix for build with GCC 3.4

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index 96c93df59370946432de6ae8d61c5bc26577109b..1adda23b20404e10f4e5986690146af33df3316c 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \brief Buffered serial I/O driver
@@ -28,29 +28,21 @@
 
 /*
  * $Log$
- * Revision 1.1  2004/05/23 18:10:11  bernie
- * Import drv/ modules.
- *
- * Revision 1.5  2004/05/14 12:47:26  rasky
- * Importato nuovo supporto seriale per AVR da Stefano
+ * Revision 1.6  2004/06/07 15:56:28  aleph
+ * Remove cast-as-lvalue extension abuse
  *
- * Revision 1.4  2004/04/29 16:40:23  rasky
- * Durante i busy loop della seriale, chiama la proc_switch() per cambiare processo
+ * 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.3  2004/04/21 17:38:24  rasky
- * New application
+ * Revision 1.4  2004/06/03 11:27:09  bernie
+ * Add dual-license information.
  *
- * Revision 1.16  2004/04/03 18:30:49  aleph
- * Move timeout defines in config, private define in .c
+ * 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.15  2004/03/29 17:01:02  aleph
- * Add function to set serial parity, fix it when ser_open is used
+ * Revision 1.2  2004/05/23 18:21:53  bernie
+ * Trim CVS logs and cleanup header info.
  *
- * Revision 1.14  2004/03/29 16:19:33  aleph
- * Add ser_cleanup function; Various code improvements
- *
- * Revision 1.13  2004/03/24 15:48:53  bernie
- * Remove Copyright messages from Doxygen output
  */
 
 #include <mware/formatwr.h>
@@ -110,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);
@@ -265,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;
@@ -366,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;
 }