Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / system / DynamicThreadP.nc

diff --git a/tos/lib/tosthreads/system/DynamicThreadP.nc b/tos/lib/tosthreads/system/DynamicThreadP.nc
index cb4cd804a62745c524e9563aae2ddaa724df2ba1..de03f20dda0c6c04ebb1c1c96405fa3d549cd4be 100644 (file)
--- a/tos/lib/tosthreads/system/DynamicThreadP.nc
+++ b/tos/lib/tosthreads/system/DynamicThreadP.nc
@@ -137,11 +137,18 @@ happy:
   command error_t DynamicThread.sleep(uint32_t milli) {
     return call ThreadSleep.sleep(milli);
   }
+  command error_t DynamicThread.join(tosthread_t* t) {
+    return call ThreadScheduler.joinThread(*t);
+  }
   
   async command thread_t* ThreadInfo.get[uint8_t id]() {
     atomic return thread_info[id - TOSTHREAD_NUM_STATIC_THREADS];
   }
   
+  async command error_t ThreadInfo.reset[uint8_t id]() {
+    return FAIL;
+  }
+  
   async event void ThreadCleanup.cleanup[uint8_t id]() {
     signal ThreadNotification.aboutToDestroy[id]();
     atomic {