DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index a65d078a64bcd0c5d2b8d8a93fd76764827181ef..4da6c5bc7da2139237a0480d60e60cd767028ddb 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.22  2004/12/08 08:56:14  bernie
+ *#* Rename time_t to mtime_t.
+ *#*
+ *#* 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).
  *#*
@@ -84,15 +93,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>
 
-#ifdef CONFIG_KERNEL
+/*
+ * 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
+
+#if CONFIG_KERNEL
        #include <kern/proc.h>
 #endif
+
 #if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1
        #include <drv/timer.h>
 #endif
@@ -121,13 +154,13 @@ int ser_putchar(int c, struct Serial *port)
        if (fifo_isfull_locked(&port->txfifo))
        {
 #if CONFIG_SER_TXTIMEOUT != -1
-               time_t start_time = timer_ticks();
+               mtime_t start_time = timer_ticks();
 #endif
 
                /* 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
@@ -163,17 +196,15 @@ 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
-               time_t start_time = timer_ticks();
+               mtime_t start_time = timer_ticks();
 #endif
                /* 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
@@ -215,7 +246,7 @@ int ser_getchar_nowait(struct Serial *port)
 
 #if CONFIG_SER_GETS
 /*!
- * Read a line long at most as size and puts it
+ * Read a line long at most as size and put it
  * in buf.
  * \return number of chars read or EOF in case
  *         of error.
@@ -341,7 +372,7 @@ int ser_printf(struct Serial *port, const char *format, ...)
 
 
 #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
-void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout)
+void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout)
 {
        port->rxtimeout = rxtimeout;
        port->txtimeout = txtimeout;
@@ -357,9 +388,9 @@ void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout)
  *
  * \note Serial errors are reset before and after executing the purge.
  */
-void ser_resync(struct Serial *port, time_t delay)
+void ser_resync(struct Serial *port, mtime_t delay)
 {
-       time_t old_rxtimeout = port->rxtimeout;
+       mtime_t old_rxtimeout = port->rxtimeout;
 
        ser_settimeouts(port, delay, port->txtimeout);
        do
@@ -410,10 +441,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
        }
 }
 
@@ -451,6 +482,9 @@ struct Serial *ser_open(unsigned int unit)
        ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE);
 #endif
 
+       /* Clear error flags */
+       ser_setstatus(port, 0);
+
        return port;
 }