+ fixed an issue with shadowing some CC2420 files

[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..622c6f643ceaf0a8d95385d62982ee3119113f25 100644 (file)
--- a/tos/lib/mac/tkn154/TKN154P.nc
+++ b/tos/lib/mac/tkn154/TKN154P.nc
@@ -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;
@@ -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];