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

[api] rename ChannelMaskPage0 to ChannelMask (#3665)

Browse Source
This commit is contained in:
Zhanglong Xia
2019-03-13 07:49:25 -07:00
committed by Jonathan Hui
parent a99816a225
commit ce24abb7bb
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/drivers/windows/otNodeApi/otNodeApi.cpp
+4 -4
View File
@@ -1992,8 +1992,8 @@ OTNODEAPI int32_t OTCALL otNodeSetActiveDataset(otNode* aNode, uint64_t aTimesta
if (aChannelMask != 0)
{
aDataset.mChannelMaskPage0 = aChannelMask;
aDataset.mComponents.mIsChannelMaskPage0Present = true;
aDataset.mChannelMask = aChannelMask;
aDataset.mComponents.mIsChannelMaskPresent = true;
}
if (aMasterKey != NULL && strlen(aMasterKey) != 0)
@@ -2144,8 +2144,8 @@ OTNODEAPI int32_t OTCALL otNodeSendActiveSet(otNode* aNode, uint64_t aActiveTime
if (aChannelMask != 0)
{
aDataset.mChannelMaskPage0 = aChannelMask;
aDataset.mComponents.mIsChannelMaskPage0Present = true;
aDataset.mChannelMask = aChannelMask;
aDataset.mComponents.mIsChannelMaskPresent = true;
}
if (aExtPanId != NULL && strlen(aExtPanId) != 0)
include/openthread/dataset.h
+4 -4
View File
@@ -152,10 +152,10 @@ enum
};
/**
* This type represents Channel Mask Page 0.
* This type represents Channel Mask.
*
*/
typedef uint32_t otChannelMaskPage0;
typedef uint32_t otChannelMask;
#define OT_CHANNEL_1_MASK (1 << 1) ///< Channel 1
#define OT_CHANNEL_2_MASK (1 << 2) ///< Channel 2
@@ -201,7 +201,7 @@ typedef struct otOperationalDatasetComponents
bool mIsChannelPresent : 1; ///< TRUE if Channel is present, FALSE otherwise.
bool mIsPSKcPresent : 1; ///< TRUE if PSKc is present, FALSE otherwise.
bool mIsSecurityPolicyPresent : 1; ///< TRUE if Security Policy is present, FALSE otherwise.
bool mIsChannelMaskPage0Present : 1; ///< TRUE if Channel Mask Page 0 is present, FALSE otherwise.
bool mIsChannelMaskPresent : 1; ///< TRUE if Channel Mask is present, FALSE otherwise.
} otOperationalDatasetComponents;
/**
@@ -223,7 +223,7 @@ typedef struct otOperationalDataset
uint16_t mChannel; ///< Channel
otPSKc mPSKc; ///< PSKc
otSecurityPolicy mSecurityPolicy; ///< Security Policy
otChannelMaskPage0 mChannelMaskPage0; ///< Channel Mask Page 0
otChannelMask mChannelMask; ///< Channel Mask
otOperationalDatasetComponents mComponents; ///< Specifies which components are set in the Dataset.
} otOperationalDataset;
src/cli/cli_dataset.cpp
+6 -6
View File
@@ -94,9 +94,9 @@ otError Dataset::Print(otOperationalDataset &aDataset)
mInterpreter.mServer->OutputFormat("Channel: %d\r\n", aDataset.mChannel);
}
if (aDataset.mComponents.mIsChannelMaskPage0Present)
if (aDataset.mComponents.mIsChannelMaskPresent)
{
mInterpreter.mServer->OutputFormat("Channel Mask Page 0: %08x\r\n", aDataset.mChannelMaskPage0);
mInterpreter.mServer->OutputFormat("Channel Mask: %08x\r\n", aDataset.mChannelMask);
}
if (aDataset.mComponents.mIsDelayPresent)
@@ -280,8 +280,8 @@ otError Dataset::ProcessChannelMask(int argc, char *argv[])
VerifyOrExit(argc > 0, error = OT_ERROR_INVALID_ARGS);
SuccessOrExit(error = Interpreter::ParseLong(argv[0], value));
sDataset.mChannelMaskPage0 = static_cast<uint32_t>(value);
sDataset.mComponents.mIsChannelMaskPage0Present = true;
sDataset.mChannelMask = static_cast<uint32_t>(value);
sDataset.mComponents.mIsChannelMaskPresent = true;
exit:
return error;
@@ -509,9 +509,9 @@ otError Dataset::ProcessMgmtSetCommand(int argc, char *argv[])
else if (strcmp(argv[index], "channelmask") == 0)
{
VerifyOrExit(++index < argc, error = OT_ERROR_INVALID_ARGS);
dataset.mComponents.mIsChannelMaskPage0Present = true;
dataset.mComponents.mIsChannelMaskPresent = true;
SuccessOrExit(error = Interpreter::ParseLong(argv[index], value));
dataset.mChannelMaskPage0 = static_cast<uint32_t>(value);
dataset.mChannelMask = static_cast<uint32_t>(value);
}
else if (strcmp(argv[index], "binary") == 0)
{
src/core/meshcop/dataset.cpp
+4 -4
View File
@@ -149,8 +149,8 @@ void Dataset::Get(otOperationalDataset &aDataset) const
if ((mask = tlv->GetChannelMask()) != 0)
{
aDataset.mChannelMaskPage0 = mask;
aDataset.mComponents.mIsChannelMaskPage0Present = true;
aDataset.mChannelMask = mask;
aDataset.mComponents.mIsChannelMaskPresent = true;
}
break;
@@ -294,11 +294,11 @@ otError Dataset::Set(const otOperationalDataset &aDataset)
Set(tlv);
}
if (aDataset.mComponents.mIsChannelMaskPage0Present)
if (aDataset.mComponents.mIsChannelMaskPresent)
{
MeshCoP::ChannelMaskTlv tlv;
tlv.Init();
tlv.SetChannelMask(aDataset.mChannelMaskPage0);
tlv.SetChannelMask(aDataset.mChannelMask);
Set(tlv);
}
src/core/meshcop/dataset_manager.cpp
+3 -3
View File
@@ -534,11 +534,11 @@ otError DatasetManager::SendSetRequest(const otOperationalDataset &aDataset, con
SuccessOrExit(error = message->Append(&channel, sizeof(channel)));
}
if (aDataset.mComponents.mIsChannelMaskPage0Present)
if (aDataset.mComponents.mIsChannelMaskPresent)
{
ChannelMaskTlv channelMask;
channelMask.Init();
channelMask.SetChannelMask(aDataset.mChannelMaskPage0);
channelMask.SetChannelMask(aDataset.mChannelMask);
SuccessOrExit(error = message->Append(&channelMask, sizeof(channelMask)));
}
@@ -640,7 +640,7 @@ otError DatasetManager::SendGetRequest(const otOperationalDatasetComponents &aDa
datasetTlvs[length++] = Tlv::kSecurityPolicy;
}
if (aDatasetComponents.mIsChannelMaskPage0Present)
if (aDatasetComponents.mIsChannelMaskPresent)
{
datasetTlvs[length++] = Tlv::kChannelMask;
}
src/ncp/ncp_base_mtd.cpp
+5 -5
View File
@@ -953,11 +953,11 @@ otError NcpBase::EncodeOperationalDataset(const otOperationalDataset &aDataset)
SuccessOrExit(mEncoder.CloseStruct());
}
if (aDataset.mComponents.mIsChannelMaskPage0Present)
if (aDataset.mComponents.mIsChannelMaskPresent)
{
SuccessOrExit(mEncoder.OpenStruct());
SuccessOrExit(mEncoder.WriteUintPacked(SPINEL_PROP_PHY_CHAN_SUPPORTED));
SuccessOrExit(EncodeChannelMask(aDataset.mChannelMaskPage0));
SuccessOrExit(EncodeChannelMask(aDataset.mChannelMask));
SuccessOrExit(mEncoder.CloseStruct());
}
@@ -1162,17 +1162,17 @@ otError NcpBase::DecodeOperationalDataset(otOperationalDataset &aDataset,
{
uint8_t channel;
aDataset.mChannelMaskPage0 = 0;
aDataset.mChannelMask = 0;
while (!mDecoder.IsAllReadInStruct())
{
SuccessOrExit(error = mDecoder.ReadUint8(channel));
VerifyOrExit(channel <= 31, error = OT_ERROR_INVALID_ARGS);
aDataset.mChannelMaskPage0 |= (1UL << channel);
aDataset.mChannelMask |= (1UL << channel);
}
}
aDataset.mComponents.mIsChannelMaskPage0Present = true;
aDataset.mComponents.mIsChannelMaskPresent = true;
break;
case SPINEL_PROP_DATASET_RAW_TLVS: