Merge from kseries.

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index e4e4c3378eaf73d683e78323195958d9af0dbbf0..8c95a9d774c85b1c107e165d7a5867be5033f8fc 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -130,6 +139,11 @@
  *#*/
 
 #include "ser.h"
+
+#if CONFIG_WATCHDOG
+       #include "wdt.h"
+#endif
+
 #include "ser_p.h"
 #include <mware/formatwr.h>
 #include <cfg/debug.h>
@@ -195,6 +209,9 @@ int ser_putchar(int c, struct Serial *port)
                /* Attende finche' il buffer e' pieno... */
                do
                {
+#if CONFIG_WATCHDOG
+                       wdt_reset();
+#endif
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
@@ -239,6 +256,9 @@ int ser_getchar(struct Serial *port)
                /* Wait while buffer is empty */
                do
                {
+#if CONFIG_WATCHDOG
+                       wdt_reset();
+#endif
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
@@ -485,6 +505,9 @@ void ser_drain(struct Serial *ser)
                        /* Give up timeslice to other processes. */
                        proc_switch();
                #endif
+               #if CONFIG_WATCHDOG
+                       wdt_reset();
+               #endif
        }
 }