ser_drain(): New function; Make Serial::is_open a debug-only feature; Switch to new...

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@84 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/ser.c b/drv/ser.c
index 4e1235c39ec7d48d01e53951ec1f0d951b1a359d..d88b0425689d69ffe3ae77aae1210c16052ba0ef 100755 (executable)
--- a/drv/ser.c
+++ b/drv/ser.c
@@ -28,6 +28,9 @@
 
 /*
  * $Log$
+ * Revision 1.8  2004/07/29 22:57:09  bernie
+ * ser_drain(): New function; Make Serial::is_open a debug-only feature; Switch to new-style CONFIG_* macros.
+ *
  * Revision 1.7  2004/07/18 21:49:03  bernie
  * Make CONFIG_SER_DEFBAUDRATE optional.
  *
@@ -57,7 +60,7 @@
 #ifdef CONFIG_KERNEL
        #include <kern/proc.h>
 #endif
-#if defined(CONFIG_SER_TXTIMEOUT) || defined(CONFIG_SER_RXTIMEOUT)
+#if CONFIG_SER_TXTIMEOUT != -1 || CONFIG_SER_RXTIMEOUT != -1
        #include <drv/timer.h>
 #endif
 
@@ -83,7 +86,7 @@ int ser_putchar(int c, struct Serial *port)
 {
        if (fifo_isfull_locked(&port->txfifo))
        {
-#ifdef CONFIG_SER_TXTIMEOUT
+#if CONFIG_SER_TXTIMEOUT != -1
                time_t start_time = timer_gettick();
 #endif
 
@@ -94,7 +97,7 @@ int ser_putchar(int c, struct Serial *port)
                        /* Give up timeslice to other processes. */
                        proc_switch();
 #endif
-#ifdef CONFIG_SER_TXTIMEOUT
+#if CONFIG_SER_TXTIMEOUT != -1
                        if (timer_gettick() - start_time >= port->txtimeout)
                        {
                                port->status |= SERRF_TXTIMEOUT;
@@ -130,17 +133,17 @@ int ser_getchar(struct Serial *port)
 
        if (fifo_isempty_locked(&port->rxfifo))
        {
-#ifdef CONFIG_SER_RXTIMEOUT
+#if CONFIG_SER_RXTIMEOUT != -1
                time_t start_time = timer_gettick();
 #endif
                /* Wait while buffer is empty */
                do
                {
-#ifdef CONFIG_KERN_SCHED
+#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED
                        /* Give up timeslice to other processes. */
                        proc_switch();
 #endif
-#ifdef CONFIG_SER_RXTIMEOUT
+#if CONFIG_SER_RXTIMEOUT != -1
                        if (timer_gettick() - start_time >= port->rxtimeout)
                        {
                                port->status |= SERRF_RXTIMEOUT;
@@ -175,6 +178,7 @@ int ser_getchar_nowait(struct Serial *port)
 }
 
 
+#if CONFIG_SER_GETS
 /*!
  * Read a line long at most as size and puts it
  * in buf.
@@ -188,9 +192,10 @@ int ser_gets(struct Serial *port, char *buf, int size)
 
 
 /*!
- * Read a line long at most as size and puts it
+ * Read a line long at most as size and put it
  * in buf, with optional echo.
- * \return number of chars read or EOF in case
+ *
+ * \return number of chars read, or EOF in case
  *         of error.
  */
 int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo)
@@ -201,7 +206,11 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo)
        for (;;)
        {
                if ((c = ser_getchar(port)) == EOF)
+               {
+                       buf[i] = '\0';
                        return -1;
+               }
+
                /* FIXME */
                if (c == '\r' || c == '\n' || i >= size-1)
                {
@@ -217,6 +226,7 @@ int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo)
 
        return i;
 }
+#endif /* !CONFIG_SER_GETS */
 
 
 /*!
@@ -276,6 +286,7 @@ int ser_write(struct Serial *port, const void *_buf, size_t len)
 }
 
 
+#if CONFIG_PRINTF
 /*!
  * Formatted write
  */
@@ -291,14 +302,16 @@ int ser_printf(struct Serial *port, const char *format, ...)
 
        return len;
 }
+#endif /* CONFIG_PRINTF */
 
-#if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT)
+
+#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
 void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout)
 {
        port->rxtimeout = rxtimeout;
        port->txtimeout = txtimeout;
 }
-#endif /* defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT) */
+#endif /* CONFIG_SER_RXTIMEOUT || CONFIG_SER_TXTIMEOUT */
 
 
 void ser_setbaudrate(struct Serial *port, unsigned long rate)
@@ -318,8 +331,27 @@ void ser_setparity(struct Serial *port, int parity)
  */
 void ser_purge(struct Serial *ser)
 {
-       fifo_flush(&ser->rxfifo);
-       fifo_flush(&ser->txfifo);
+       fifo_flush_locked(&ser->rxfifo);
+       fifo_flush_locked(&ser->txfifo);
+}
+
+/*!
+ * Wait until all pending output is completely
+ * transmitted to the other end.
+ *
+ * \note The current implementation only checks the
+ *       software transmission queue. Any hardware
+ *       FIFOs are ignored.
+ */
+void ser_drain(struct Serial *ser)
+{
+       while(!fifo_isempty(&ser->txfifo))
+       {
+#if defined(CONFIG_KERN_SCHED) && CONFIG_KERN_SCHED
+                       /* Give up timeslice to other processes. */
+                       proc_switch();
+#endif
+       }
 }
 
 
@@ -331,13 +363,12 @@ struct Serial *ser_open(unsigned int unit)
        struct Serial *port;
 
        ASSERT(unit < countof(ser_handles));
-
        port = &ser_handles[unit];
 
        ASSERT(!port->is_open);
+       DB(port->is_open = true;)
 
        port->unit = unit;
-       port->is_open = true;
 
        /* Initialize circular buffer */
        fifo_init(&port->rxfifo, port->rxbuffer, sizeof(port->rxbuffer));
@@ -347,10 +378,10 @@ struct Serial *ser_open(unsigned int unit)
        port->hw->table->init(port->hw, port);
 
        /* Set default values */
-#if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT)
+#if CONFIG_SER_RXTIMEOUT != -1 || CONFIG_SER_TXTIMEOUT != -1
        ser_settimeouts(port, CONFIG_SER_RXTIMEOUT, CONFIG_SER_TXTIMEOUT);
 #endif
-#if defined(CONFIG_SER_DEFBAUDRATE)
+#if CONFIG_SER_DEFBAUDRATE
        ser_setbaudrate(port, CONFIG_SER_DEFBAUDRATE);
 #endif
 
@@ -364,8 +395,8 @@ struct Serial *ser_open(unsigned int unit)
 void ser_close(struct Serial *port)
 {
        ASSERT(port->is_open);
+       DB(port->is_open = false;)
 
-       port->is_open = false;
        port->hw->table->cleanup(port->hw);
        port->hw = NULL;
 }

diff --git a/drv/ser.h b/drv/ser.h
index 40f27054385480472a4eb45267c69519ecfe67f7..57d66cb0b4aa5556fe699ef8205c8061d8e47fe4 100755 (executable)
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,9 @@
 
 /*
  * $Log$
+ * Revision 1.6  2004/07/29 22:57:09  bernie
+ * ser_drain(): New function; Make Serial::is_open a debug-only feature; Switch to new-style CONFIG_* macros.
+ *
  * Revision 1.5  2004/07/18 21:54:23  bernie
  * Add ATmega8 support.
  *
@@ -30,9 +33,10 @@
 #ifndef DRV_SER_H
 #define DRV_SER_H
 
-#include "compiler.h"
 #include <mware/fifobuf.h>
-#include "config.h"
+#include <drv/kdebug.h>
+#include <compiler.h>
+#include <config.h>
 
 /*!
  * \name Serial Error/status flags
@@ -88,7 +92,7 @@
  */
 enum
 {
-#if defined(__AVR_ATmega64__)
+#if defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
        SER_UART0,
        SER_UART1,
        SER_SPI,
@@ -118,7 +122,7 @@ struct Serial
        /*! Physical port number */
        unsigned int unit;
 
-       bool is_open;
+       DB(bool is_open;)
 
        /*!
         * \name FIFO transmit and receive buffers.
@@ -133,16 +137,16 @@ struct Serial
        unsigned char rxbuffer[CONFIG_SER_RXBUFSIZE];
        /* \} */
 
-#ifdef CONFIG_SER_RXTIMEOUT
+#if CONFIG_SER_RXTIMEOUT != -1
        time_t rxtimeout;
 #endif
-#ifdef CONFIG_SER_TXTIMEOUT
+#if CONFIG_SER_TXTIMEOUT != -1
        time_t txtimeout;
 #endif
 
        /*! Holds the flags defined above.  Will be 0 when no errors have occurred. */
        serstatus_t status;
-       
+
        /*! Low-level interface to hardware. */
        struct SerialHardware* hw;
 };
@@ -164,11 +168,9 @@ extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo);
 
 extern void ser_setbaudrate(struct Serial *port, unsigned long rate);
 extern void ser_setparity(struct Serial *port, int parity);
+extern void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout);
 extern void ser_purge(struct Serial *port);
-
-#if defined(CONFIG_SER_RXTIMEOUT) || defined(CONFIG_SER_TXTIMEOUT)
-       extern void ser_settimeouts(struct Serial *port, time_t rxtimeout, time_t txtimeout);
-#endif
+extern void ser_drain(struct Serial *port);
 
 extern struct Serial *ser_open(unsigned int unit);
 extern void ser_close(struct Serial *port);