X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=9b42a70dbfaf1a936684bbb26e4f736e033b0458;hb=06f0503a2066ab4fd13529b8ed8906e52b1d672b;hp=35a4d192fb9c346dcafcbc874b321fc94c062d0d;hpb=c84b62c0fb270a9d5e111de579a69546f47fce20;p=bertos.git

diff --git a/drv/ser.c b/drv/ser.c
index 35a4d192..9b42a70d 100755
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.21  2004/11/16 18:10:13  bernie
+ *#* Add sanity checks for missing configuration parameters.
+ *#*
+ *#* Revision 1.20  2004/10/19 11:48:00  bernie
+ *#* Remove unused variable.
+ *#*
+ *#* Revision 1.19  2004/10/19 08:14:13  bernie
+ *#* Fix a few longstanding bugs wrt status handling (made by rasky on scfirm).
+ *#*
+ *#* Revision 1.18  2004/09/20 03:31:15  bernie
+ *#* Sanitize for C++.
+ *#*
  *#* Revision 1.17  2004/09/14 21:06:07  bernie
  *#* Use debug.h instead of kdebug.h; Spelling fixes.
  *#*
@@ -78,15 +90,39 @@
  *#*
  *#*/
 
-#include <mware/formatwr.h>
-#include <debug.h>
 #include "ser.h"
 #include "ser_p.h"
-#include "hw.h"
+#include <mware/formatwr.h>
+#include <debug.h>
+#include <hw.h>
+#include <config.h>
+
+/*
+ * Sanity check for config parameters required by this module.
+ */
+#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1)
+	#error CONFIG_KERNEL must be set to either 0 or 1 in config.h
+#endif
+#if !defined(CONFIG_SER_RXTIMEOUT)
+	#error CONFIG_SER_TXTIMEOUT missing in config.h
+#endif
+#if !defined(CONFIG_SER_RXTIMEOUT)
+	#error CONFIG_SER_RXTIMEOUT missing in config.h
+#endif
+#if !defined(CONFIG_SER_GETS) || ((CONFIG_SER_GETS != 0) && CONFIG_SER_GETS != 1)
+	#error CONFIG_SER_GETS must be set to either 0 or 1 in config.h
+#endif
+#if !defined(CONFIG_SER_DEFBAUDRATE)
+	#error CONFIG_SER_DEFBAUDRATE missing in config.h
+#endif
+#if !defined(CONFIG_PRINTF)
+	#error CONFIG_PRINTF missing in config.h
+#endif
 
-#ifdef CONFIG_KERNEL
+#if CONFIG_KERNEL
 	#include <kern/proc.h>
 #endif
+
 #if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1
 	#include <drv/timer.h>
 #endif
@@ -121,7 +157,7 @@ int ser_putchar(int c, struct Serial *port)
 		/* Attende finche' il buffer e' pieno... */
 		do
 		{
-#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED
+#if CONFIG_KERNEL && CONFIG_KERN_SCHED
 			/* Give up timeslice to other processes. */
 			proc_switch();
 #endif
@@ -141,7 +177,7 @@ int ser_putchar(int c, struct Serial *port)
 	/* (re)trigger tx interrupt */
 	port->hw->table->enabletxirq(port->hw);
 
-	/* Avoid returning signed estended char */
+	/* Avoid returning signed extended char */
 	return (int)((unsigned char)c);
 }
 
@@ -157,8 +193,6 @@ int ser_putchar(int c, struct Serial *port)
  */
 int ser_getchar(struct Serial *port)
 {
-	int result;
-
 	if (fifo_isempty_locked(&port->rxfifo))
 	{
 #if CONFIG_SER_RXTIMEOUT != -1
@@ -167,7 +201,7 @@ int ser_getchar(struct Serial *port)
 		/* Wait while buffer is empty */
 		do
 		{
-#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED
+#if CONFIG_KERNEL && CONFIG_KERN_SCHED
 			/* Give up timeslice to other processes. */
 			proc_switch();
 #endif
@@ -179,15 +213,16 @@ int ser_getchar(struct Serial *port)
 			}
 #endif /* CONFIG_SER_RXTIMEOUT */
 		}
-		while (fifo_isempty_locked(&port->rxfifo));
+		while (fifo_isempty_locked(&port->rxfifo) && (port->status & SERRF_RX) == 0);
 	}
 
 	/*
 	 * Get a byte from the FIFO (avoiding sign-extension),
 	 * re-enable RTS, then return result.
 	 */
-	result = (int)(unsigned char)fifo_pop_locked(&port->rxfifo);
-	return port->status ? EOF : result;
+	if (port->status & SERRF_RX)
+		return EOF;
+	return (int)(unsigned char)fifo_pop_locked(&port->rxfifo);
 }
 
 
@@ -304,7 +339,7 @@ int ser_print(struct Serial *port, const char *s)
  */
 int ser_write(struct Serial *port, const void *_buf, size_t len)
 {
-	const char *buf = _buf;
+	const char *buf = (const char *)_buf;
 
 	while (len--)
 	{
@@ -324,7 +359,6 @@ int ser_printf(struct Serial *port, const char *format, ...)
 	va_list ap;
 	int len;
 
-	ser_setstatus(port, 0);
 	va_start(ap, format);
 	len = _formatted_write(format, (void (*)(char, void *))ser_putchar, port, ap);
 	va_end(ap);
@@ -404,10 +438,10 @@ void ser_drain(struct Serial *ser)
 {
 	while (!fifo_isempty(&ser->txfifo))
 	{
-#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED
+		#if CONFIG_KERNEL && CONFIG_KERN_SCHED
 			/* Give up timeslice to other processes. */
 			proc_switch();
-#endif
+		#endif
 	}
 }
 
@@ -430,6 +464,8 @@ struct Serial *ser_open(unsigned int unit)
 	port->hw = ser_hw_getdesc(unit);
 
 	/* Initialize circular buffers */
+	ASSERT(port->hw->txbuffer);
+	ASSERT(port->hw->rxbuffer);
 	fifo_init(&port->txfifo, port->hw->txbuffer, port->hw->txbuffer_size);
 	fifo_init(&port->rxfifo, port->hw->rxbuffer, port->hw->rxbuffer_size);
 
@@ -443,6 +479,9 @@ struct Serial *ser_open(unsigned int unit)
 	ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE);
 #endif
 
+	/* Clear error flags */
+	ser_setstatus(port, 0);
+
 	return port;
 }