X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.c;h=8c95a9d774c85b1c107e165d7a5867be5033f8fc;hb=522981c00bd0a016c15beb1ba1f8de27428ebaf8;hp=5b9f2a362a69d365584da002d5f4b38de3f56a73;hpb=166a481f3faddfa24e3f0e9149a56d8d1e2baefd;p=bertos.git diff --git a/drv/ser.c b/drv/ser.c index 5b9f2a36..8c95a9d7 100755 --- a/drv/ser.c +++ b/drv/ser.c @@ -28,6 +28,9 @@ /*#* *#* $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. *#* @@ -136,6 +139,11 @@ *#*/ #include "ser.h" + +#if CONFIG_WATCHDOG + #include "wdt.h" +#endif + #include "ser_p.h" #include #include @@ -201,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(); @@ -245,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(); @@ -491,6 +505,9 @@ void ser_drain(struct Serial *ser) /* Give up timeslice to other processes. */ proc_switch(); #endif + #if CONFIG_WATCHDOG + wdt_reset(); + #endif } }