Ncp: Change the constant flag names for thread mode in ncp_base. (#523)

This commit is contained in:
Abtin Keshavarzian
2016-09-06 11:59:00 -07:00
committed by Jonathan Hui
parent a7ed23c16c
commit 4bd1deae26
+12 -12
View File
@@ -52,10 +52,10 @@ static NcpBase *sNcpContext = NULL;
enum enum
{ {
kThreadModeTLV_Receiver = (1 << 3), kThreadMode_RxOnWhenIdle = (1 << 3),
kThreadModeTLV_Secure = (1 << 2), kThreadMode_SecureDataRequest = (1 << 2),
kThreadModeTLV_DeviceType = (1 << 1), kThreadMode_FullFunctionDevice = (1 << 1),
kThreadModeTLV_NetworkData = (1 << 0), kThreadMode_FullNetworkData = (1 << 0),
}; };
#define RSSI_OVERRIDE_DISABLED 127 // Used for PROP_MAC_WHITELIST #define RSSI_OVERRIDE_DISABLED 127 // Used for PROP_MAC_WHITELIST
@@ -2347,22 +2347,22 @@ ThreadError NcpBase::GetPropertyHandler_THREAD_MODE(uint8_t header, spinel_prop_
if (mode_config.mRxOnWhenIdle) if (mode_config.mRxOnWhenIdle)
{ {
numeric_mode |= kThreadModeTLV_Receiver; numeric_mode |= kThreadMode_RxOnWhenIdle;
} }
if (mode_config.mSecureDataRequests) if (mode_config.mSecureDataRequests)
{ {
numeric_mode |= kThreadModeTLV_Secure; numeric_mode |= kThreadMode_SecureDataRequest;
} }
if (mode_config.mDeviceType) if (mode_config.mDeviceType)
{ {
numeric_mode |= kThreadModeTLV_DeviceType; numeric_mode |= kThreadMode_FullFunctionDevice;
} }
if (mode_config.mNetworkData) if (mode_config.mNetworkData)
{ {
numeric_mode |= kThreadModeTLV_NetworkData; numeric_mode |= kThreadMode_FullNetworkData;
} }
return SendPropertyUpdate( return SendPropertyUpdate(
@@ -3600,10 +3600,10 @@ ThreadError NcpBase::SetPropertyHandler_THREAD_MODE(uint8_t header, spinel_prop_
if (parsedLength > 0) if (parsedLength > 0)
{ {
mode_config.mRxOnWhenIdle = ((numeric_mode & kThreadModeTLV_Receiver) == kThreadModeTLV_Receiver); mode_config.mRxOnWhenIdle = ((numeric_mode & kThreadMode_RxOnWhenIdle) == kThreadMode_RxOnWhenIdle);
mode_config.mSecureDataRequests = ((numeric_mode & kThreadModeTLV_Secure) == kThreadModeTLV_Secure); mode_config.mSecureDataRequests = ((numeric_mode & kThreadMode_SecureDataRequest) == kThreadMode_SecureDataRequest);
mode_config.mDeviceType = ((numeric_mode & kThreadModeTLV_DeviceType) == kThreadModeTLV_DeviceType); mode_config.mDeviceType = ((numeric_mode & kThreadMode_FullFunctionDevice) == kThreadMode_FullFunctionDevice);
mode_config.mNetworkData = ((numeric_mode & kThreadModeTLV_NetworkData) == kThreadModeTLV_NetworkData); mode_config.mNetworkData = ((numeric_mode & kThreadMode_FullNetworkData) == kThreadMode_FullNetworkData);
errorCode = otSetLinkMode(mode_config); errorCode = otSetLinkMode(mode_config);