Change doxygen \param tag to \a.

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index d73a29348e8b8093979d0d82d017179f3aac2111..f18a7006769f164dff0db3c8a06a9e1fb4af01a1 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,27 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.38  2007/06/21 17:07:21  batt
+ *#* Remove CONFIG_WATCHDOG stuff: watchdog macros expand to nothing when wdt is active.
+ *#*
+ *#* Revision 1.37  2007/06/07 14:35:12  batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.36  2007/01/29 11:30:29  batt
+ *#* Reimplement ser_clearstatus as a macro.
+ *#*
+ *#* Revision 1.35  2007/01/27 20:47:12  batt
+ *#* Add clear status.
+ *#*
+ *#* Revision 1.34  2006/11/20 15:07:40  batt
+ *#* Revert unneeded locked functions.
+ *#*
+ *#* Revision 1.33  2006/11/17 18:15:55  batt
+ *#* Avoid race conditions.
+ *#*
+ *#* Revision 1.32  2006/11/17 17:03:58  batt
+ *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions.
+ *#*
  *#* Revision 1.31  2006/07/21 10:58:00  batt
  *#* Use timer_clock() instead of obsolete timer_ticks().
  *#*
@@ -121,6 +142,9 @@
  *#*/
 
 #include "ser.h"
+
+#include "wdt.h"
+
 #include "ser_p.h"
 #include <mware/formatwr.h>
 #include <cfg/debug.h>
@@ -186,6 +210,7 @@ int ser_putchar(int c, struct Serial *port)
                /* Attende finche' il buffer e' pieno... */
                do
                {
+                       wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
@@ -193,7 +218,7 @@ int ser_putchar(int c, struct Serial *port)
 #if CONFIG_SER_TXTIMEOUT != -1
                        if (timer_clock() - start_time >= port->txtimeout)
                        {
-                               port->status |= SERRF_TXTIMEOUT;
+                               ATOMIC(port->status |= SERRF_TXTIMEOUT);
                                return EOF;
                        }
 #endif /* CONFIG_SER_TXTIMEOUT */
@@ -230,6 +255,7 @@ int ser_getchar(struct Serial *port)
                /* Wait while buffer is empty */
                do
                {
+                       wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
@@ -237,19 +263,19 @@ int ser_getchar(struct Serial *port)
 #if CONFIG_SER_RXTIMEOUT != -1
                        if (timer_clock() - start_time >= port->rxtimeout)
                        {
-                               port->status |= SERRF_RXTIMEOUT;
+                               ATOMIC(port->status |= SERRF_RXTIMEOUT);
                                return EOF;
                        }
 #endif /* CONFIG_SER_RXTIMEOUT */
                }
-               while (fifo_isempty_locked(&port->rxfifo) && (port->status & SERRF_RX) == 0);
+               while (fifo_isempty_locked(&port->rxfifo) && (ser_getstatus(port) & SERRF_RX) == 0);
        }
 
        /*
         * Get a byte from the FIFO (avoiding sign-extension),
         * re-enable RTS, then return result.
         */
-       if (port->status & SERRF_RX)
+       if (ser_getstatus(port) & SERRF_RX)
                return EOF;
        return (int)(unsigned char)fifo_pop_locked(&port->rxfifo);
 }
@@ -476,6 +502,7 @@ void ser_drain(struct Serial *ser)
                        /* Give up timeslice to other processes. */
                        proc_switch();
                #endif
+                       wdt_reset();
        }
 }