X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Fchips%2Ftda5250%2Fmac%2FCsmaMacC.nc;h=4810c5a5339fe939af016830a7ae6e726f90920b;hp=1b2cfba4db52ce624549e6c05e67f2bdba7f370a;hb=a17321a72cfe58782f13e2b27afff01fae9b9e39;hpb=847b2d55b02b069ae22d1f3297bc32fb6aafb924 diff --git a/tos/chips/tda5250/mac/CsmaMacC.nc b/tos/chips/tda5250/mac/CsmaMacC.nc index 1b2cfba4..4810c5a5 100644 --- a/tos/chips/tda5250/mac/CsmaMacC.nc +++ b/tos/chips/tda5250/mac/CsmaMacC.nc @@ -53,8 +53,7 @@ configuration CsmaMacC { } } implementation { - components MainC, - Tda5250RadioC, + components Tda5250RadioC, CsmaMacP, RssiFixedThresholdCMC as Cca, new Alarm32khz16C() as Timer, @@ -67,8 +66,6 @@ implementation { ,PlatformLedsC #endif ; - - MainC.SoftwareInit -> CsmaMacP; SplitControl = CsmaMacP; @@ -104,11 +101,9 @@ implementation { CsmaMacP.TimeDiff16 -> TimeDiffC; CsmaMacP.LocalTime32kHz -> LocalTimeC; -#ifdef MAC_DEBUG - CsmaMacP.Led0 -> PlatformLedsC.Led0; - CsmaMacP.Led1 -> PlatformLedsC.Led1; - CsmaMacP.Led2 -> PlatformLedsC.Led2; - CsmaMacP.Led3 -> PlatformLedsC.Led3; +#ifdef MACM_DEBUG + components new SerialDebugC() as SD; + CsmaMacP.SerialDebug -> SD; #endif }