timer_delay(): Add a sanity check to avoid sleeping forever.

[bertos.git] / drv / ser.h

diff --git a/drv/ser.h b/drv/ser.h
index 918e7a76c825e4062705759c990e6a2ce067e7da..a11e0fb6e09f32e46e45ab60f1abf233bbf4e943 100755 (executable)
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.14  2004/10/03 18:43:18  bernie
+ *#* Fix a nasty bug caused by confusion between old-style and new-style configuration macros.
+ *#*
+ *#* Revision 1.13  2004/09/14 21:04:57  bernie
+ *#* Don't vanely call kdebug.h.
+ *#*
+ *#* Revision 1.12  2004/09/06 21:40:50  bernie
+ *#* Move buffer handling in chip-specific driver.
+ *#*
  *#* Revision 1.11  2004/08/25 14:12:08  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -49,7 +58,6 @@
 #define DRV_SER_H
 
 #include <mware/fifobuf.h>
-#include <drv/kdebug.h>
 #include <compiler.h>
 #include <config.h>
 
@@ -107,11 +115,11 @@
  */
 enum
 {
-#if defined(CPU_AVR_ATMEGA64) || defined(CPU_AVR_ATMEGA128)
+#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
        SER_UART0,
        SER_UART1,
        SER_SPI,
-#elif defined(CPU_AVR_ATMEGA103) || defined(CPU_AVR_ATMEGA8)
+#elif CPU_AVR_ATMEGA103 || CPU_AVR_ATMEGA8
        SER_UART0,
        SER_SPI,
 #elif CPU_DSP56K
@@ -136,10 +144,12 @@ struct Serial
        /*! Physical port number */
        unsigned int unit;
 
-       DB(bool is_open;)
+#ifdef _DEBUG
+       bool is_open;
+#endif
 
        /*!
-        * \name FIFO transmit and receive buffers.
+        * \name Transmit and receive FIFOs.
         *
         * Declared volatile because handled asinchronously by interrupts.
         *
@@ -147,8 +157,6 @@ struct Serial
         */
        FIFOBuffer txfifo;
        FIFOBuffer rxfifo;
-       unsigned char txbuffer[CONFIG_SER_TXBUFSIZE];
-       unsigned char rxbuffer[CONFIG_SER_RXBUFSIZE];
        /* \} */
 
 #if CONFIG_SER_RXTIMEOUT != -1