From ce24abb7bb4c3e046049189e05323af83c1824a2 Mon Sep 17 00:00:00 2001 From: Zhanglong Xia Date: Wed, 13 Mar 2019 22:49:25 +0800 Subject: [PATCH] [api] rename ChannelMaskPage0 to ChannelMask (#3665) --- examples/drivers/windows/otNodeApi/otNodeApi.cpp | 8 ++++---- include/openthread/dataset.h | 8 ++++---- src/cli/cli_dataset.cpp | 12 ++++++------ src/core/meshcop/dataset.cpp | 8 ++++---- src/core/meshcop/dataset_manager.cpp | 6 +++--- src/ncp/ncp_base_mtd.cpp | 10 +++++----- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/drivers/windows/otNodeApi/otNodeApi.cpp b/examples/drivers/windows/otNodeApi/otNodeApi.cpp index ade600142..84d1b1f27 100644 --- a/examples/drivers/windows/otNodeApi/otNodeApi.cpp +++ b/examples/drivers/windows/otNodeApi/otNodeApi.cpp @@ -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) diff --git a/include/openthread/dataset.h b/include/openthread/dataset.h index 65fd52e91..8598c3a43 100644 --- a/include/openthread/dataset.h +++ b/include/openthread/dataset.h @@ -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; diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp index e5bb8ed84..ab335d775 100644 --- a/src/cli/cli_dataset.cpp +++ b/src/cli/cli_dataset.cpp @@ -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(value); - sDataset.mComponents.mIsChannelMaskPage0Present = true; + sDataset.mChannelMask = static_cast(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(value); + dataset.mChannelMask = static_cast(value); } else if (strcmp(argv[index], "binary") == 0) { diff --git a/src/core/meshcop/dataset.cpp b/src/core/meshcop/dataset.cpp index d58fc3fea..b52a09eef 100644 --- a/src/core/meshcop/dataset.cpp +++ b/src/core/meshcop/dataset.cpp @@ -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); } diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 47f8c625e..79c33642c 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -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; } diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index 6e11261f5..9d5b3515c 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -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: