Revert unneeded locked functions.

[bertos.git] / drv / ser.c

diff --git a/drv/ser.c b/drv/ser.c
index 0d5d7ec258c67a060be9b85a81e7c4fc4ec767d7..e4e4c3378eaf73d683e78323195958d9af0dbbf0 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,12 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -196,7 +202,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 */
@@ -240,19 +246,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);
 }
@@ -457,26 +463,6 @@ void ser_purge(struct Serial *port)
        fifo_flush_locked(&port->txfifo);
 }
 
-/**
- * Get status of port \c port.
- */
-serstatus_t ser_getstatus(struct Serial *port)
-{
-       serstatus_t status;
-       ATOMIC(status = port->status);
-
-       return status;
-}
-
-
-/**
- * Set new \c port status.
- */
-void ser_setstatus(struct Serial *port, serstatus_t status)
-{
-       ATOMIC(port->status = status);
-}
-
 
 /**
  * Wait until all pending output is completely