X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FTKN154P.nc;h=622c6f643ceaf0a8d95385d62982ee3119113f25;hb=adf1de6c009d13b7b52e68535c63b28f59c97400;hp=057ff220f3b80a9be8e79e5c03ffe39e1a10bb1a;hpb=228a941bc357483e1fb939530b8d36903b60e2e7;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/TKN154P.nc b/tos/lib/mac/tkn154/TKN154P.nc
index 057ff220..622c6f64 100644
--- a/tos/lib/mac/tkn154/TKN154P.nc
+++ b/tos/lib/mac/tkn154/TKN154P.nc
@@ -121,27 +121,27 @@ implementation
              RxEnableP,
              IndirectTxP,
              PibP,
-             RadioControlP,
+             FrameDispatchP,
 
 #ifndef IEEE154_BEACON_SYNC_DISABLED
              BeaconSynchronizeP,
-             new CsmaQueueP() as DeviceCapQueue,
-             new CsmaP(INCOMING_SUPERFRAME) as DeviceCap,
+             new CapQueueP() as DeviceCapQueue,
+             new CapP(INCOMING_SUPERFRAME) as DeviceCap,
 #else
              NoBeaconSynchronizeP as BeaconSynchronizeP,
-             new NoCsmaQueueP() as DeviceCapQueue,
-             new NoCsmaP() as DeviceCap,
+             new NoCapQueueP() as DeviceCapQueue,
+             new NoCapP() as DeviceCap,
 #endif
              NoDeviceCfpP as DeviceCfp,
 
 #ifndef IEEE154_BEACON_TX_DISABLED
              BeaconTransmitP,
-             new CsmaQueueP() as CoordCapQueue,
-             new CsmaP(OUTGOING_SUPERFRAME) as CoordCap,
+             new CapQueueP() as CoordCapQueue,
+             new CapP(OUTGOING_SUPERFRAME) as CoordCap,
 #else
              NoBeaconTransmitP as BeaconTransmitP,
-             new NoCsmaQueueP() as CoordCapQueue,
-             new NoCsmaP() as CoordCap,
+             new NoCapQueueP() as CoordCapQueue,
+             new NoCapP() as CoordCap,
 #endif
              NoCoordCfpP as CoordCfp,
 
@@ -369,11 +369,11 @@ implementation
 
   PibP.CapQueueReset -> DeviceCapQueue;
   DeviceCapQueue.Queue -> DeviceCapQueueC;
-  DeviceCapQueue.FrameTxCsma -> DeviceCap;
+  DeviceCapQueue.CapTx -> DeviceCap;
 
   PibP.CapQueueReset -> CoordCapQueue;
   CoordCapQueue.Queue -> CoordCapQueueC;
-  CoordCapQueue.FrameTxCsma -> CoordCap;
+  CoordCapQueue.CapTx -> CoordCap;
   
   components new RadioClientC() as DeviceCapRadioClient;
   PibP.CapReset -> DeviceCap;
@@ -516,12 +516,12 @@ implementation
   PibP.Token -> PibRadioClient;
   PibP.RadioOff -> PibRadioClient;
 
-/* ------------------------- Radio Control ---------------------------- */
+/* ---------------------------- Dispatcher ---------------------------- */
 
-  RadioControlP.PhyTx = RadioTx;
-  RadioControlP.PhyRx = RadioRx;
-  RadioControlP.PhyRadioOff = RadioOff;
-  RadioControlP.RadioPromiscuousMode -> RxEnableP;
-  RadioControlP.Leds = Leds;
-  RadioControlP.Debug = Ieee802154Debug[RADIORXTX_CLIENT];
+  FrameDispatchP.PhyTx = RadioTx;
+  FrameDispatchP.PhyRx = RadioRx;
+  FrameDispatchP.PhyRadioOff = RadioOff;
+  FrameDispatchP.RadioPromiscuousMode -> RxEnableP;
+  FrameDispatchP.Leds = Leds;
+  FrameDispatchP.Debug = Ieee802154Debug[RADIORXTX_CLIENT];
 }