Moved a #define

diff --git a/tos/chips/cc2420_tkn154/TKN154_PHY.h b/tos/chips/cc2420_tkn154/TKN154_PHY.h
index 12b69f058d27802d2e2a3d38651e53881247bae3..71d6920a395bd340e5b72cb1271b46fb7768b801 100644 (file)
--- a/tos/chips/cc2420_tkn154/TKN154_PHY.h
+++ b/tos/chips/cc2420_tkn154/TKN154_PHY.h
@@ -51,11 +51,7 @@ enum {
   IEEE154_MIN_LIFS_PERIOD     = 40,
   IEEE154_MIN_SIFS_PERIOD     = 12,
   IEEE154_ACK_WAIT_DURATION   = (20 + 12 + IEEE154_SHR_DURATION + 6 * IEEE154_SYMBOLS_PER_OCTET),
-  // TODO: check BATT_LIFE_EXT
-  IEEE154_BATT_LIFE_EXT_PERIODS      = 1,
-  IEEE154_BATT_LIFE_EXT_PERIOD_TERM3 = 1,
-  IEEE154_TIMESTAMP_SUPPORTED        = TRUE,
-
+  IEEE154_TIMESTAMP_SUPPORTED = TRUE,
 };
 
 #include "Timer62500hz.h"

diff --git a/tos/lib/mac/tkn154/PibP.nc b/tos/lib/mac/tkn154/PibP.nc
index 5520fa5d5d2d5e6673cf88597856fea5bf1e928d..51c41c9061d2de55c7a6e08505083cd7f4be254f 100644 (file)
--- a/tos/lib/mac/tkn154/PibP.nc
+++ b/tos/lib/mac/tkn154/PibP.nc
@@ -112,7 +112,7 @@ implementation
     m_pib.macAssociationPermit = IEEE154_DEFAULT_ASSOCIATIONPERMIT;
     m_pib.macAutoRequest = IEEE154_DEFAULT_AUTOREQUEST;
     m_pib.macBattLifeExt = IEEE154_DEFAULT_BATTLIFEEXT;
-    m_pib.macBattLifeExtPeriods = IEEE154_DEFAULT_MAC_BATT_LIFE_EXT_PERIODS;
+    m_pib.macBattLifeExtPeriods = IEEE154_DEFAULT_BATTLIFEEXTPERIODS;
     m_pib.macBeaconPayloadLength = IEEE154_DEFAULT_BEACONPAYLOADLENGTH;
     m_pib.macBeaconOrder = IEEE154_DEFAULT_BEACONORDER;
     m_pib.macBeaconTxTime = IEEE154_DEFAULT_BEACONTXTIME;