espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-09 04:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[netdata] use bit manipulation helpers for NetworkDataTlv (#11810)

Browse Source 
This change updates the `NetworkDataTlv` class to use common bit
manipulation helper functions (`ReadBits`, `WriteBits`, `SetBit`,
`GetBit`, `ClearBit`).

This change replaces the manual bit masking and shifting for accessing
the `Type` value and the `Stable` flag with calls to the new helpers.
The member variable `mType` is also renamed to `mTypeAndStableFlag` to
more accurately reflect its contents.
This commit is contained in:
Abtin Keshavarzian
2025-08-20 13:15:03 -07:00
committed by Jonathan Hui
parent c0fd3de68d
commit 3c8049ad65
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/num_utils.hpp
+2 -2
View File
@@ -272,7 +272,7 @@ template <typename UintType> void SetBit(UintType &aBits, uint8_t aBitOffset)
{
static_assert(TypeTraits::IsUint<UintType>::kValue, "UintType must be an unsigned int (8, 16, 32, or 64 bit len)");
aBits = aBits | static_cast<UintType>(static_cast<UintType>(1) << aBitOffset);
aBits |= static_cast<UintType>(static_cast<UintType>(1) << aBitOffset);
}
/**
@@ -288,7 +288,7 @@ template <typename UintType> void ClearBit(UintType &aBits, uint8_t aBitOffset)
{
static_assert(TypeTraits::IsUint<UintType>::kValue, "UintType must be an unsigned int (8, 16, 32, or 64 bit len)");
aBits = aBits & (~(static_cast<UintType>(1) << aBitOffset));
aBits &= (~(static_cast<UintType>(1) << aBitOffset));
}
/**
src/core/thread/network_data_tlvs.hpp
+12 -11
View File
@@ -42,6 +42,7 @@
#include "common/debug.hpp"
#include "common/encoding.hpp"
#include "common/equatable.hpp"
#include "common/num_utils.hpp"
#include "net/ip6_address.hpp"
#include "thread/mle_types.hpp"
#include "thread/network_data_types.hpp"
@@ -130,8 +131,8 @@ public:
*/
void Init(void)
{
mType = 0;
mLength = 0;
mTypeAndStableFlag = 0;
mLength = 0;
}
/**
@@ -139,14 +140,14 @@ public:
*
* @returns The Type value.
*/
Type GetType(void) const { return static_cast<Type>(mType >> kTypeOffset); }
Type GetType(void) const { return static_cast<Type>(ReadBits<uint8_t, kTypeMask>(mTypeAndStableFlag)); }
/**
* Sets the Type value.
*
* @param[in] aType The Type value.
*/
void SetType(Type aType) { mType = (mType & ~kTypeMask) | ((aType << kTypeOffset) & kTypeMask); }
void SetType(Type aType) { WriteBits<uint8_t, kTypeMask>(mTypeAndStableFlag, aType); }
/**
* Returns the Length value.
@@ -221,7 +222,7 @@ public:
/**
* Clears the Stable bit.
*/
void ClearStable(void) { mType &= ~kStableMask; }
void ClearStable(void) { ClearBit<uint8_t>(mTypeAndStableFlag, kStableFlagOffset); }
/**
* Indicates whether or not the Stable bit is set.
@@ -229,12 +230,12 @@ public:
* @retval TRUE If the Stable bit is set.
* @retval FALSE If the Stable bit is not set.
*/
bool IsStable(void) const { return (mType & kStableMask); }
bool IsStable(void) const { return GetBit<uint8_t>(mTypeAndStableFlag, kStableFlagOffset); }
/**
* Sets the Stable bit.
*/
void SetStable(void) { mType |= kStableMask; }
void SetStable(void) { SetBit<uint8_t>(mTypeAndStableFlag, kStableFlagOffset); }
/**
* Searches in a given sequence of TLVs to find the first TLV with a given type.
@@ -359,13 +360,13 @@ public:
}
private:
static constexpr uint8_t kTypeOffset = 1;
static constexpr uint8_t kTypeMask = 0x7f << kTypeOffset;
static constexpr uint8_t kStableMask = 1 << 0;
static constexpr uint8_t kStableFlagOffset = 0;
static constexpr uint8_t kTypeOffset = 1;
static constexpr uint8_t kTypeMask = 0x7f << kTypeOffset;
static bool IsTlvValid(const NetworkDataTlv *aTlv);
uint8_t mType;
uint8_t mTypeAndStableFlag;
uint8_t mLength;
} OT_TOOL_PACKED_END;