Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / tmicore / PlatformSerialC.nc

diff --git a/tos/platforms/tmicore/PlatformSerialC.nc b/tos/platforms/tmicore/PlatformSerialC.nc
index 35b1d8c6e36df6175547f160fbb782ac863e8bf5..28f4354ed1c17757958ed94c222b22a6bbd38567 100644 (file)
--- a/tos/platforms/tmicore/PlatformSerialC.nc
+++ b/tos/platforms/tmicore/PlatformSerialC.nc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Titanium Mirror, Inc.
+ * Copyright (c) 2008-2010, Titanium Mirror, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,22 +26,25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
  /**
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 configuration PlatformSerialC {
-  provides interface Resource;
+  provides interface StdControl;
   provides interface UartStream;
   provides interface UartByte;
 }
 implementation {
   components new Msp430UartA1C() as UartC;
-  Resource = UartC;
   UartStream = UartC;
   UartByte = UartC;
 
+  components PlatformSerialP;
+  StdControl = PlatformSerialP;
+  PlatformSerialP.Resource -> UartC;
+
 #if 0 /* If you want to change the configuration... */
   components SomeConfigurationComponentC as ConfigC;
   UartC.AsyncConfigure -> ConfigC;