X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FTKN154P.nc;h=99d3c848d6f05e4bf3e853667215fe6b01393284;hb=dac274225f4101f5dd61d0df8c6647d7f7a4c05f;hp=0f838375d0e23567143b0fe025d4ed0c48d66674;hpb=f50b3e1320b358f1686b7fd440dc125e3c24c327;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/TKN154P.nc b/tos/lib/mac/tkn154/TKN154P.nc
index 0f838375..99d3c848 100644
--- a/tos/lib/mac/tkn154/TKN154P.nc
+++ b/tos/lib/mac/tkn154/TKN154P.nc
@@ -255,6 +255,7 @@ implementation
   BeaconTransmitP.SetMacBeaconTxTime -> PibP.SetMacBeaconTxTime;
   BeaconTransmitP.SetMacPanCoordinator -> PibP.SetMacPanCoordinator;
   BeaconTransmitP.Token -> BeaconTxRadioClient;
+  BeaconTransmitP.IsTokenRequested -> BeaconTxRadioClient;
   BeaconTransmitP.TokenTransferred -> BeaconTxRadioClient;
   BeaconTransmitP.TokenToBroadcast -> BeaconTxRadioClient;
   BeaconTransmitP.RealignmentBeaconEnabledTx -> CoordBroadcastP.RealignmentTx;
@@ -291,6 +292,7 @@ implementation
   BeaconSynchronizeP.IsBeaconEnabledPAN -> PibP.IsBeaconEnabledPAN;
   BeaconSynchronizeP.DataRequest -> PollP.DataRequest[SYNC_CLIENT];
   BeaconSynchronizeP.Token -> SyncRadioClient;
+  BeaconSynchronizeP.IsTokenRequested -> SyncRadioClient;
   BeaconSynchronizeP.TokenTransferred -> SyncRadioClient;
   BeaconSynchronizeP.TokenToCap -> SyncRadioClient;
   BeaconSynchronizeP.TimeCalc -> PibP;
@@ -428,10 +430,9 @@ implementation
   DeviceCap.IndirectTxWaitAlarm = Alarm5;
   DeviceCap.BroadcastAlarm = Alarm6;
   DeviceCap.Token -> DeviceCapRadioClient;
+  DeviceCap.IsTokenRequested -> DeviceCapRadioClient;
   DeviceCap.TokenToCfp -> DeviceCapRadioClient;
   DeviceCap.TokenTransferred -> DeviceCapRadioClient;
-  DeviceCap.TokenRequested -> DeviceCapRadioClient;
-  DeviceCap.IsTokenRequested -> DeviceCapRadioClient;
   DeviceCap.CapStart -> BeaconSynchronizeP.CapStart;
   DeviceCap.CapStartRefTime -> BeaconSynchronizeP.CapStartRefTime;
   DeviceCap.CapLen -> BeaconSynchronizeP.CapLen;
@@ -464,7 +465,6 @@ implementation
   CoordCap.Token -> CoordCapRadioClient;
   CoordCap.TokenToCfp -> CoordCapRadioClient;
   CoordCap.TokenTransferred -> CoordCapRadioClient;
-  CoordCap.TokenRequested -> CoordCapRadioClient;
   CoordCap.IsTokenRequested -> CoordCapRadioClient;
   CoordCap.CapStart -> BeaconTransmitP.CapStart;
   CoordCap.CapStartRefTime -> BeaconTransmitP.CapStartRefTime;
@@ -492,7 +492,6 @@ implementation
 
   components new RadioClientC() as DeviceCfpRadioClient;
   PibP.MacReset -> DeviceCfp;
-  DeviceCfp.Token -> DeviceCfpRadioClient;
   DeviceCfp.TokenTransferred -> DeviceCfpRadioClient;
   DeviceCfp.TokenRequested -> DeviceCfpRadioClient;
   DeviceCfp.TokenToBeaconSync -> DeviceCfpRadioClient;
@@ -515,9 +514,9 @@ implementation
 
   components new RadioClientC() as CoordCfpRadioClient;
   PibP.MacReset -> CoordCfp;
-  CoordCfp.Token -> CoordCfpRadioClient;
   CoordCfp.TokenTransferred -> CoordCfpRadioClient;
   CoordCfp.TokenRequested -> CoordCfpRadioClient;
+  CoordCfp.IsTokenRequested -> CoordCfpRadioClient;
   CoordCfp.TokenToBeaconTransmit -> CoordCfpRadioClient;
   CoordCfp.IsTrackingBeacons -> BeaconSynchronizeP.IsTrackingBeacons;
   CoordCfp.CfpEnd -> BeaconTransmitP.CfpEnd;