X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=4e1235c39ec7d48d01e53951ec1f0d951b1a359d;hb=483b23272585f4bbfd4776fb3ac2151e0a37f839;hp=6d16b93c1b5dc685b4d0df0c9885e625efad42b1;hpb=7ee3b3c3da60b181d18336e892d8d0920166f5ae;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 6d16b93c..4e1235c3 100755
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * 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,21 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -90,7 +105,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 +260,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;
@@ -331,7 +350,9 @@ struct Serial *ser_open(unsigned int unit)
 #if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT)
 	ser_settimeouts(port, CONFIG_SER_RXTIMEOUT, CONFIG_SER_TXTIMEOUT);
 #endif
+#if defined(CONFIG_SER_DEFBAUDRATE)
 	ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE);
+#endif
 
 	return port;
 }
@@ -346,5 +367,5 @@ void ser_close(struct Serial *port)
 
 	port->is_open = false;
 	port->hw->table->cleanup(port->hw);
-	port->hw = NULL;	
+	port->hw = NULL;
 }