+ fixed an issue with shadowing some CC2420 files

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

diff --git a/tos/lib/mac/tkn154/RxEnableP.nc b/tos/lib/mac/tkn154/RxEnableP.nc
index 7d5df58c691a5ce41ab20c297d3bd76d443b69db..6835bed8ae845b454253e3b6717c2967f086edde 100644 (file)
--- a/tos/lib/mac/tkn154/RxEnableP.nc
+++ b/tos/lib/mac/tkn154/RxEnableP.nc
@@ -57,7 +57,7 @@ module RxEnableP
     interface Timer<TSymbolIEEE802154> as RxEnableTimer;
     interface Get<bool> as IsBeaconEnabledPAN;
     interface Get<ieee154_macPanCoordinator_t> as IsMacPanCoordinator;
-    interface Get<bool> as IsTrackingBeacons;
+    interface GetNow<bool> as IsTrackingBeacons;
     interface GetNow<uint32_t> as IncomingSfStart; 
     interface GetNow<uint32_t> as IncomingBeaconInterval; 
     interface Get<bool> as IsSendingBeacons;
@@ -116,7 +116,7 @@ implementation
         // for OUTGOING SUPERFRAME
         lastBeaconTime = call OutgoingSfStart.getNow();
         beaconInterval = call OutgoingBeaconInterval.getNow();
-      } else if (call IsTrackingBeacons.get()){
+      } else if (call IsTrackingBeacons.getNow()){
         // for INCOMING SUPERFRAME 
         lastBeaconTime = call IncomingSfStart.getNow();
         beaconInterval = call IncomingBeaconInterval.getNow();