X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser.h;h=ae8e0b2ae5f86b0d031f344700fbe09c22def7fa;hb=8e67b786e5aa96e6d4628687cf230a8f64d3791a;hp=f9ff2ddd639afe3e032eed2431be38f4fd845fae;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/drv/ser.h b/drv/ser.h
index f9ff2ddd..ae8e0b2a 100755
--- a/drv/ser.h
+++ b/drv/ser.h
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -155,7 +173,10 @@
 #endif
 /*\}*/
 
-/** Mask to group all RX errors. */
+/**
+ * \name Masks to group TX/RX errors.
+ * \{
+ */
 #define SERRF_RX \
 	( SERRF_RXFIFOOVERRUN \
 	| SERRF_RXTIMEOUT \
@@ -163,10 +184,16 @@
 	| SERRF_PARITYERROR \
 	| SERRF_FRAMEERROR \
 	| SERRF_NOISEERROR)
-
-/** Mask to group all TX errors. */
 #define SERRF_TX  (SERRF_TXTIMEOUT)
+/*\}*/
 
+/**
+ * \name LSB or MSB first data order, used with SPI AVR serial
+ * \{
+ */
+#define SER_MSB_FIRST 0
+#define SER_LSB_FIRST 1
+/*\}*/
 
 /**
  * \name Parity settings for ser_setparity().
@@ -174,8 +201,8 @@
  * \note Values are AVR-specific for performance reasons.
  *       Other processors should either decode them or
  *       redefine these macros.
+ * \{
  */
-/*\{*/
 #define SER_PARITY_NONE  0
 #define SER_PARITY_EVEN  2
 #define SER_PARITY_ODD   3
@@ -188,7 +215,7 @@
  */
 enum
 {
-#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
+#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281
 	SER_UART0,
 	SER_UART1,
 	SER_SPI,
@@ -238,14 +265,14 @@ typedef struct Serial
 	/* \} */
 
 #if CONFIG_SER_RXTIMEOUT != -1
-	mtime_t rxtimeout;
+	ticks_t rxtimeout;
 #endif
 #if CONFIG_SER_TXTIMEOUT != -1
-	mtime_t txtimeout;
+	ticks_t txtimeout;
 #endif
 
 	/** Holds the flags defined above.  Will be 0 when no errors have occurred. */
-	serstatus_t status;
+	volatile serstatus_t status;
 
 	/** Low-level interface to hardware. */
 	struct SerialHardware* hw;
@@ -276,13 +303,7 @@ extern void ser_drain(struct Serial *port);
 extern struct Serial *ser_open(unsigned int unit);
 extern void ser_close(struct Serial *port);
 
-/**
- * \name Additional functions implemented as macros
- *
- * \{
- */
-#define ser_getstatus(h)    ((h)->status)
-#define ser_setstatus(h, x) ((h)->status = (x))
-/* \} */
+extern serstatus_t ser_getstatus(struct Serial *port);
+extern void ser_setstatus(struct Serial *port, serstatus_t status);
 
 #endif /* DRV_SER_H */