X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fnet%2Flqi%2FCollectionSenderC.nc;h=374d2e677099d4ff0988073bc83c2f40995228df;hb=310e2c03397186f878ac789d0edcc51df4af09a7;hp=c5ed590136dd2ad43f7310f2dea2cc68fae6f37a;hpb=e8cbbe58ec46a414a5123e745a3faf35e13e2732;p=tinyos-2.x.git

diff --git a/tos/lib/net/lqi/CollectionSenderC.nc b/tos/lib/net/lqi/CollectionSenderC.nc
index c5ed5901..374d2e67 100644
--- a/tos/lib/net/lqi/CollectionSenderC.nc
+++ b/tos/lib/net/lqi/CollectionSenderC.nc
@@ -1,3 +1,33 @@
+/*
+ * Copyright (c) 2007 Stanford University.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the
+ *   distribution.
+ * - Neither the name of the Stanford University nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
+ * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /**
  * The virtualized collection sender abstraction.
  *
@@ -7,7 +37,7 @@
  * @see TinyOS Net2-WG
  */
 
-#include <Collection.h>
+#include <MultiHopLqi.h>
 
 generic configuration CollectionSenderC(collection_id_t collectid) {
   provides {
@@ -16,7 +46,9 @@ generic configuration CollectionSenderC(collection_id_t collectid) {
   }
 }
 implementation {
-  components CollectionC as Router;
-  Send = Router;
-  Packet = Router;
+  components new CollectionSenderP(collectid), CollectionC;
+  Send = CollectionSenderP;
+  Packet = CollectionC;
+  CollectionSenderP.SubSend -> CollectionC.Send[unique(UQ_LQI_CLIENT)];
+  CollectionSenderP.CollectionPacket -> CollectionC;
 }