updated dummy components

diff --git a/tos/lib/mac/tkn154/dummies/NoBeaconSynchronizeP.nc b/tos/lib/mac/tkn154/dummies/NoBeaconSynchronizeP.nc
index 418c0a9d890c0d59113a49407c90979a953ee2cd..92e8bb4819eefcc1b73cfe5232964911bf306a77 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoBeaconSynchronizeP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoBeaconSynchronizeP.nc
@@ -44,7 +44,7 @@ module NoBeaconSynchronizeP
     interface MLME_SYNC;
     interface MLME_BEACON_NOTIFY;
     interface MLME_SYNC_LOSS;
-    interface Get<bool> as IsTrackingBeacons;
+    interface GetNow<bool> as IsTrackingBeacons;
     interface Get<uint32_t> as GetLastBeaconRxTime;
     interface GetNow<uint32_t> as CapStart;
     interface GetNow<ieee154_reftime_t*> as CapStartRefTime; 
@@ -66,6 +66,7 @@ module NoBeaconSynchronizeP
     interface MLME_GET;
     interface MLME_SET;
     interface FrameUtility;
+    interface Notify<bool> as FindBeacon;
     interface IEEE154BeaconFrame as BeaconFrame;
     interface Alarm<TSymbolIEEE802154,uint32_t> as TrackAlarm;
     interface RadioRx as BeaconRx;
@@ -99,7 +100,7 @@ implementation
 
   event void Token.granted() { }
 
-  async event void TokenTransferred.transferred() { call Token.release(); }
+  event void TokenTransferred.transferred() { call Token.release(); }
 
   async event void TrackAlarm.fired() {}
 
@@ -109,7 +110,7 @@ implementation
 
   async event void RadioOff.offDone() {}
 
-  command bool IsTrackingBeacons.get(){ return FALSE;}
+  async command bool IsTrackingBeacons.getNow(){ return FALSE;}
   command uint32_t GetLastBeaconRxTime.get(){ return 0;}
   async command uint8_t* GtsField.getNow() { return 0; }
   async command uint32_t SfSlotDuration.getNow() { return 0; }
@@ -128,4 +129,5 @@ implementation
   async command uint8_t NumGtsSlots.getNow() { return 0; }
   async command bool IsRxBroadcastPending.getNow() { return FALSE; }
   event message_t* CoordRealignmentRx.received(message_t* frame) {return frame;}
+  event void FindBeacon.notify( bool val ){}
 }

diff --git a/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc b/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
index 50a8cb54e907682d9bb162a408840b68425edeed..69b02085a778071443b6d389139480634c2308ea 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoBeaconTransmitP.nc
@@ -77,7 +77,7 @@ module NoBeaconTransmitP
     interface WriteBeaconField as GtsInfoWrite;
     interface WriteBeaconField as PendingAddrWrite;
     interface FrameUtility;
-    interface Get<bool> as IsTrackingBeacons;
+    interface GetNow<bool> as IsTrackingBeacons;
     interface GetNow<uint32_t> as LastBeaconRxTime;
     interface GetNow<ieee154_reftime_t*> as LastBeaconRxRefTime; 
     interface Ieee802154Debug as Debug;

diff --git a/tos/lib/mac/tkn154/dummies/NoCapP.nc b/tos/lib/mac/tkn154/dummies/NoCapP.nc
index ba4f409a2ff0e83703483f0334db7985abd2c5ae..ef3cff84700c81f498f143f0904e10aab68e1b31 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoCapP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoCapP.nc
@@ -46,6 +46,7 @@ generic module NoCapP()
     interface FrameExtracted as FrameExtracted[uint8_t frameType];
     interface FrameTxNow as BroadcastTx;
     interface Notify<bool> as WasRxEnabled;
+    interface Notify<bool> as FindBeacon;
   }
   uses
   {
@@ -67,6 +68,7 @@ generic module NoCapP()
     interface GetNow<bool> as IsRxEnableActive; 
     interface GetNow<bool> as IsRxBroadcastPending; 
     interface Notify<bool> as RxEnableStateChange;
+    interface GetNow<bool> as IsTrackingBeacons;
     interface FrameUtility;
     interface RadioTx;
     interface RadioRx;
@@ -88,7 +90,7 @@ implementation
     return SUCCESS;
   }
 
-  async event void TokenTransferred.transferred()
+  event void TokenTransferred.transferred()
   {
     call TokenToCfp.transfer();
   }
@@ -120,4 +122,6 @@ implementation
   event void Token.granted(){}
   command error_t WasRxEnabled.enable(){return FAIL;}
   command error_t WasRxEnabled.disable(){return FAIL;}
+  command error_t FindBeacon.enable(){return FAIL;}
+  command error_t FindBeacon.disable(){return FAIL;}
 }

diff --git a/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc b/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
index 145df15fb1797c06aa4c02a76a2eec6a41ad8a6d..f805fa1aa1298c71e25ff35eaaaf6da0ea4ab9a9 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoCoordCfpP.nc
@@ -89,7 +89,7 @@ implementation
     return IEEE154_INVALID_HANDLE; 
   } 
 
-  async event void TokenTransferred.transferred()
+  event void TokenTransferred.transferred()
   {
     // the CFP has started, this component now owns the token -  
     // because GTS is not implemented we release the token

diff --git a/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc b/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
index f8761ad3879485097268636d033bf1c08cf2e487..4cbc46899c272456afc97e91abd322c6f15983d6 100644 (file)
--- a/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
+++ b/tos/lib/mac/tkn154/dummies/NoDeviceCfpP.nc
@@ -88,7 +88,7 @@ implementation
     return IEEE154_INVALID_HANDLE; 
   } 
 
-  async event void TokenTransferred.transferred()
+  event void TokenTransferred.transferred()
   { 
     // the CFP has started, this component now owns the token -  
     // because GTS is not implemented we release the token