Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / csystem / tosthread.h

diff --git a/tos/lib/tosthreads/csystem/tosthread.h b/tos/lib/tosthreads/csystem/tosthread.h
index b032ad54599529f75a99d85c13117e5ca098cdce..3c1551c904391f560f8cefcb9fa94fca121940d3 100644 (file)
--- a/tos/lib/tosthreads/csystem/tosthread.h
+++ b/tos/lib/tosthreads/csystem/tosthread.h
@@ -120,4 +120,17 @@ extern error_t tosthread_resume(tosthread_t* t);
  */
 extern error_t tosthread_sleep(uint32_t milli);
 
+/**
+ *  tosthread_join(tosthread_t* t)
+ *
+ *  This function bocks until the thread passed as a parameter has completed
+ *  
+ *  @param id                  The handle to the thread to block on
+ *  @return                            An error code indicating whether the thread could be waited on or not
+ *                                                     SUCCESS         -       The thread has been waited on and is now completed
+ *                                                     EALREADY        -       The thread we are trying to wait on has already completed
+ *                                                     FAIL            -       The thread could not waited on
+ */
+extern error_t tosthread_join(tosthread_t* id);
+
 #endif //TOSTHREAD_H_INCLUDED