Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / lib / net / tosthread_collection.h

diff --git a/tos/lib/tosthreads/lib/net/tosthread_collection.h b/tos/lib/tosthreads/lib/net/tosthread_collection.h
index 4bdfb30e5f1aee5102c5232e6194baa99b193c5d..b3967c4e02cc99e9a042c408aaab36a5fe67f909 100644 (file)
--- a/tos/lib/tosthreads/lib/net/tosthread_collection.h
+++ b/tos/lib/tosthreads/lib/net/tosthread_collection.h
@@ -31,18 +31,19 @@
 
 /**
  * @author Kevin Klues <klueska@cs.stanford.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
  */
  
 #ifndef TOSTHREAD_COLLECTION_H
 #define TOSTHREAD_COLLECTION_H
 
-#include "message.h"
-#include "TinyError.h"
-#include "Collection.h"
+#include "ccollection.h"
 
 extern error_t collectionRoutingStart();
 extern error_t collectionRoutingStop();
 
+extern error_t collectionSetCollectionId(uint8_t clientid, collection_id_t collectionid);
+
 extern error_t collectionReceive(message_t* m, uint32_t timeout, collection_id_t id);
 extern error_t collectionSnoop(message_t* m, uint32_t timeout, collection_id_t id);
 extern error_t collectionSend(message_t* msg, uint8_t len, collection_id_t id);