X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=1adda23b20404e10f4e5986690146af33df3316c;hb=27c90e14b9a2600bc38486f046187a7e690b24fb;hp=1ec4927c753cd2ca0dff8c502b7a7b0751c0188a;hpb=96f0ef786b54356c56cc3d4e4f0838df2505cfcc;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 1ec4927c..1adda23b 100755
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,12 @@
 
 /*
  * $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.
  *
@@ -96,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);
@@ -251,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;