Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / csystem / TosThreadApiC.nc

diff --git a/tos/lib/tosthreads/csystem/TosThreadApiC.nc b/tos/lib/tosthreads/csystem/TosThreadApiC.nc
index d7c4d5123a20e8978be2b0b5deedb38e01fc48e7..da04a860bb1ddf6c8e87fe10fb0009a9d15bd26e 100644 (file)
--- a/tos/lib/tosthreads/csystem/TosThreadApiC.nc
+++ b/tos/lib/tosthreads/csystem/TosThreadApiC.nc
@@ -31,6 +31,7 @@
  
 /**
  * @author Kevin Klues <klueska@cs.stanford.edu>
+ * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
  */
  
 #include "tosthread.h"
@@ -67,8 +68,14 @@ implementation {
   #if defined(TOSTHREAD_LOGSTORAGE_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
     components CLogStorageC;
   #endif 
+  #if defined(TOSTHREAD_CONFIGSTORAGE_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
+    components CConfigStorageC;
+  #endif
+  #if defined(TOSTHREAD_COLLECTION_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
+    components CCollectionC;
+  #endif 
   
-  //Telosb sensorboard specific.  Later need to find conditional way of adding this in
+  //Telosb sensorboard specific.
   #if defined(TOSTHREAD_HAMAMATSUS1087_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
     components CHamamatsuS1087ParC;
   #endif
@@ -83,4 +90,12 @@ implementation {
   #if defined(TOSTHREAD_SINESENSOR_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
     components CSineSensorC;
   #endif
+  
+  //Basicsb sensorboard specific
+  #if defined(TOSTHREAD_PHOTO_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
+    components CPhotoC;
+  #endif
+  #if defined(TOSTHREAD_TEMP_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
+    components CTempC;
+  #endif
 }