Renamed some components and added a blocking version of the SineSensor

[tinyos-2.x.git] / tos / lib / tosthreads / chips / msp430 / adc12 / BlockingAdcP.nc

diff --git a/tos/lib/tosthreads/chips/msp430/adc12/BlockingAdcP.nc b/tos/lib/tosthreads/chips/msp430/adc12/BlockingAdcP.nc
index e88a996096a234ce8052fc2d68be25e86a7d1c25..ce22d9657fd6e8835cee7ec315fcec94f099e21f 100644 (file)
--- a/tos/lib/tosthreads/chips/msp430/adc12/BlockingAdcP.nc
+++ b/tos/lib/tosthreads/chips/msp430/adc12/BlockingAdcP.nc
@@ -56,28 +56,32 @@ implementation {
   components MainC;
   components AdcP;
   components WireAdcStreamP;
-  components BlockingAdcImplP;
+  components new BlockingReadP();
+  components new BlockingReadStreamP();
   
-  MainC.SoftwareInit -> BlockingAdcImplP;
+  MainC.SoftwareInit -> BlockingReadP;
+  MainC.SoftwareInit -> BlockingReadStreamP;
   
   //For BlockingRead
-  BlockingRead = BlockingAdcImplP;
+  BlockingRead = BlockingReadP;
   Config = AdcP.Config;
   SingleChannel = AdcP.SingleChannel;
   ResourceRead = AdcP.ResourceRead;
-  BlockingAdcImplP.Read -> AdcP.Read;
+  BlockingReadP.Read -> AdcP.Read;
   
   //For BlockingReadStream
-  BlockingReadStream = BlockingAdcImplP;
+  BlockingReadStream = BlockingReadStreamP;
   ConfigReadStream = WireAdcStreamP;
   SingleChannelReadStream = WireAdcStreamP;
   ResourceReadStream = WireAdcStreamP;
-  BlockingAdcImplP.ReadStream -> WireAdcStreamP;
+  BlockingReadStreamP.ReadStream -> WireAdcStreamP;
   
   components SystemCallC;
   components SystemCallQueueC;
-  BlockingAdcImplP.SystemCallQueue -> SystemCallQueueC;
-  BlockingAdcImplP.SystemCall -> SystemCallC;
+  BlockingReadP.SystemCallQueue -> SystemCallQueueC;
+  BlockingReadP.SystemCall -> SystemCallC;
+  BlockingReadStreamP.SystemCallQueue -> SystemCallQueueC;
+  BlockingReadStreamP.SystemCall -> SystemCallC;
 }