X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Ftda5250%2Fmac%2FCsmaMacC.nc;h=4810c5a5339fe939af016830a7ae6e726f90920b;hb=a17321a72cfe58782f13e2b27afff01fae9b9e39;hp=6413c88d1b0de5a735f00263f8fc88ed56abb73d;hpb=51db927a421fd91ba610a9fdc80790b4c7775e38;p=tinyos-2.x.git diff --git a/tos/chips/tda5250/mac/CsmaMacC.nc b/tos/chips/tda5250/mac/CsmaMacC.nc index 6413c88d..4810c5a5 100644 --- a/tos/chips/tda5250/mac/CsmaMacC.nc +++ b/tos/chips/tda5250/mac/CsmaMacC.nc @@ -53,21 +53,19 @@ configuration CsmaMacC { } } implementation { - components MainC, - Tda5250RadioC, + components Tda5250RadioC, CsmaMacP, RssiFixedThresholdCMC as Cca, new Alarm32khz16C() as Timer, new TimerMilliC() as ReRxTimer, DuplicateC, TimeDiffC, + LocalTimeC, RandomLfsrC #ifdef MAC_DEBUG ,PlatformLedsC #endif ; - - MainC.SoftwareInit -> CsmaMacP; SplitControl = CsmaMacP; @@ -101,12 +99,11 @@ implementation { CsmaMacP.Duplicate -> DuplicateC; CsmaMacP.TimeDiff16 -> TimeDiffC; - -#ifdef MAC_DEBUG - CsmaMacP.Led0 -> PlatformLedsC.Led0; - CsmaMacP.Led1 -> PlatformLedsC.Led1; - CsmaMacP.Led2 -> PlatformLedsC.Led2; - CsmaMacP.Led3 -> PlatformLedsC.Led3; + CsmaMacP.LocalTime32kHz -> LocalTimeC; + +#ifdef MACM_DEBUG + components new SerialDebugC() as SD; + CsmaMacP.SerialDebug -> SD; #endif }