- changed component names

[tinyos-2.x.git] / tos / lib / mac / tkn154 / TKN154P.nc

diff --git a/tos/lib/mac/tkn154/TKN154P.nc b/tos/lib/mac/tkn154/TKN154P.nc
index 31f16599db3535ddbf16175d1f0d7f3f8bcb7e1f..057ff220f3b80a9be8e79e5c03ffe39e1a10bb1a 100644 (file)
--- a/tos/lib/mac/tkn154/TKN154P.nc
+++ b/tos/lib/mac/tkn154/TKN154P.nc
@@ -121,27 +121,27 @@ implementation
              RxEnableP,
              IndirectTxP,
              PibP,
-             FrameDispatchP,
+             RadioControlP,
 
 #ifndef IEEE154_BEACON_SYNC_DISABLED
              BeaconSynchronizeP,
-             new CapQueueP() as DeviceCapQueue,
-             new CapP(INCOMING_SUPERFRAME) as DeviceCap,
+             new CsmaQueueP() as DeviceCapQueue,
+             new CsmaP(INCOMING_SUPERFRAME) as DeviceCap,
 #else
              NoBeaconSynchronizeP as BeaconSynchronizeP,
-             new NoCapQueueP() as DeviceCapQueue,
-             new NoCapP() as DeviceCap,
+             new NoCsmaQueueP() as DeviceCapQueue,
+             new NoCsmaP() as DeviceCap,
 #endif
              NoDeviceCfpP as DeviceCfp,
 
 #ifndef IEEE154_BEACON_TX_DISABLED
              BeaconTransmitP,
-             new CapQueueP() as CoordCapQueue,
-             new CapP(OUTGOING_SUPERFRAME) as CoordCap,
+             new CsmaQueueP() as CoordCapQueue,
+             new CsmaP(OUTGOING_SUPERFRAME) as CoordCap,
 #else
              NoBeaconTransmitP as BeaconTransmitP,
-             new NoCapQueueP() as CoordCapQueue,
-             new NoCapP() as CoordCap,
+             new NoCsmaQueueP() as CoordCapQueue,
+             new NoCsmaP() as CoordCap,
 #endif
              NoCoordCfpP as CoordCfp,
 
@@ -248,6 +248,8 @@ implementation
   BeaconSynchronizeP.MLME_GET -> PibP;
   BeaconSynchronizeP.TrackAlarm = Alarm2;
   BeaconSynchronizeP.FrameUtility -> PibP;
+  BeaconSynchronizeP.FindBeacon -> DeviceCap.FindBeacon;
+  BeaconSynchronizeP.FindBeacon -> CoordCap.FindBeacon;
   BeaconSynchronizeP.Frame -> PibP;
   BeaconSynchronizeP.BeaconFrame -> PibP;
   BeaconSynchronizeP.BeaconRx -> SyncRadioClient;
@@ -280,7 +282,6 @@ implementation
     CoordCap.FrameRx[FC1_FRAMETYPE_CMD + CMD_FRAME_DISASSOCIATION_NOTIFICATION];
   AssociateP.DataRequest -> PollP.DataRequest[ASSOCIATE_CLIENT];
   AssociateP.ResponseTimeout = Timer3;
-  AssociateP.IsTrackingBeacons -> BeaconSynchronizeP.IsTrackingBeacons;
   AssociateP.TxFramePool -> TxFramePoolP;
   AssociateP.TxControlPool -> TxControlPoolP;
   AssociateP.MLME_GET -> PibP;
@@ -368,11 +369,11 @@ implementation
 
   PibP.CapQueueReset -> DeviceCapQueue;
   DeviceCapQueue.Queue -> DeviceCapQueueC;
-  DeviceCapQueue.CapTx -> DeviceCap;
+  DeviceCapQueue.FrameTxCsma -> DeviceCap;
 
   PibP.CapQueueReset -> CoordCapQueue;
   CoordCapQueue.Queue -> CoordCapQueueC;
-  CoordCapQueue.CapTx -> CoordCap;
+  CoordCapQueue.FrameTxCsma -> CoordCap;
   
   components new RadioClientC() as DeviceCapRadioClient;
   PibP.CapReset -> DeviceCap;
@@ -394,6 +395,7 @@ implementation
   DeviceCap.IsRxBroadcastPending -> BeaconSynchronizeP.IsRxBroadcastPending;
   DeviceCap.IsRxEnableActive -> RxEnableP.IsRxEnableActive;
   DeviceCap.RxEnableStateChange -> RxEnableP.RxEnableStateChange;  
+  DeviceCap.IsTrackingBeacons -> BeaconSynchronizeP.IsTrackingBeacons;  
   DeviceCap.FrameUtility -> PibP;
   DeviceCap.RadioTx -> DeviceCapRadioClient;
   DeviceCap.RadioRx -> DeviceCapRadioClient;
@@ -426,6 +428,7 @@ implementation
   CoordCap.BLELen -> BeaconTransmitP.BLELen;
   CoordCap.IsRxEnableActive -> RxEnableP.IsRxEnableActive;
   CoordCap.RxEnableStateChange -> RxEnableP.RxEnableStateChange;  
+  CoordCap.IsTrackingBeacons -> BeaconSynchronizeP.IsTrackingBeacons;  
   CoordCap.FrameUtility -> PibP;
   CoordCap.RadioTx -> CoordCapRadioClient;
   CoordCap.RadioRx -> CoordCapRadioClient;
@@ -496,8 +499,8 @@ implementation
   RxEnableP.TimeCalc -> PibP.TimeCalc;
   RxEnableP.RadioOff -> RxEnableRadioClient;
   RxEnableP.RadioPromiscuousMode = RadioPromiscuousMode;
-  RxEnableP.WasRxEnabled -> DeviceCap;
-  RxEnableP.WasRxEnabled -> CoordCap;
+  RxEnableP.WasRxEnabled -> DeviceCap.WasRxEnabled;
+  RxEnableP.WasRxEnabled -> CoordCap.WasRxEnabled;
   RxEnableP.RxEnableTimer = Timer5;
   RxEnableP.Debug = Ieee802154Debug[RXENABLE_CLIENT];
 
@@ -513,12 +516,12 @@ implementation
   PibP.Token -> PibRadioClient;
   PibP.RadioOff -> PibRadioClient;
 
-/* ---------------------------- Dispatcher ---------------------------- */
+/* ------------------------- Radio Control ---------------------------- */
 
-  FrameDispatchP.PhyTx = RadioTx;
-  FrameDispatchP.PhyRx = RadioRx;
-  FrameDispatchP.PhyRadioOff = RadioOff;
-  FrameDispatchP.RadioPromiscuousMode -> RxEnableP;
-  FrameDispatchP.Leds = Leds;
-  FrameDispatchP.Debug = Ieee802154Debug[RADIORXTX_CLIENT];
+  RadioControlP.PhyTx = RadioTx;
+  RadioControlP.PhyRx = RadioRx;
+  RadioControlP.PhyRadioOff = RadioOff;
+  RadioControlP.RadioPromiscuousMode -> RxEnableP;
+  RadioControlP.Leds = Leds;
+  RadioControlP.Debug = Ieee802154Debug[RADIORXTX_CLIENT];
 }