Update to include paramaterization of the UartStream interface as well as push Resour...

[tinyos-2.x.git] / tos / chips / msp430 / usart / Msp430UsartShare1P.nc

diff --git a/tos/chips/msp430/usart/Msp430UsartShare1P.nc b/tos/chips/msp430/usart/Msp430UsartShare1P.nc
index 153906a72acd234ccb94e9f7f0e24322a40d52bc..3b977b3449a2604fc7ea7d5ba67eca4aaa1a9351 100644 (file)
--- a/tos/chips/msp430/usart/Msp430UsartShare1P.nc
+++ b/tos/chips/msp430/usart/Msp430UsartShare1P.nc
@@ -39,6 +39,7 @@ configuration Msp430UsartShare1P {
 
   provides interface HplMsp430UsartInterrupts as Interrupts[ uint8_t id ];
   provides interface Resource[ uint8_t id ];
+  provides interface ResourceRequested[ uint8_t id ];
   provides interface ArbiterInfo;
 
   uses interface ResourceConfigure[ uint8_t id ];
@@ -52,12 +53,13 @@ implementation {
 
   components new FcfsArbiterC( MSP430_HPLUSART1_RESOURCE ) as ArbiterC;
   Resource = ArbiterC;
+  ResourceRequested = ArbiterC;
   ResourceConfigure = ArbiterC;
   ArbiterInfo = ArbiterC;
   UsartShareP.ArbiterInfo -> ArbiterC;
 
   components new AsyncStdControlPowerManagerC() as PowerManagerC;
-  PowerManagerC.ResourceController -> ArbiterC;
+  PowerManagerC.ResourceDefaultOwner -> ArbiterC;
        
   components HplMsp430Usart1C as UsartC;
   PowerManagerC.AsyncStdControl -> UsartC;