X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=4f69a2af780c00c6d121ece2fc1647771bd790ee;hb=941529ddc4cddd04f69d38c0929ec00fe93aadef;hp=27d49b406969adaf864dc11f334fb361a776ede8;hpb=af78856c1817975ccf9e015f493422a794450351;p=bertos.git diff --git a/drv/ser.h b/drv/ser.h old mode 100755 new mode 100644 index 27d49b40..4f69a2af --- a/drv/ser.h +++ b/drv/ser.h @@ -1,9 +1,34 @@ /** * \file * * * \brief High level serial I/O API @@ -12,169 +37,18 @@ * \author Bernardo Innocenti */ -/*#* - *#* $Log$ - *#* Revision 1.34 2006/11/20 15:07:40 batt - *#* Revert unneeded locked functions. - *#* - *#* Revision 1.33 2006/11/17 17:03:58 batt - *#* Implement ser_setstatus and ser_getstatus as functions to avoid race conditions. - *#* - *#* Revision 1.32 2006/11/17 16:01:12 batt - *#* Serial status MUST be volatile. - *#* - *#* Revision 1.31 2006/09/13 18:22:48 bernie - *#* Typo. - *#* - *#* Revision 1.30 2006/09/13 18:21:23 bernie - *#* Add configurable SPI pin mapping. - *#* - *#* Revision 1.29 2006/09/13 13:59:11 bernie - *#* Documentation fixes. - *#* - *#* Revision 1.28 2006/07/21 10:58:00 batt - *#* Use timer_clock() instead of obsolete timer_ticks(). - *#* - *#* Revision 1.27 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.26 2006/05/18 00:39:13 bernie - *#* Add struct Serial friendly typedef. - *#* - *#* Revision 1.25 2006/02/17 22:28:00 bernie - *#* Rename ser_emul.c to ser_posix.c. - *#* - *#* Revision 1.24 2006/02/17 22:23:06 bernie - *#* Update POSIX serial emulator. - *#* - *#* Revision 1.23 2005/11/27 23:33:40 bernie - *#* Use appconfig.h instead of cfg/config.h. - *#* - *#* Revision 1.22 2005/11/04 16:20:02 bernie - *#* Fix reference to README.devlib in header. - *#* - *#* Revision 1.21 2005/04/11 19:10:27 bernie - *#* Include top-level headers from cfg/ subdir. - *#* - *#* Revision 1.20 2005/01/22 04:20:01 bernie - *#* Reformat. - *#* - *#* Revision 1.19 2005/01/11 18:08:16 aleph - *#* Add missing include - *#* - *#* Revision 1.18 2004/12/08 08:57:17 bernie - *#* Rename time_t to mtime_t. - *#* - *#* Revision 1.17 2004/11/16 21:54:56 bernie - *#* Changes for SC Monoboard support. - *#* - *#* Revision 1.16 2004/10/19 11:48:05 bernie - *#* Reformat. - *#* - *#* Revision 1.15 2004/10/19 08:11:53 bernie - *#* SERRF_TX, SERRF_RX: New macros; Enhance documentation. - *#* - *#* 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 - *#* - *#* Revision 1.10 2004/08/24 16:20:48 bernie - *#* ser_read(): Make buffer argument void *#* for consistency with ANSI C and ser_write() - *#* - *#* Revision 1.9 2004/08/15 05:32:22 bernie - *#* ser_resync(): New function. - *#* - *#* Revision 1.8 2004/08/02 20:20:29 aleph - *#* Merge from project_ks - *#* - *#* Revision 1.7 2004/07/30 14:15:53 rasky - *#* Nuovo supporto unificato per detect della CPU - *#* - *#* 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. - *#* - *#* Revision 1.4 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.3 2004/06/02 21:35:24 aleph - *#* Serial enhancements: interruptible receive handler and 8 bit serial status for AVR; remove volatile attribute to FIFOBuffer, useless for new fifobuf routens - *#* - *#* Revision 1.2 2004/05/23 18:21:53 bernie - *#* Trim CVS logs and cleanup header info. - *#* - *#*/ #ifndef DRV_SER_H #define DRV_SER_H + #include #include -#include /* BV() */ -#include -#include - -/** \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 - /* 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. @@ -191,7 +65,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 @@ -211,35 +85,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; @@ -295,6 +140,7 @@ extern int ser_printf(struct Serial *port, const char *format, ...) FORMAT(__pri extern int ser_gets(struct Serial *port, char *buf, int size); extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo); +extern void ser_clearstatus(struct Serial *port); extern void ser_setbaudrate(struct Serial *port, unsigned long rate); extern void ser_setparity(struct Serial *port, int parity);