Fixed a bug with the resource transfer

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

diff --git a/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc b/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
index 4cbc46899c272456afc97e91abd322c6f15983d6..0cda4b605558976d5cba939732fe8857f33fd976 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
@@ -51,10 +51,11 @@ module NoDeviceCfpP
     interface FrameTx as CfpTx;
     interface Purge;
   } uses {
-    interface Resource as Token;
     interface ResourceTransferred as TokenTransferred;
     interface ResourceRequested as TokenRequested;
+    interface ResourceTransfer as TokenToBeaconSync;
     interface GetNow<ieee154_reftime_t*> as CapStartRefTime; 
+    interface GetNow<bool> as IsSendingBeacons; 
     interface GetNow<uint32_t> as CfpEnd; 
     interface GetNow<uint8_t*> as GtsField; 
     interface GetNow<uint32_t> as SfSlotDuration; 
@@ -88,23 +89,21 @@ implementation
     return IEEE154_INVALID_HANDLE; 
   } 
 
-  event void TokenTransferred.transferred()
+  async event void TokenTransferred.transferred()
   { 
     // the CFP has started, this component now owns the token -  
-    // because GTS is not implemented we release the token
-    // immediately; the general rule is: as long as a component
-    // owns the token it has exclusive access to the radio
-    call Token.release();
+    // because GTS is not implemented we pass it back to the
+    // BeaconTransmitP component
+    // Note: this component must not use the Resource
+    // interface to release the token!
+    call TokenToBeaconSync.transfer();
   }
 
-  async event void CfpEndAlarm.fired() { }
+  async event void CfpEndAlarm.fired() {}
 
   async event void CfpSlotAlarm.fired() {}
 
-  async event void RadioOff.offDone()
-  {
-    call Token.release();
-  }
+  async event void RadioOff.offDone() {}
 
   async event void RadioTx.loadDone(){}
   async event void RadioTx.transmitDone(ieee154_txframe_t *frame, 
@@ -115,10 +114,10 @@ implementation
 
   async event void TokenRequested.requested()
   {
-    // someone requested access to the radio, you might
-    // consider releasing it...
+    // someone (e.g. SCAN component) requested access to the radio, we 
+    // should pass the token back to BeaconSynchronizeP, which can release it
+    // call TokenToBeaconSync.transfer();
   }
 
   async event void TokenRequested.immediateRequested(){ }
-  event void Token.granted(){ }
 }