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

Clean up CLI member names. (#1855)

Browse Source
This commit is contained in:
Jonathan Hui
2017-05-31 18:24:59 -07:00
committed by GitHub
parent 6fcab15f2d
commit 3c408bac8e
3 changed files with 281 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+261 -261
View File
File diff suppressed because it is too large Load Diff
src/cli/cli.hpp
+8 -8
View File
@@ -323,7 +323,7 @@ private:
static const struct Command sCommands[];
Server *sServer;
Server *mServer;
#ifdef OTDLL
@@ -333,8 +333,8 @@ private:
struct otCliContext
{
Interpreter *aInterpreter;
otInstance *aInstance;
Interpreter *mInterpreter;
otInstance *mInstance;
};
otCliContext mInstances[MAX_CLI_OT_INSTANCES];
uint8_t mInstancesLength;
@@ -342,12 +342,12 @@ private:
#else
Ip6::MessageInfo sMessageInfo;
Ip6::MessageInfo mMessageInfo;
uint16_t sLength;
uint16_t sCount;
uint32_t sInterval;
Timer sPingTimer;
uint16_t mLength;
uint16_t mCount;
uint32_t mInterval;
Timer mPingTimer;
otNetifAddress mSlaacAddresses[OPENTHREAD_CONFIG_NUM_SLAAC_ADDRESSES];
#if OPENTHREAD_ENABLE_DHCP6_CLIENT
src/cli/cli_instance.cpp
+12 -12
View File
@@ -63,15 +63,15 @@ void Interpreter::CacheInstances()
for (uint8_t i = 0; i < mInstancesLength; i++)
{
mInstances[i].aInterpreter = this;
mInstances[i].aInstance = otInstanceInit(mApiInstance, &aDeviceList->aDevices[i]);
assert(mInstances[i].aInstance);
otSetStateChangedCallback(mInstances[i].aInstance, &Interpreter::s_HandleNetifStateChanged, &mInstances[i]);
mInstances[i].mInterpreter = this;
mInstances[i].mInstance = otInstanceInit(mApiInstance, &aDeviceList->aDevices[i]);
assert(mInstances[i].mInstance);
otSetStateChangedCallback(mInstances[i].mInstance, &Interpreter::s_HandleNetifStateChanged, &mInstances[i]);
}
otFreeMemory(aDeviceList);
if (mInstancesLength > 0) { mInstance = mInstances[0].aInstance; }
if (mInstancesLength > 0) { mInstance = mInstances[0].mInstance; }
}
}
@@ -80,13 +80,13 @@ void Interpreter::CacheInstances()
void Interpreter::ProcessInstanceList(int argc, char *argv[])
{
sServer->OutputFormat("%d instances found:\r\n", mInstancesLength);
mServer->OutputFormat("%d instances found:\r\n", mInstancesLength);
for (uint8_t i = 0; i < mInstancesLength; i++)
{
GUID aDeviceGuid = otGetDeviceGuid(mInstances[i].aInstance);
uint32_t aCompartment = otGetCompartmentId(mInstances[i].aInstance);
sServer->OutputFormat("[%d] " GUID_FORMAT " (Compartment %u)\r\n",
GUID aDeviceGuid = otGetDeviceGuid(mInstances[i].mInstance);
uint32_t aCompartment = otGetCompartmentId(mInstances[i].mInstance);
mServer->OutputFormat("[%d] " GUID_FORMAT " (Compartment %u)\r\n",
i, GUID_ARG(aDeviceGuid), aCompartment);
}
}
@@ -100,13 +100,13 @@ void Interpreter::ProcessInstance(int argc, char *argv[])
{
if (mInstance == NULL)
{
sServer->OutputFormat("No Instance Set\r\n");
mServer->OutputFormat("No Instance Set\r\n");
}
else
{
GUID aDeviceGuid = otGetDeviceGuid(mInstance);
uint32_t aCompartment = otGetCompartmentId(mInstance);
sServer->OutputFormat("[%d] " GUID_FORMAT " (Compartment %u)\r\n",
mServer->OutputFormat("[%d] " GUID_FORMAT " (Compartment %u)\r\n",
mInstanceIndex, GUID_ARG(aDeviceGuid), aCompartment);
}
}
@@ -116,7 +116,7 @@ void Interpreter::ProcessInstance(int argc, char *argv[])
VerifyOrExit(value >= 0 && value < mInstancesLength, error = OT_ERROR_INVALID_ARGS);
mInstanceIndex = (uint8_t)value;
mInstance = mInstances[mInstanceIndex].aInstance;
mInstance = mInstances[mInstanceIndex].mInstance;
}
exit: