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

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

diff --git a/tos/chips/msp430/usart/Msp430UsartShare0P.nc b/tos/chips/msp430/usart/Msp430UsartShare0P.nc
index c2f931e91b83e73e45b02fd135e6a669142f2188..d8643407466e6fc856d508098328ea2be8658071 100644 (file)
--- a/tos/chips/msp430/usart/Msp430UsartShare0P.nc
+++ b/tos/chips/msp430/usart/Msp430UsartShare0P.nc
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 2005-2006 Arch Rock Corporation
+/**
+ * Copyright (c) 2005-2006 Arched Rock Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the
  *   distribution.
- * - Neither the name of the Arch Rock Corporation nor the names of
+ * - Neither the name of the Arched Rock Corporation nor the names of
  *   its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
  *
@@ -30,38 +30,36 @@
  */
 
 /**
- * @author Jonathan Hui <jhui@archrock.com>
+ * @author Jonathan Hui <jhui@archedrock.com>
  * @version $Revision$ $Date$
  */
 
 configuration Msp430UsartShare0P {
-  
+
   provides interface HplMsp430UsartInterrupts as Interrupts[ uint8_t id ];
+  provides interface HplMsp430I2CInterrupts as I2CInterrupts[ uint8_t id ];
   provides interface Resource[ uint8_t id ];
+  provides interface ResourceRequested[ uint8_t id ];
   provides interface ArbiterInfo;
-  
+
+  uses interface ResourceConfigure[ uint8_t id ];
 }
 
 implementation {
-  
+
   components new Msp430UsartShareP() as UsartShareP;
   Interrupts = UsartShareP;
-  UsartShareP.RawInterrupts -> UsartC;
+  I2CInterrupts = UsartShareP;
   
   components new FcfsArbiterC( MSP430_HPLUSART0_RESOURCE ) as ArbiterC;
   Resource = ArbiterC;
+  ResourceRequested = ArbiterC;
+  ResourceConfigure = ArbiterC;
   ArbiterInfo = ArbiterC;
   UsartShareP.ArbiterInfo -> ArbiterC;
-  
-  components new AsyncStdControlPowerManagerC() as PowerManagerC;
-  PowerManagerC.ArbiterInit -> ArbiterC;
-  PowerManagerC.ResourceController -> ArbiterC;
-  
-  components HplMsp430Usart0C as UsartC;
-  PowerManagerC.AsyncStdControl -> UsartC;
-  
-  components MainC;
-  MainC.SoftwareInit -> ArbiterC;
-  MainC.SoftwareInit -> PowerManagerC;
+
+  components HplMsp430Usart0C as HplUsartC;
+  UsartShareP.RawInterrupts -> HplUsartC;
+  UsartShareP.RawI2CInterrupts -> HplUsartC;
 
 }