Replace the special-purpose Msp430UsciConfigure interface with the

[tinyos-2.x.git] / tos / chips / msp430 / usci / Msp430Usci.h

diff --git a/tos/chips/msp430/usci/Msp430Usci.h b/tos/chips/msp430/usci/Msp430Usci.h
index 482998225e41bd04aa05050bae544ddc69f00165..541311136479c9de31a9be20609d085bfc5966da 100644 (file)
--- a/tos/chips/msp430/usci/Msp430Usci.h
+++ b/tos/chips/msp430/usci/Msp430Usci.h
@@ -80,6 +80,14 @@ typedef struct {
   msp430_ren_t ren;
 } __attribute__ ((packed)) msp430_usci_uart_t;
 
+typedef struct {
+  uint8_t ctl0;
+  uint8_t ctl1;
+  uint16_t brx;
+  uint8_t mctl; /* ??? */
+  msp430_ren_t ren;
+} __attribute__ ((packed)) msp430_usci_spi_t;
+
 /* Baud rates for UART mode.  Only 32KHz modes work right now. */
 typedef enum {
   /* UCOS16=0.  UMCTL = UCBRFx << 4 + UCBRSx << 1 + UCOS16.
@@ -94,6 +102,7 @@ typedef enum {
 
 typedef union {
   msp430_usci_uart_t uart;
+  msp430_usci_spi_t spi;
 } __attribute__ ((packed)) msp430_usci_config_t;
 
 #endif