Remove cvs log.

[bertos.git] / drv / ser.h

diff --git a/drv/ser.h b/drv/ser.h
old mode 100755 (executable)
new mode 100644 (file)
index ba8eab9..6a62642
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003,2004 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.
+ *
  * -->
  *
  * \brief High level serial I/O API
@@ -123,64 +148,15 @@
 #ifndef DRV_SER_H
 #define DRV_SER_H
 
+
 #include <mware/fifobuf.h>
 #include <cfg/compiler.h>
-#include <cfg/macros.h> /* BV() */
-#include <cfg/os.h>
-#include <appconfig.h>
-
-/** \name Serial Error/status flags. */
-/*\{*/
-#if CPU_AVR
-       typedef uint8_t serstatus_t;
-
-       /* Software errors */
-       #define SERRF_RXFIFOOVERRUN  BV(0)  /**< Rx FIFO buffer overrun */
-       #define SERRF_RXTIMEOUT      BV(5)  /**< Receive timeout */
-       #define SERRF_TXTIMEOUT      BV(6)  /**< Transmit timeout */
 
-       /*
-        * Hardware errors.
-        * These flags map directly to the AVR UART Status Register (USR).
-        */
-       #define SERRF_RXSROVERRUN    BV(3)  /**< Rx shift register overrun */
-       #define SERRF_FRAMEERROR     BV(4)  /**< Stop bit missing */
-       #define SERRF_PARITYERROR    BV(7)  /**< Parity error */
-       #define SERRF_NOISEERROR     0      /**< Unsupported */
-#elif CPU_DSP56K
-       typedef uint16_t serstatus_t;
-
-       /* Software errors */
-       #define SERRF_RXFIFOOVERRUN  BV(0)  /**< Rx FIFO buffer overrun */
-       #define SERRF_RXTIMEOUT      BV(1)  /**< Receive timeout */
-       #define SERRF_TXTIMEOUT      BV(2)  /**< Transmit timeout */
+#include CPU_HEADER(ser)
 
-       /*
-        * Hardware errors.
-        * These flags map directly to the SCI Control Register.
-        */
-       #define SERRF_PARITYERROR    BV(8)  /**< Parity error */
-       #define SERRF_FRAMEERROR     BV(9)  /**< Stop bit missing */
-       #define SERRF_NOISEERROR     BV(10) /**< Noise error */
-       #define SERRF_RXSROVERRUN    BV(11) /**< Rx shift register overrun */
-#elif OS_HOSTED
-       typedef uint16_t serstatus_t;
-
-       /* Software errors */
-       #define SERRF_RXFIFOOVERRUN  BV(0)  /**< Rx FIFO buffer overrun */
-       #define SERRF_RXTIMEOUT      BV(1)  /**< Receive timeout */
-       #define SERRF_TXTIMEOUT      BV(2)  /**< Transmit timeout */
+#include <appconfig.h>
 
-       /* Hardware errors */
-       #define SERRF_RXSROVERRUN    0      /**< Unsupported in emulated serial port. */
-       #define SERRF_FRAMEERROR     0      /**< Unsupported in emulated serial port. */
-       #define SERRF_PARITYERROR    0      /**< Unsupported in emulated serial port. */
-       #define SERRF_NOISEERROR     0      /**< Unsupported in emulated serial port. */
 
-#else
-       #error unknown architecture
-#endif
-/*\}*/
 
 /**
  * \name Masks to group TX/RX errors.
@@ -197,7 +173,7 @@
 /*\}*/
 
 /**
- * \name LSB or MSB first data order, used with SPI AVR serial
+ * \name LSB or MSB first data order for SPI driver.
  * \{
  */
 #define SER_MSB_FIRST 0
@@ -217,35 +193,6 @@
 #define SER_PARITY_ODD   3
 /*\}*/
 
-/**
- * \name Serial hw numbers
- *
- * \{
- */
-enum
-{
-#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281
-       SER_UART0,
-       SER_UART1,
-       SER_SPI,
-#elif CPU_AVR_ATMEGA103 || CPU_AVR_ATMEGA8
-       SER_UART0,
-       SER_SPI,
-#elif CPU_DSP56K
-       // \todo since we now support "fake" multiplexed serials, this should be moved to hw.h
-       SER_UART0,
-       SER_PUNTALI,
-       SER_BARCODE,
-#elif OS_HOSTED
-       SER_UART0,
-       SER_UART1,
-#else
-       #error unknown architecture
-#endif
-       SER_CNT  /**< Number of serial ports */
-};
-/*\}*/
-
 
 struct SerialHardware;