Fixed a bug with the resource transfer

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

diff --git a/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc b/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
index 69b02085a778071443b6d389139480634c2308ea..9d6a059f694f1e8ca77472e1faafd6c3d4627e54 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
@@ -42,7 +42,7 @@ module NoBeaconTransmitP
     interface Init;
     interface MLME_START;
     interface WriteBeaconField as SuperframeSpecWrite;
-    interface Get<bool> as IsSendingBeacons;
+    interface GetNow<bool> as IsSendingBeacons;
     interface GetNow<uint32_t> as CapStart; 
     interface GetNow<ieee154_reftime_t*> as CapStartRefTime; 
     interface GetNow<uint32_t> as CapLen; 
@@ -65,12 +65,14 @@ module NoBeaconTransmitP
     interface Alarm<TSymbolIEEE802154,uint32_t> as BeaconTxAlarm;
     interface Timer<TSymbolIEEE802154> as BeaconPayloadUpdateTimer;
     interface RadioOff;
-    interface Get<bool> as IsBeaconEnabledPAN;
+    interface GetNow<bool> as IsBeaconEnabledPAN;
     interface RadioTx as BeaconTx;
     interface MLME_GET;
     interface MLME_SET;
     interface Resource as Token;
+    interface GetNow<bool> as IsTokenRequested;
     interface ResourceTransfer as TokenToBroadcast;
+    interface ResourceTransferred as TokenTransferred;
     interface FrameTx as RealignmentBeaconEnabledTx;
     interface FrameTx as RealignmentNonBeaconEnabledTx;
     interface FrameRx as BeaconRequestRx;
@@ -114,6 +116,8 @@ implementation
 
   event void Token.granted() { }
 
+  async event void TokenTransferred.transferred() { call Token.release(); }
+
   async event void RadioOff.offDone() { }
 
   async event void BeaconTxAlarm.fired() {}
@@ -173,7 +177,7 @@ implementation
     return frame;
   }
 
-  command bool IsSendingBeacons.get(){ return FALSE;}
+  async command bool IsSendingBeacons.getNow(){ return FALSE;}
 
   async command uint32_t CapStart.getNow() { return 0; }
   async command ieee154_reftime_t* CapStartRefTime.getNow() { return NULL; }