Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/lib/tosthreads/system/MainC.nc b/tos/lib/tosthreads/system/MainC.nc
index 69fc2ba3deba9e6588f9713d2d65798df608ba5a..710d281c019fb5216cc27fbeeada4ea4eff108d8 100644 (file)
--- a/tos/lib/tosthreads/system/MainC.nc
+++ b/tos/lib/tosthreads/system/MainC.nc
@@ -52,8 +52,12 @@ implementation {
   
   components TinyTaskSchedulerC;
   components TinyThreadSchedulerC;
-  components ThreadP;
+  components StaticThreadC;
     
+#ifdef SAFE_TINYOS
+  components SafeFailureHandlerC;
+#endif
+
   // Export the SoftwareInit and Boot for applications
   SoftwareInit = TinyOSMainP.SoftwareInit;
   Boot = TinyOSMainP;
@@ -66,7 +70,7 @@ implementation {
   TinyTaskSchedulerC.ThreadScheduler -> TinyThreadSchedulerC;
   
   //Wire up the TinyOS code to its thread
-  ThreadP.StaticThreadInfo[TOSTHREAD_TOS_THREAD_ID] -> TinyOSMainP;
+  StaticThreadC.ThreadInfo[TOSTHREAD_TOS_THREAD_ID] -> TinyOSMainP;
   TinyOSMainP.TinyOSBoot -> TinyThreadSchedulerC;
   
   //Wire up the thread scheduler to start running