+ modified radio driver (PHY) interfaces: CSMA-CA algorithm is now pushed to radio...

[tinyos-2.x.git] / tos / platforms / telosb / mac / tkn154 / Ieee802154MacC.nc

diff --git a/tos/platforms/telosb/mac/tkn154/Ieee802154MacC.nc b/tos/platforms/telosb/mac/tkn154/Ieee802154MacC.nc
index 3b7cf7959e0d0f5f78a963300c7c1811c181ebc7..950db2f09e70da1a297c74334388eafbae7f51c4 100644 (file)
--- a/tos/platforms/telosb/mac/tkn154/Ieee802154MacC.nc
+++ b/tos/platforms/telosb/mac/tkn154/Ieee802154MacC.nc
@@ -95,8 +95,9 @@ implementation
   Packet = MAC;
 
   components CC2420TKN154C as PHY,
-             new Alarm62500hz32VirtualizedC() as PHYAlarm1,
+             new Alarm62500hz32C() as PHYAlarm1,
              new Alarm62500hz32VirtualizedC() as PHYAlarm2,
+             new Alarm62500hz32C() as TKN154TimingPAlarm,
              LocalTime62500hzC, TKN154TimingP;
 
   // wire PHY to the PIB
@@ -117,7 +118,8 @@ implementation
   PHY.TimeCalc -> MAC;
   PHY.Leds -> LedsC;
   TKN154TimingP.TimeCalc -> MAC;
-  TKN154TimingP.LocalTime -> LocalTime62500hzC;
+  TKN154TimingP.Leds -> LedsC;
+  TKN154TimingP.SymbolAlarm -> TKN154TimingPAlarm;
 
   components new Alarm62500hz32VirtualizedC() as  MACAlarm1,
              new Alarm62500hz32VirtualizedC() as  MACAlarm2,
@@ -164,7 +166,12 @@ implementation
   components RandomC, LedsC, NoLedsC;
   MAC.Random -> RandomC;
   MAC.Leds -> LedsC;
+  PHY.Random -> RandomC;
 
-  components NoDebugP;
-  MAC.Ieee802154Debug -> NoDebugP;
+#ifdef TKN154_SERIAL_DEBUG
+  components SerialDebugC as Debug;
+#else
+  components NoDebugP as Debug;
+#endif
+  MAC.Ieee802154Debug -> Debug;
 }