X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Ftosthreads%2Flib%2Fnet%2FCCollectionP.nc;h=8b5fbdf2ac3c47cddcbfd112d42f25fcd0747db3;hb=c5b798cd21ab503fcbad0b4d145301589975a0d2;hp=52878a515abb536aeff5c782362002c500934336;hpb=1fe0446fd667275237d1852719c97034d9bf1aad;p=tinyos-2.x.git

diff --git a/tos/lib/tosthreads/lib/net/CCollectionP.nc b/tos/lib/tosthreads/lib/net/CCollectionP.nc
index 52878a51..8b5fbdf2 100644
--- a/tos/lib/tosthreads/lib/net/CCollectionP.nc
+++ b/tos/lib/tosthreads/lib/net/CCollectionP.nc
@@ -31,6 +31,7 @@
 
 /**
  * @author Kevin Klues <klueska@cs.stanford.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
  */
 
 module CCollectionP {
@@ -38,10 +39,11 @@ module CCollectionP {
     interface BlockingStdControl as RoutingControl;
     interface BlockingReceive[collection_id_t id];
     interface BlockingReceive as BlockingSnoop[collection_id_t id];
-    interface BlockingSend[am_id_t id];
+    interface BlockingSend[uint8_t id];
     interface Packet;
     interface CollectionPacket;
     interface RootControl;
+    interface CCollectionId;
   }
   provides {
     interface CollectionId[uint8_t client];
@@ -49,7 +51,11 @@ module CCollectionP {
 }
 implementation {
   command collection_id_t CollectionId.fetch[uint8_t id]() {
-    return id;
+    return call CCollectionId.fetch(id);
+  }
+
+  error_t collectionSetCollectionId(uint8_t clientid, collection_id_t collectionid) @C() @spontaneous() {
+    return call CCollectionId.set(clientid, collectionid);
   }
   
   error_t collectionRoutingStart() @C() @spontaneous() {
@@ -65,7 +71,7 @@ implementation {
   error_t collectionSnoop(message_t* m, uint32_t timeout, collection_id_t id) @C() @spontaneous() {
     return call BlockingSnoop.receive[id](m, timeout);
   }
-  error_t collectionSend(message_t* msg, uint8_t len, collection_id_t id) @C() @spontaneous() {
+  error_t collectionSend(message_t* msg, uint8_t len, uint8_t id) @C() @spontaneous() {
     return call BlockingSend.send[id](msg, len);
   }