Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc b/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc
index ecbb4a65449caa2bbdc485e5908531b36ebf53d4..527d7a629e6c9e37d4f4d76fd39e0d81679d5f94 100644 (file)
--- a/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc
+++ b/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc
@@ -44,25 +44,16 @@ implementation {
   components BlockingCollectionSnooperP;
   components BlockingCollectionSenderP;
   components BlockingCollectionControlC;
-  
-  //Allocate enough room in the message queue for all message types.
-  //This number needs to be 255-1-12 because 
-  //(1) The max number that can be provided to the Queue underneath for its size is 255
-  //(2) uniqueN() will give you values from 0..N constituting N+1 unique numbers
-  //(3) there are 12 spaces reserved in the send queue in CtpP for forwarding messages.
-  //I don't like this implementation, but it will do for now....
-  enum {
-   FIRST_CLIENT = uniqueN(UQ_LQI_CLIENT, 255-1-12),
-  };
+  components CCollectionIdP;
   
   CCP.BlockingReceive -> BlockingCollectionReceiverP;
   CCP.BlockingSnoop -> BlockingCollectionSnooperP;
   CCP.BlockingSend -> BlockingCollectionSenderP;
   CCP.RoutingControl -> BlockingCollectionControlC;
+  CCP.CCollectionId -> CCollectionIdP;
   
   components CollectionC;
   CCP.Packet -> CollectionC;
   CCP.CollectionPacket -> CollectionC;
   CCP.RootControl -> CollectionC;
-  CollectionC.CollectionId -> CCP;
 }