Diag API cleanup.

include/Makefile.am

@@ -47,7 +47,6 @@ PRETTY_SUBDIRS                          = \
     $(NULL)
 
 include_HEADERS                         = \
-    openthread-diag.h                     \
     openthread-icmp6.h                    \
     $(NULL)
 

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                            \

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"