Update to C api for CTP and MultiHopLqi

[tinyos-2.x.git] / tos / lib / tosthreads / lib / net / BlockingCollectionSenderP.nc

diff --git a/tos/lib/tosthreads/lib/net/BlockingCollectionSenderP.nc b/tos/lib/tosthreads/lib/net/BlockingCollectionSenderP.nc
index 33a280f6a02d5c3358ab66589e284774b968f487..e2ba37e34773209bb0507977081b0041eb66b9f3 100644 (file)
--- a/tos/lib/tosthreads/lib/net/BlockingCollectionSenderP.nc
+++ b/tos/lib/tosthreads/lib/net/BlockingCollectionSenderP.nc
@@ -22,31 +22,30 @@
 
 /*
  * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Kevin Klues <klueska@cs.stanford.edu>
  */
 
-generic configuration BlockingCollectionSenderP (collection_id_t collectid, uint8_t clientid) {
+configuration BlockingCollectionSenderP {
   provides {
-    interface BlockingSend;
+    interface BlockingSend[uint8_t id];
   }
 }
 
 implementation {
   components BlockingCollectionSenderImplP,
              CollectionC as Collector,
-             new CollectionIdP(collectid),
              MutexC,
              SystemCallC,
              MainC,
              LedsC;
   
   MainC.SoftwareInit -> BlockingCollectionSenderImplP;
-  BlockingSend = BlockingCollectionSenderImplP.BlockingSend[clientid];
+  BlockingSend = BlockingCollectionSenderImplP.BlockingSend;
   
   BlockingCollectionSenderImplP.Mutex -> MutexC;
   BlockingCollectionSenderImplP.SystemCall -> SystemCallC;
-  BlockingCollectionSenderImplP.Send[clientid] -> Collector[clientid];
+  BlockingCollectionSenderImplP.Send -> Collector;
   BlockingCollectionSenderImplP.Packet -> Collector;
   BlockingCollectionSenderImplP.Leds -> LedsC;
-  
-  Collector.CollectionId[clientid] -> CollectionIdP;
 }
+