removed bug that could stop the MAC from operating. Lesson re-learned:

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

diff --git a/tos/chips/tda5250/mac/RedMacC.nc b/tos/chips/tda5250/mac/RedMacC.nc
index f3beede09938aec5b3d34a213d0097b533b68058..227372fe1d8e456e825543708f01d7d2b8229e83 100644 (file)
--- a/tos/chips/tda5250/mac/RedMacC.nc
+++ b/tos/chips/tda5250/mac/RedMacC.nc
@@ -33,6 +33,7 @@
  * ========================================================================
  */
 
+// #define REDMAC_DEBUG
 
 configuration RedMacC {
   provides {
@@ -57,11 +58,10 @@ implementation {
     components  MainC,
         RedMacP,
         RssiFixedThresholdCMC as Cca,
-        new Alarm32khzC() as Timer,
-        new Alarm32khzC() as SampleTimer,
+        new Alarm32khz16C() as Timer,
+        new Alarm32khz16C() as SampleTimer,
         RandomLfsrC,
-        McuSleepC,
-        Counter32khzC;
+        Counter32khz16C as Counter;
     
     components ActiveMessageAddressC;
     RedMacP.amAddress -> ActiveMessageAddressC;
@@ -69,7 +69,6 @@ implementation {
     MainC.SoftwareInit -> RedMacP;
               
     SplitControl = RedMacP;
-    McuSleepC.McuPowerOverride -> RedMacP;
     MacSend = RedMacP;
     MacReceive = RedMacP;
     Tda5250Control = RedMacP;
@@ -95,7 +94,7 @@ implementation {
 
     RedMacP.Timer -> Timer;
     RedMacP.SampleTimer -> SampleTimer;
-    RedMacP.Counter32khz16 -> Counter32khzC.Counter32khz16;
+    RedMacP.Counter32khz16 -> Counter;
 /*    
     components PlatformLedsC;
     RedMacP.Led0 -> PlatformLedsC.Led0;
@@ -103,5 +102,9 @@ implementation {
     RedMacP.Led2 -> PlatformLedsC.Led2;
     RedMacP.Led3 -> PlatformLedsC.Led3;
 */
+#ifdef REDMAC_DEBUG
+    components new SerialDebugC() as SD;
+    RedMacP.SerialDebug -> SD;
+#endif
 }