X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Ftda5250%2Fmac%2FCsmaMacC.nc;h=4810c5a5339fe939af016830a7ae6e726f90920b;hb=a17321a72cfe58782f13e2b27afff01fae9b9e39;hp=7445c712217981a03d136a66eec9607758e34e7e;hpb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;p=tinyos-2.x.git

diff --git a/tos/chips/tda5250/mac/CsmaMacC.nc b/tos/chips/tda5250/mac/CsmaMacC.nc
index 7445c712..4810c5a5 100644
--- a/tos/chips/tda5250/mac/CsmaMacC.nc
+++ b/tos/chips/tda5250/mac/CsmaMacC.nc
@@ -53,22 +53,19 @@ configuration CsmaMacC {
   }
 }
 implementation {
-  components  MainC,
-      Tda5250RadioC,    
+  components  Tda5250RadioC,    
       CsmaMacP,
       RssiFixedThresholdCMC as Cca,
       new Alarm32khz16C() as Timer,
       new TimerMilliC() as ReRxTimer,
-      McuSleepC,
+      DuplicateC,
+      TimeDiffC,
+      LocalTimeC,
       RandomLfsrC
 #ifdef MAC_DEBUG
       ,PlatformLedsC
 #endif
       ;
-              
-    MainC.SoftwareInit -> CsmaMacP;
-
-    McuSleepC.McuPowerOverride -> CsmaMacP;
     
     SplitControl = CsmaMacP;
     
@@ -99,12 +96,14 @@ implementation {
     CsmaMacP.Timer -> Timer;
 
     CsmaMacP.ReRxTimer -> ReRxTimer;
-    
-#ifdef MAC_DEBUG
-    CsmaMacP.Led0 -> PlatformLedsC.Led0;
-    CsmaMacP.Led1 -> PlatformLedsC.Led1;
-    CsmaMacP.Led2 -> PlatformLedsC.Led2;
-    CsmaMacP.Led3 -> PlatformLedsC.Led3;
+
+    CsmaMacP.Duplicate -> DuplicateC;
+    CsmaMacP.TimeDiff16 -> TimeDiffC;
+    CsmaMacP.LocalTime32kHz -> LocalTimeC;
+
+#ifdef MACM_DEBUG
+    components new SerialDebugC() as SD;
+    CsmaMacP.SerialDebug -> SD;
 #endif    
 }