X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusart%2Fmsp430usart.h;h=08d543b3d93338378086d0fbad5cf958a8051bb8;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=7939cedbc634c0904dbb4b3ba818181a5c1bd153;hpb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usart/msp430usart.h b/tos/chips/msp430/usart/msp430usart.h
index 7939cedb..08d543b3 100644
--- a/tos/chips/msp430/usart/msp430usart.h
+++ b/tos/chips/msp430/usart/msp430usart.h
@@ -297,7 +297,7 @@ msp430_i2c_union_config_t msp430_i2c_default_config = {
     listen : 0, 
     mst : 1,
     i2cword : 0, 
-    i2crm : 0, 
+    i2crm : 1, 
     i2cssel : 0x2, 
     i2cpsc : 0, 
     i2csclh : 0x3, 
@@ -306,5 +306,35 @@ msp430_i2c_union_config_t msp430_i2c_default_config = {
   } 
 };
 
+typedef uint8_t uart_speed_t;
+typedef uint8_t uart_parity_t;
+typedef uint8_t uart_duplex_t;
+
+enum {
+  TOS_UART_1200   = 0,
+  TOS_UART_1800   = 1,
+  TOS_UART_2400   = 2,
+  TOS_UART_4800   = 3,
+  TOS_UART_9600   = 4,
+  TOS_UART_19200  = 5,
+  TOS_UART_38400  = 6,
+  TOS_UART_57600  = 7,
+  TOS_UART_76800  = 8,
+  TOS_UART_115200 = 9,
+  TOS_UART_230400 = 10
+};
+
+enum {
+  TOS_UART_OFF,
+  TOS_UART_RONLY,
+  TOS_UART_TONLY,
+  TOS_UART_DUPLEX
+};
+
+enum {
+  TOS_UART_PARITY_NONE,
+  TOS_UART_PARITY_EVEN,
+  TOS_UART_PARITY_ODD
+};
 
 #endif//_H_Msp430Usart_h