Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / interfaces / ThreadScheduler.nc

diff --git a/tos/lib/tosthreads/interfaces/ThreadScheduler.nc b/tos/lib/tosthreads/interfaces/ThreadScheduler.nc
index 089460807addda6779380e342e5103894cef971e..c682d28a3a0b5c68e7cdef9a0559c57e2a1d2283 100644 (file)
--- a/tos/lib/tosthreads/interfaces/ThreadScheduler.nc
+++ b/tos/lib/tosthreads/interfaces/ThreadScheduler.nc
@@ -48,4 +48,5 @@ interface ThreadScheduler {
   async command error_t interruptCurrentThread();
 
   async command error_t wakeupThread(thread_id_t id);
+  async command error_t joinThread(thread_id_t id);
 }