projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated include reference.
[bertos.git]
/
drv
/
ser.h
diff --git
a/drv/ser.h
b/drv/ser.h
index 34498df789294c01bc563151a6fd040672c88806..a315562ab01a02fe30c600dd0fedbcf5f6ca3828 100755
(executable)
--- a/
drv/ser.h
+++ b/
drv/ser.h
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.24 2006/02/17 22:23:06 bernie
*#* Update POSIX serial emulator.
*#*
@@
-90,7
+96,7
@@
#include <mware/fifobuf.h>
#include <cfg/compiler.h>
#include <cfg/macros.h> /* BV() */
#include <mware/fifobuf.h>
#include <cfg/compiler.h>
#include <cfg/macros.h> /* BV() */
-#include <cfg/
arch_config.h> /* ARCH_EMUL */
+#include <cfg/
os.h>
#include <appconfig.h>
/*! \name Serial Error/status flags. */
#include <appconfig.h>
/*! \name Serial Error/status flags. */
@@
-127,7
+133,7
@@
#define SERRF_FRAMEERROR BV(9) /*!< Stop bit missing */
#define SERRF_NOISEERROR BV(10) /*!< Noise error */
#define SERRF_RXSROVERRUN BV(11) /*!< Rx shift register overrun */
#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
ARCH & ARCH_EMUL
+#elif
OS_HOSTED
typedef uint16_t serstatus_t;
/* Software errors */
typedef uint16_t serstatus_t;
/* Software errors */
@@
-191,7
+197,7
@@
enum
SER_UART0,
SER_PUNTALI,
SER_BARCODE,
SER_UART0,
SER_PUNTALI,
SER_BARCODE,
-#elif
ARCH & ARCH_EMUL
+#elif
OS_HOSTED
SER_UART0,
SER_UART1,
#else
SER_UART0,
SER_UART1,
#else
@@
-208,7
+214,7
@@
struct SerialHardware;
extern const char * const serial_errors[8];
/*! Serial handle structure */
extern const char * const serial_errors[8];
/*! Serial handle structure */
-struct Serial
+
typedef
struct Serial
{
/*! Physical port number */
unsigned int unit;
{
/*! Physical port number */
unsigned int unit;
@@
-240,7
+246,7
@@
struct Serial
/*! Low-level interface to hardware. */
struct SerialHardware* hw;
/*! Low-level interface to hardware. */
struct SerialHardware* hw;
-};
+}
Serial
;
/* Function prototypes */
/* Function prototypes */