NCP API cleanup.

configure.ac

@@ -1080,7 +1080,6 @@ AC_CONFIG_FILES([
 Makefile
 include/Makefile
 include/cli/Makefile
-include/ncp/Makefile
 include/openthread/Makefile
 include/platform/Makefile
 src/Makefile

examples/apps/ncp/main.c

@@ -34,10 +34,11 @@
 
 #include <openthread-core-config.h>
 #include <openthread.h>
+#include "openthread/ncp.h"
+
 #include <openthread-diag.h>
 #include <openthread/tasklet.h>
 #include <common/debug.hpp>
-#include <ncp/ncp.h>
 #include <platform/platform.h>
 
 #ifdef OPENTHREAD_MULTIPLE_INSTANCE

include/Makefile.am

@@ -32,7 +32,6 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
 DIST_SUBDIRS                            = \
     cli                                   \
-    ncp                                   \
     openthread                            \
     platform                              \
     $(NULL)
@@ -41,7 +40,6 @@ DIST_SUBDIRS                            = \
 
 SUBDIRS                                 = \
     cli                                   \
-    ncp                                   \
     openthread                            \
     platform                              \
     $(NULL)
@@ -50,7 +48,6 @@ SUBDIRS                                 = \
 
 PRETTY_SUBDIRS                          = \
     cli                                   \
-    ncp                                   \
     openthread                            \
     platform                              \
     $(NULL)

include/ncp/Makefile.am

@@ -1,40 +0,0 @@
-#
-#  Copyright (c) 2016, The OpenThread Authors.
-#  All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#  3. Neither the name of the copyright holder nor the
-#     names of its contributors may be used to endorse or promote products
-#     derived from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#  POSSIBILITY OF SUCH DAMAGE.
-#
-
-include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
-
-ot_ncp_headers                          = \
-    ncp.h                                 \
-    $(NULL)
-
-ot_ncpdir = $(includedir)/ncp
-dist_ot_ncp_HEADERS = $(ot_ncp_headers)
-
-install-headers: install-includeHEADERS
-
-include $(abs_top_nlbuild_autotools_dir)/automake/post.am

include/openthread/Makefile.am

@@ -41,6 +41,7 @@ openthread_headers                      = \
     joiner.h                              \
     link.h                                \
     message.h                             \
+    ncp.h                                 \
     netdata.h                             \
     tasklet.h                             \
     thread.h                              \

src/ncp/ncp_base.cpp

@@ -39,14 +39,14 @@
 #include <stdlib.h>
 
 #include "openthread/message.h"
+#include "openthread/ncp.h"
 
 #if OPENTHREAD_ENABLE_JAM_DETECTION
 #include "openthread/jam_detection.h"
 #endif
 
 #include <common/code_utils.hpp>
- #include <common/debug.hpp>
-#include <ncp/ncp.h>
+#include <common/debug.hpp>
 #include <ncp/ncp_base.hpp>
 #include <net/ip6.hpp>
 #include <openthread.h>

src/ncp/ncp_base.hpp

@@ -39,11 +39,13 @@
 #include <openthread-config.h>
 #endif
 
+#include "openthread/ncp.h"
+
 #include <openthread-types.h>
 #include "openthread/ip6.h"
 #include "openthread/message.h"
+#include "openthread/ncp.h"
 #include <common/tasklet.hpp>
-#include <ncp/ncp.h>
 #include <ncp/ncp_buffer.hpp>
 
 #include "spinel.h"

src/ncp/ncp_spi.cpp

@@ -30,10 +30,11 @@
  *   This file implements a SPI interface to the OpenThread stack.
  */
 
+#include "openthread/ncp.h"
+
 #include <common/code_utils.hpp>
 #include <common/new.hpp>
 #include <net/ip6.hpp>
-#include <ncp/ncp.h>
 #include <ncp/ncp_spi.hpp>
 #include <platform/spi-slave.h>
 #include <core/openthread-core-config.h>

src/ncp/ncp_uart.cpp

@@ -36,12 +36,12 @@
 #include <openthread-config.h>
 #endif
 
+#include "openthread/ncp.h"
+
 #include <stdio.h>
-#include <ncp/ncp.h>
 #include <common/code_utils.hpp>
 #include <common/new.hpp>
 #include <net/ip6.hpp>
-#include <ncp/ncp.h>
 #include <ncp/ncp_uart.hpp>
 #include <platform/logging.h>
 #include <platform/uart.h>