Rewiring to fix bug that all DynamicThread code gets pulled in even if you ONLY use...

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

diff --git a/tos/lib/tosthreads/system/ThreadC.nc b/tos/lib/tosthreads/system/ThreadC.nc
index 214649cdb1325774f2988022052caf3c18c1800d..7464f2520d2aa7a0ab806db7a60abc5c0338dc70 100644 (file)
--- a/tos/lib/tosthreads/system/ThreadC.nc
+++ b/tos/lib/tosthreads/system/ThreadC.nc
@@ -49,16 +49,17 @@ implementation {
   
   components MainC;
   components new ThreadInfoP(stack_size, THREAD_ID);
-  components ThreadP;
-  components StaticThreadP;
+  components StaticThreadC;
+  components ThreadMapC;
   
   MainC.SoftwareInit -> ThreadInfoP;
-  Thread = ThreadP.StaticThread[THREAD_ID];
-  ThreadNotification = ThreadP.StaticThreadNotification[THREAD_ID];
+  Thread = StaticThreadC.Thread[THREAD_ID];
+  ThreadNotification = StaticThreadC.ThreadNotification[THREAD_ID];
   ThreadInfo = ThreadInfoP;
-  ThreadP.StaticThreadInfo[THREAD_ID] -> ThreadInfoP;
-  ThreadP.StaticThreadFunction[THREAD_ID] -> ThreadInfoP;
-  StaticThreadP.ThreadCleanup[THREAD_ID] -> ThreadP.StaticThreadCleanup[THREAD_ID];
+  
+  StaticThreadC.ThreadFunction[THREAD_ID] -> ThreadInfoP;
+  StaticThreadC.ThreadCleanup[THREAD_ID]  -> ThreadMapC.StaticThreadCleanup[THREAD_ID];
+  StaticThreadC.ThreadInfo[THREAD_ID] -> ThreadInfoP;
   
   components LedsC;
   ThreadInfoP.Leds -> LedsC;