+ fixed an issue with shadowing some CC2420 files

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

diff --git a/tos/lib/mac/tkn154/BeaconTransmitP.nc b/tos/lib/mac/tkn154/BeaconTransmitP.nc
index d3034e142049992aff6e103c2e0b72e5c0e2292b..b32608dc416c71c29c93640b75415dc59dd375fe 100644 (file)
--- a/tos/lib/mac/tkn154/BeaconTransmitP.nc
+++ b/tos/lib/mac/tkn154/BeaconTransmitP.nc
@@ -77,7 +77,7 @@ module BeaconTransmitP
     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;
@@ -222,7 +222,7 @@ implementation
         !(IEEE154_SUPPORTED_CHANNELS & ((uint32_t) 1 << logicalChannel)) ||
         (superframeOrder > beaconOrder))
       status =  IEEE154_INVALID_PARAMETER;
-    else if (startTime && !call IsTrackingBeacons.get())
+    else if (startTime && !call IsTrackingBeacons.getNow())
       status = IEEE154_TRACKING_OFF;
     else if (startTime && 0xFF000000)
       status = IEEE154_INVALID_PARAMETER;