Refactor BeRTOS to be in his own directory.

[bertos.git] / cpu / arm / io / at91_us.h

diff --git a/cpu/arm/io/at91_us.h b/cpu/arm/io/at91_us.h
index 9b544e81b5f9dabf8fbb64c39964b13560e6b042..20541a762c96551ab4a42f0e33c1e7c781c5536a 100644 (file)
--- a/cpu/arm/io/at91_us.h
+++ b/cpu/arm/io/at91_us.h
@@ -30,7 +30,7 @@
  *
  * -->
  *
- * \version $Id: at91_aic.h 18260 2007-10-11 14:08:10Z batt $
+ * \version $Id: at91_us.h 20544 2008-02-14 12:15:57Z batt $
  *
  * \author Daniele Basile <asterix@develer.com>
  *
@@ -79,7 +79,7 @@
 #define US_CR_OFF               0x00000000      ///< USART control register offset.
 #define US0_CR  (*((reg32_t *)(USART0_BASE + US_CR_OFF)))       ///< Channel 0 control register address.
 #define US1_CR  (*((reg32_t *)(USART1_BASE + US_CR_OFF)))       ///< Channel 1 control register address.
-#define US_RSTRX                         2      ///< Reset receiver. */
+#define US_RSTRX                         2      ///< Reset receiver.
 #define US_RSTTX                         3      ///< Reset transmitter.
 #define US_RXEN                          4      ///< Receiver enable.
 #define US_RXDIS                         5      ///< Receiver disable.
@@ -91,7 +91,7 @@
 #define US_STTTO                         11     ///< Start timeout.
 #define US_SENDA                         12     ///< Send next byte with address bit set.
 #define US_RSTIT                         13     ///< Reset interations.
-#define US_RTSNAK                        14     ///< Reset non acknowledge.
+#define US_RSTNAK                        14     ///< Reset non acknowledge.
 #define US_RETTO                         15     ///< Rearm time out.
 #define US_DTREN                         16     ///< Data terminal ready enable.
 #define US_DTRDIS                        17     ///< Data terminal ready disable.
@@ -114,7 +114,7 @@
 #define US_USART_MODE_MODEM     0x00000003      ///< Modem.
 #define US_USART_MODE_ISO7816T0 0x00000004      ///< ISO7816 protocol: T=0.
 #define US_USART_MODE_ISO7816T1 0x00000006      ///< ISO7816 protocol: T=1.
-#define US_USART_MODE_RS485     0x00000008      ///< IrDA.
+#define US_USART_MODE_IRDA      0x00000008      ///< IrDA.
 
 #define US_CLKS_MASK            0x00000030      ///< Clock selection mask.
 #define US_CLKS_MCK             0x00000000      ///< Master clock.
@@ -234,8 +234,6 @@
 #define US_BRGR_OFF             0x00000020      ///< USART baud rate register offset.
 #define US0_BRGR (*((reg32_t *)(USART0_BASE + US_BRGR_OFF)))    ///< Channel 0 baud rate register address.
 #define US1_BRGR (*((reg32_t *)(USART1_BASE + US_BRGR_OFF)))    ///< Channel 1 baud rate register address.
-#define US_BRGR_MASK            0x0000FFFF      ///< Clock divider.
-#define US_BRGR_FP_MASK         0x001F0000      ///< Fractional part.
 /*\}*/
 
 /**
@@ -286,16 +284,16 @@
 #if USART_HAS_PDC
 
        /**
-       * Receive Pointer Register
-       */
+        * Receive Pointer Register
+        */
        /*\{*/
        #define US0_RPR (*((reg32_t *)(USART0_BASE + PERIPH_RPR_OFF)))      ///< Channel 0 receive pointer register address.
        #define US1_RPR (*((reg32_t *)(USART1_BASE + PERIPH_RPR_OFF)))      ///< Channel 1 receive pointer register address.
        /*\}*/
 
        /**
-       * Receive Counter Register
-       */
+        * Receive Counter Register
+        */
        /*\{*/
        #define US0_RCR (*((reg32_t *)(USART0_BASE + PERIPH_RCR_OFF)))      ///< Channel 0 receive counter register address.
        #define US1_RCR (*((reg32_t *)(USART1_BASE + PERIPH_RCR_OFF)))      ///< Channel 1 receive counter register address.
@@ -343,5 +341,4 @@
 
 #endif  /* USART_HAS_PDC */
 
-
 #endif /* AT91_US_H */