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

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

diff --git a/tos/chips/msp430/usart/Msp430Uart1C.nc b/tos/chips/msp430/usart/Msp430Uart1C.nc
index 4829a4c58a0e6376a49a6278f14e1495397a5063..a824fd3570fe12e2bf122492e22c5c8645f07bd6 100644 (file)
--- a/tos/chips/msp430/usart/Msp430Uart1C.nc
+++ b/tos/chips/msp430/usart/Msp430Uart1C.nc
@@ -33,6 +33,7 @@
  * An implementation of the UART on USART1 for the MSP430.
  * @author Vlado Handziski <handzisk@tkn.tu-berlin.de>
  * @author Jonathan Hui <jhui@archedrock.com>
+ * @author Eric B. Decker <cire81@gmail.com>
  * @version $Revision$ $Date$
  */
 
@@ -41,6 +42,7 @@
 generic configuration Msp430Uart1C() {
 
   provides interface Resource;
+  provides interface ResourceRequested;
   provides interface UartStream;
   provides interface UartByte;
 
@@ -55,13 +57,13 @@ implementation {
 
   components Msp430Uart1P as UartP;
   Resource = UartP.Resource[ CLIENT_ID ];
-  UartStream = UartP.UartStream;
-  UartByte = UartP.UartByte;
+  UartStream = UartP.UartStream[ CLIENT_ID ];
+  UartByte = UartP.UartByte[ CLIENT_ID ];;
   Msp430UartConfigure = UartP.Msp430UartConfigure[ CLIENT_ID ];
 
   components new Msp430Usart1C() as UsartC;
+  ResourceRequested = UsartC;
   UartP.ResourceConfigure[ CLIENT_ID ] <- UsartC.ResourceConfigure;
   UartP.UsartResource[ CLIENT_ID ] -> UsartC.Resource;
-  UartP.UsartInterrupts -> UsartC.HplMsp430UsartInterrupts;
-
+  UartP.UsartInterrupts[ CLIENT_ID ] -> UsartC.HplMsp430UsartInterrupts;
 }