diff --git a/CHANGES.md b/CHANGES.md index f97eebf39..96812a222 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -31,6 +31,7 @@ Applications have a new Attribute to set the IPv4 ToS field. * (core) In `TestSuite` class, deprecated `ALL`, `UNIT`, `SYSTEM`, `EXAMPLE` and `PERFORMANCE`. They have been replaced by `Type::ALL`, `Type::UNIT`, `Type::SYSTEM`, `Type::EXAMPLE` and `Type::PERFORMANCE`, respectively. * (wifi) Deprecated `WIFI_TID_TO_LINK_MAPPING_{NOT_SUPPORTED,SAME_LINK_SET,ANY_LINK_SET}`. They have been replaced by `WifiTidToLinkMappingNegSupport::{NOT_SUPPORTED,SAME_LINK_SET,ANY_LINK_SET}`, respectively. * (wifi) Deprecated `{IDLE, CCA_BUSY, TX, RX, SWITCHING, SLEEP, OFF}`. They have been replaced by `WifiPhyState::{IDLE, CCA_BUSY, TX, RX, SWITCHING, SLEEP, OFF}`, respectively. +* `LrWpanMacPibAttributeIdentifier` attribute ids are now standard compliant. ### Changes to build system diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1c0338a24..09609b4fb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -21,6 +21,7 @@ Release 3-dev ### New user-visible features - (network) !1828 - Added a common helper to create and install applications +- (lr-wpan) !1915 - Use MAC and PHY standard attribute ids ### Bugs fixed diff --git a/src/lr-wpan/model/lr-wpan-mac-base.h b/src/lr-wpan/model/lr-wpan-mac-base.h index 7fe6ac2c0..9dc1d9e79 100644 --- a/src/lr-wpan/model/lr-wpan-mac-base.h +++ b/src/lr-wpan/model/lr-wpan-mac-base.h @@ -248,18 +248,19 @@ struct MlmePollRequestParams /** * \ingroup lr-wpan * - * IEEE802.15.4-2011 MAC PIB Attribute Identifiers Table 52 in section 6.4.2 - * + * IEEE 802.15.4-2006 PHY and MAC PIB Attribute Identifiers Table 23 and Table 86. + * Note: Attribute identifiers use standardized values. */ enum LrWpanMacPibAttributeIdentifier { - macBeaconPayload = 0, - macBeaconPayloadLength = 1, - macShortAddress = 2, - macExtendedAddress = 3, - macPanId = 4, - pCurrentChannel = 100, - pCurrentPage = 101, + pCurrentChannel = 0x00, //!< RF channel used for transmissions and receptions. + pCurrentPage = 0x04, //!< The current channel page. + macBeaconPayload = 0x45, //!< The contents of the beacon payload. + macBeaconPayloadLength = 0x46, //!< The length in octets of the beacon payload. + macExtendedAddress = 3, //!< The extended address of the device (64 bit address) (No compliant). + macPanId = 0x50, //!< The 16-bit identifier of the Personal Area Network (PAN). + macRxOnWhenIdle = 0x52, //!< Indication of whether the MAC is enabled during idle periods. + macShortAddress = 0x53, //!< The short address of the device (16 bit address). unsupported = 255 // TODO: complete other MAC pib attributes };