X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=fd640b0044390d46b034779b143448dad239a931;hb=a98a42143f3b9c130a36e59221817fa5260a8322;hp=1f611646bfbc3b581f268afc7309bdf9b2d7991f;hpb=f530f9a7018684f5ad744076220f845ed7732244;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index 1f611646..fd640b00 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -3,7 +3,7 @@
  * <!--
  * 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 devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief High level serial I/O API
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -70,8 +85,9 @@
 #define DRV_SER_H
 
 #include <mware/fifobuf.h>
-#include <compiler.h>
-#include <config.h>
+#include <cfg/compiler.h>
+#include <cfg/macros.h> /* BV() */
+#include <appconfig.h>
 
 /*! \name Serial Error/status flags. */
 /*\{*/
@@ -85,7 +101,7 @@
 
 	/*
 	 * 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 */
@@ -122,7 +138,8 @@
 
 /*! \name Masks to group TX/RX errors. */
 /*\{*/
-#define SERRF_RX  (SERRF_RXFIFOOVERRUN \
+#define SERRF_RX \
+	( SERRF_RXFIFOOVERRUN \
 	| SERRF_RXTIMEOUT \
 	| SERRF_RXSROVERRUN \
 	| SERRF_PARITYERROR \