More work on USCI peripheral support.

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

diff --git a/tos/chips/msp430/usci/Msp430UsciB0C.nc b/tos/chips/msp430/usci/Msp430UsciB0C.nc
index 2ce825fc7299bcb5d84873fbc68e86286bc1fd29..a69c6fc96e60dd01daa7647795b35eb235b079d7 100644 (file)
--- a/tos/chips/msp430/usci/Msp430UsciB0C.nc
+++ b/tos/chips/msp430/usci/Msp430UsciB0C.nc
@@ -36,7 +36,7 @@
 configuration Msp430UsciB0C {
   provides {
     interface HplMsp430UsciReg as Registers;
-    interface HplMsp430UsciIntA as Interrupts[uint8_t];
+    interface HplMsp430UsciInt as Interrupts[uint8_t];
     interface Resource as Resource[uint8_t];
     interface ResourceRequested as ResourceRequested[uint8_t];
     interface ArbiterInfo;
@@ -44,22 +44,17 @@ configuration Msp430UsciB0C {
   uses interface ResourceConfig as ResourceConfig[uint8_t];
 }
 implementation {
-  components new HplMsp430UsciRegP(UCB0CTL0_, UCB0CTL1_, UCB0BR0_, UCB0BR1_,
-    0/*UCB0MCTL_*/, UCB0I2CIE_, UCB0STAT_, UCB0RXBUF_, UCB0TXBUF_,
-    0/*UCB0ABCTL_*/, 0/*UCB0IRTCTL_*/, 0/*UCB0IRRCTL_*/, UCB0I2COA_,
-    UCB0I2CSA_, IE2_, IFG2_) as RegP;
-  Registers = RegP;
-
   components new FcfsArbiterC(MSP430_USCIB0_RESOURCE) as ArbiterC;
   Resource = ArbiterC;
   ResourceRequested = ArbiterC;
   ResourceConfigure = ArbiterC;
   ArbiterInfo = ArbiterC;
 
-  components new Msp430UsciIntDispatchAP() as IntDispatchB0P;
-  Interrupts = IntDispatchB0P.IntAx;
+  components new Msp430UsciIntDispatchP() as IntDispatchB0P;
+  Interrupts = IntDispatchB0P;
   IntDispatchB0P.ArbiterInfo -> ArbiterC;
 
-  components HplMsp430UsciInt0C as Int0C;
-  IntDispatchB0P.RawIntAx -> Int0C.IntA;
+  components HplMsp430UsciC as UsciC;
+  Registers = UsciC.RegB0;
+  IntDispatchB0P.RawInt -> UsciC.IntB0;
 }