projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import into DevLib.
[bertos.git]
/
drv
/
ser.h
diff --git
a/drv/ser.h
b/drv/ser.h
index 1f611646bfbc3b581f268afc7309bdf9b2d7991f..3b3edd5c980fd0b387c8890bae638d0b50fca732 100755
(executable)
--- a/
drv/ser.h
+++ b/
drv/ser.h
@@
-14,6
+14,15
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.18 2004/12/08 08:57:17 bernie
*#* Rename time_t to mtime_t.
*#*
@@
-70,8
+79,9
@@
#define DRV_SER_H
#include <mware/fifobuf.h>
#define DRV_SER_H
#include <mware/fifobuf.h>
-#include <compiler.h>
-#include <config.h>
+#include <cfg/compiler.h>
+#include <cfg/config.h>
+#include <cfg/macros.h> /* BV() */
/*! \name Serial Error/status flags. */
/*\{*/
/*! \name Serial Error/status flags. */
/*\{*/
@@
-85,7
+95,7
@@
/*
* Hardware errors.
/*
* Hardware errors.
-
* These flags map directly to the AVR UART Status Register (USR).
+ * 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_RXSROVERRUN BV(3) /*!< Rx shift register overrun */
#define SERRF_FRAMEERROR BV(4) /*!< Stop bit missing */
@@
-122,7
+132,8
@@
/*! \name Masks to group TX/RX errors. */
/*\{*/
/*! \name Masks to group TX/RX errors. */
/*\{*/
-#define SERRF_RX (SERRF_RXFIFOOVERRUN \
+#define SERRF_RX \
+ ( SERRF_RXFIFOOVERRUN \
| SERRF_RXTIMEOUT \
| SERRF_RXSROVERRUN \
| SERRF_PARITYERROR \
| SERRF_RXTIMEOUT \
| SERRF_RXSROVERRUN \
| SERRF_PARITYERROR \