Change to get rid of statically allocating space in collection queue

[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..1b1dca26430270aaf4672c22c49ea79f993b5e32 100644 (file)
--- a/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc
+++ b/tos/lib/tosthreads/lib/net/lqi/CCollectionC.nc
@@ -45,16 +45,6 @@ implementation {
   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),
-  };
-  
   CCP.BlockingReceive -> BlockingCollectionReceiverP;
   CCP.BlockingSnoop -> BlockingCollectionSnooperP;
   CCP.BlockingSend -> BlockingCollectionSenderP;
@@ -64,5 +54,4 @@ implementation {
   CCP.Packet -> CollectionC;
   CCP.CollectionPacket -> CollectionC;
   CCP.RootControl -> CollectionC;
-  CollectionC.CollectionId -> CCP;
 }