Added SPI support. Now working using the loopback feature (UCLISTEN bit).

[tinyos-2.x.git] / tos / chips / msp430 / usci / HplMsp430UsciInt1P.nc

diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
index e6a79a14c80b7074c113391da1e481cd047f72ac..c083cdb9a637d7dfa4847b11cc78cdfd79713c06 100644 (file)
--- a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
@@ -68,16 +68,9 @@ implementation
        signal IntA.brk();
       } else
        signal IntA.rx(c);
-    } else if (READ_FLAG(UC1IFG, UCB1RXIFG)) {
-      volatile uint8_t c = UCB1RXBUF; /* read to clear UCB1RXIFG */
-      if (READ_FLAG(UCB1CTL1, UCBRK)) {
-       CLR_FLAG(UCB1CTL1, UCBRK);
-       if (READ_FLAG(UCB1CTL0, UCMODE_3) == UCMODE_3)
-         CLR_FLAG(UCB1CTL1, UCDORM);
-       signal IntB.brk();
-      } else
-       signal IntB.rx(c);
-    } else if (READ_FLAG(UCB1STAT, UCALIFG))
+    } else if (READ_FLAG(UC1IFG, UCB1RXIFG))
+      signal IntB.rx(UCB1RXBUF); /* read clears UCB1RXIFG */
+    else if (READ_FLAG(UCB1STAT, UCALIFG))
       signal IntB.i2cCal();
     else if (READ_FLAG(UCB1STAT, UCNACKIFG))
       signal IntB.i2cNak();