Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
old mode 100755 (executable)
new mode 100644 (file)
index 00988fe..f18a700
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -1,7 +1,7 @@
 /**
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
  * This file is part of DevLib - See README.devlib for information.
  * -->
@@ -28,6 +28,30 @@
 
 /*#*
  *#* $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().
+ *#*
  *#* Revision 1.30  2006/07/19 12:56:26  bernie
  *#* Convert to new Doxygen style.
  *#*
@@ -118,10 +142,12 @@
  *#*/
 
 #include "ser.h"
+
+#include "wdt.h"
+
 #include "ser_p.h"
 #include <mware/formatwr.h>
 #include <cfg/debug.h>
-//#include <hw.h>
 #include <appconfig.h>
 
 /*
@@ -178,20 +204,21 @@ int ser_putchar(int c, struct Serial *port)
        if (fifo_isfull_locked(&port->txfifo))
        {
 #if CONFIG_SER_TXTIMEOUT != -1
-               mtime_t start_time = timer_ticks();
+               ticks_t start_time = timer_clock();
 #endif
 
                /* Attende finche' il buffer e' pieno... */
                do
                {
+                       wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
 #endif
 #if CONFIG_SER_TXTIMEOUT != -1
-                       if (timer_ticks() - start_time >= port->txtimeout)
+                       if (timer_clock() - start_time >= port->txtimeout)
                        {
-                               port->status |= SERRF_TXTIMEOUT;
+                               ATOMIC(port->status |= SERRF_TXTIMEOUT);
                                return EOF;
                        }
 #endif /* CONFIG_SER_TXTIMEOUT */
@@ -223,31 +250,32 @@ int ser_getchar(struct Serial *port)
        if (fifo_isempty_locked(&port->rxfifo))
        {
 #if CONFIG_SER_RXTIMEOUT != -1
-               mtime_t start_time = timer_ticks();
+               ticks_t start_time = timer_clock();
 #endif
                /* Wait while buffer is empty */
                do
                {
+                       wdt_reset();
 #if CONFIG_KERNEL && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
 #endif
 #if CONFIG_SER_RXTIMEOUT != -1
-                       if (timer_ticks() - start_time >= port->rxtimeout)
+                       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);
 }
@@ -398,8 +426,8 @@ int ser_printf(struct Serial *port, const char *format, ...)
 #if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
 void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout)
 {
-       port->rxtimeout = rxtimeout;
-       port->txtimeout = txtimeout;
+       port->rxtimeout = ms_to_ticks(rxtimeout);
+       port->txtimeout = ms_to_ticks(txtimeout);
 }
 #endif /* CONFIG_SER_RXTIMEOUT || CONFIG_SER_TXTIMEOUT */
 
@@ -414,9 +442,9 @@ void ser_settimeouts(struct Serial *port, mtime_t rxtimeout, mtime_t txtimeout)
  */
 void ser_resync(struct Serial *port, mtime_t delay)
 {
-       mtime_t old_rxtimeout = port->rxtimeout;
+       mtime_t old_rxtimeout = ticks_to_ms(port->rxtimeout);
 
-       ser_settimeouts(port, delay, port->txtimeout);
+       ser_settimeouts(port, delay, ticks_to_ms(port->txtimeout));
        do
        {
                ser_setstatus(port, 0);
@@ -426,7 +454,7 @@ void ser_resync(struct Serial *port, mtime_t delay)
 
        /* Restore port to an usable status */
        ser_setstatus(port, 0);
-       ser_settimeouts(port, old_rxtimeout, port->txtimeout);
+       ser_settimeouts(port, old_rxtimeout, ticks_to_ms(port->txtimeout));
 }
 #endif /* CONFIG_SER_RXTIMEOUT */
 
@@ -464,7 +492,7 @@ void ser_purge(struct Serial *port)
 void ser_drain(struct Serial *ser)
 {
        /*
-        * Wait until the FIFO is empty, and then until the byte currently in
+        * Wait until the FIFO becomes empty, and then until the byte currently in
         * the hardware register gets shifted out.
         */
        while (!fifo_isempty(&ser->txfifo)
@@ -474,6 +502,7 @@ void ser_drain(struct Serial *ser)
                        /* Give up timeslice to other processes. */
                        proc_switch();
                #endif
+                       wdt_reset();
        }
 }