diff --git a/examples/apps/cli/main.c b/examples/apps/cli/main.c index d9fb87c71..4d20d4d6d 100644 --- a/examples/apps/cli/main.c +++ b/examples/apps/cli/main.c @@ -34,10 +34,10 @@ #include "openthread/openthread.h" #include "openthread/cli.h" +#include "openthread/diag.h" #include "openthread/platform/platform.h" #include -#include #include #ifdef OPENTHREAD_MULTIPLE_INSTANCE @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) otCliUartInit(sInstance); #if OPENTHREAD_ENABLE_DIAG - diagInit(sInstance); + otDiagInit(sInstance); #endif while (1) diff --git a/examples/apps/ncp/main.c b/examples/apps/ncp/main.c index a15416c26..45f04d35b 100644 --- a/examples/apps/ncp/main.c +++ b/examples/apps/ncp/main.c @@ -33,11 +33,11 @@ #endif #include "openthread/openthread.h" +#include "openthread/diag.h" #include "openthread/ncp.h" #include "openthread/platform/platform.h" #include -#include #include #ifdef OPENTHREAD_MULTIPLE_INSTANCE @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) otNcpInit(sInstance); #if OPENTHREAD_ENABLE_DIAG - diagInit(sInstance); + otDiagInit(sInstance); #endif while (1) diff --git a/include/Makefile.am b/include/Makefile.am index d29065558..4783557d6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -47,7 +47,6 @@ PRETTY_SUBDIRS = \ $(NULL) include_HEADERS = \ - openthread-diag.h \ openthread-icmp6.h \ $(NULL) diff --git a/include/openthread/Makefile.am b/include/openthread/Makefile.am index 0453cbdb5..1af8acb5a 100644 --- a/include/openthread/Makefile.am +++ b/include/openthread/Makefile.am @@ -52,6 +52,7 @@ openthread_headers = \ commissioner.h \ crypto.h \ dataset.h \ + diag.h \ dhcp6_client.h \ dhcp6_server.h \ instance.h \ diff --git a/include/openthread-diag.h b/include/openthread/diag.h similarity index 92% rename from include/openthread-diag.h rename to include/openthread/diag.h index 7aefceb5a..82b3ed8ec 100644 --- a/include/openthread-diag.h +++ b/include/openthread/diag.h @@ -41,13 +41,13 @@ extern "C" { #endif -void diagInit(otInstance *aInstance); +void otDiagInit(otInstance *aInstance); -char *diagProcessCmd(int argc, char *argv[]); +char *otDiagProcessCmd(int argc, char *argv[]); -char *diagProcessCmdLine(char *string); +char *otDiagProcessCmdLine(char *string); -bool isDiagEnabled(void); +bool otDiagIsEnabled(void); #ifdef __cplusplus } // extern "C" diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index 0a167b05a..993b9e0a8 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -51,7 +51,7 @@ #ifndef OTDLL #include -#include +#include "openthread/diag.h" #include #include @@ -2719,7 +2719,7 @@ exit: void Interpreter::ProcessDiag(int argc, char *argv[]) { // all diagnostics related features are processed within diagnostics module - sServer->OutputFormat("%s\r\n", diagProcessCmd(argc, argv)); + sServer->OutputFormat("%s\r\n", otDiagProcessCmd(argc, argv)); } #endif @@ -2754,7 +2754,7 @@ void Interpreter::ProcessLine(char *aBuf, uint16_t aBufLength, Server &aServer) cmd = aBuf; #if OPENTHREAD_ENABLE_DIAG - VerifyOrExit((!isDiagEnabled() || (strcmp(cmd, "diag") == 0)), + VerifyOrExit((!otDiagIsEnabled() || (strcmp(cmd, "diag") == 0)), sServer->OutputFormat("under diagnostics mode, execute 'diag stop' before running any other commands.\r\n")); #endif diff --git a/src/diag/openthread-diag.cpp b/src/diag/openthread-diag.cpp index f4cc00b39..37ef8a12d 100644 --- a/src/diag/openthread-diag.cpp +++ b/src/diag/openthread-diag.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include "openthread/diag.h" #include using namespace Thread::Diagnostics; @@ -44,17 +44,17 @@ using namespace Thread::Diagnostics; extern "C" { #endif -void diagInit(otInstance *aInstance) +void otDiagInit(otInstance *aInstance) { Diag::Init(aInstance); } -char *diagProcessCmd(int argc, char *argv[]) +char *otDiagProcessCmd(int argc, char *argv[]) { return Diag::ProcessCmd(argc, argv); } -char *diagProcessCmdLine(char *string) +char *otDiagProcessCmdLine(char *string) { char *argv[8]; int argc = 0; @@ -79,7 +79,7 @@ char *diagProcessCmdLine(char *string) return Diag::ProcessCmd(argc, argv); } -bool isDiagEnabled() +bool otDiagIsEnabled() { return Diag::isEnabled(); } diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index 6f98d7c36..df0909e0e 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -40,6 +40,7 @@ #include "openthread/openthread.h" #include "openthread/ncp.h" +#include "openthread/diag.h" #if OPENTHREAD_ENABLE_JAM_DETECTION #include "openthread/jam_detection.h" @@ -52,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -5455,7 +5455,7 @@ ThreadError NcpBase::SetPropertyHandler_NEST_STREAM_MFG(uint8_t header, spinel_p if ((parsedLength > 0) && (string != NULL)) { // all diagnostics related features are processed within diagnostics module - output = diagProcessCmdLine(string); + output = otDiagProcessCmdLine(string); errorCode = SendPropertyUpdate( header, diff --git a/tests/unit/test_diag.cpp b/tests/unit/test_diag.cpp index 56fa8b005..6d35d1d9e 100644 --- a/tests/unit/test_diag.cpp +++ b/tests/unit/test_diag.cpp @@ -28,8 +28,8 @@ #include "test_util.h" #include -#include +#include "openthread/diag.h" #include "openthread/platform/platform.h" #include "openthread/platform/radio.h" @@ -149,10 +149,10 @@ void TestDiag() PlatformInit(argc, argv); // initialize diagnostics module - diagInit(NULL); + otDiagInit(NULL); // test diagnostics commands - VerifyOrQuit(!isDiagEnabled(), "diagnostics mode shoud be disabled as default\n"); + VerifyOrQuit(!otDiagIsEnabled(), "diagnostics mode shoud be disabled as default\n"); for (unsigned int i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { @@ -161,7 +161,7 @@ void TestDiag() memcpy(string, tests[i].command, strlen(tests[i].command) + 1); - output = diagProcessCmdLine(string); + output = otDiagProcessCmdLine(string); VerifyOrQuit(memcmp(output, tests[i].output, strlen(tests[i].output)) == 0, "Test Diagnostics module failed\r\n"); }