refactor MAC protocols:

[tinyos-2.x.git] / tos / chips / tda5250 / mac / CsmaMacC.nc

diff --git a/tos/chips/tda5250/mac/CsmaMacC.nc b/tos/chips/tda5250/mac/CsmaMacC.nc
index 7445c712217981a03d136a66eec9607758e34e7e..6413c88d1b0de5a735f00263f8fc88ed56abb73d 100644 (file)
--- a/tos/chips/tda5250/mac/CsmaMacC.nc
+++ b/tos/chips/tda5250/mac/CsmaMacC.nc
@@ -59,7 +59,8 @@ implementation {
       RssiFixedThresholdCMC as Cca,
       new Alarm32khz16C() as Timer,
       new TimerMilliC() as ReRxTimer,
-      McuSleepC,
+      DuplicateC,
+      TimeDiffC,
       RandomLfsrC
 #ifdef MAC_DEBUG
       ,PlatformLedsC
@@ -67,8 +68,6 @@ implementation {
       ;
               
     MainC.SoftwareInit -> CsmaMacP;
-
-    McuSleepC.McuPowerOverride -> CsmaMacP;
     
     SplitControl = CsmaMacP;
     
@@ -99,6 +98,9 @@ implementation {
     CsmaMacP.Timer -> Timer;
 
     CsmaMacP.ReRxTimer -> ReRxTimer;
+
+    CsmaMacP.Duplicate -> DuplicateC;
+    CsmaMacP.TimeDiff16 -> TimeDiffC;
     
 #ifdef MAC_DEBUG
     CsmaMacP.Led0 -> PlatformLedsC.Led0;