mirror of
https://github.com/espressif/openthread.git
synced 2026-08-18 16:39:52 +00:00
CLI API cleanup.
This commit is contained in:
Jonathan Hui
@@ -1079,7 +1079,6 @@ NL_RESTORE_WERROR
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
include/Makefile
|
||||
include/cli/Makefile
|
||||
include/openthread/Makefile
|
||||
include/platform/Makefile
|
||||
src/Makefile
|
||||
|
||||
@@ -32,11 +32,12 @@
|
||||
#include <openthread-config.h>
|
||||
#endif
|
||||
|
||||
#include "openthread/cli.h"
|
||||
|
||||
#include <openthread-core-config.h>
|
||||
#include <openthread.h>
|
||||
#include <openthread-diag.h>
|
||||
#include <openthread/tasklet.h>
|
||||
#include <cli/cli-uart.h>
|
||||
#include <platform/platform.h>
|
||||
#include <assert.h>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include <openthread.h>
|
||||
#include <cli/cli-uart.h>
|
||||
#include <openthread/cli.h>
|
||||
#include <platform/uart.h>
|
||||
|
||||
bool skipNextLine = false;
|
||||
@@ -82,4 +82,4 @@ EXTERN_C ThreadError otPlatUartSend(const uint8_t *aBuf, uint16_t aBufLength)
|
||||
otPlatUartSendDone();
|
||||
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,6 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
|
||||
# Always package (e.g. for 'make dist') these subdirectories.
|
||||
|
||||
DIST_SUBDIRS = \
|
||||
cli \
|
||||
openthread \
|
||||
platform \
|
||||
$(NULL)
|
||||
@@ -39,7 +38,6 @@ DIST_SUBDIRS = \
|
||||
# Always build (e.g. for 'make all') these subdirectories.
|
||||
|
||||
SUBDIRS = \
|
||||
cli \
|
||||
openthread \
|
||||
platform \
|
||||
$(NULL)
|
||||
@@ -47,7 +45,6 @@ SUBDIRS = \
|
||||
# Always pretty (e.g. for 'make pretty') these subdirectories.
|
||||
|
||||
PRETTY_SUBDIRS = \
|
||||
cli \
|
||||
openthread \
|
||||
platform \
|
||||
$(NULL)
|
||||
|
||||
@@ -1,41 +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_cli_headers = \
|
||||
cli-console.h \
|
||||
cli-uart.h \
|
||||
$(NULL)
|
||||
|
||||
ot_clidir = $(includedir)/cli
|
||||
dist_ot_cli_HEADERS = $(ot_cli_headers)
|
||||
|
||||
install-headers: install-includeHEADERS
|
||||
|
||||
include $(abs_top_nlbuild_autotools_dir)/automake/post.am
|
||||
@@ -1,57 +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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* @brief
|
||||
* This file defines the top-level functions for the OpenThread CLI server.
|
||||
*/
|
||||
|
||||
#ifndef CLI_UART_H_
|
||||
#define CLI_UART_H_
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <openthread-types.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Initialize the CLI UART module.
|
||||
*
|
||||
* @param[in] aInstance The OpenThread instance structure.
|
||||
*
|
||||
*/
|
||||
void otCliUartInit(otInstance *aInstance);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -29,6 +29,7 @@
|
||||
include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
|
||||
|
||||
openthread_headers = \
|
||||
cli.h \
|
||||
coap.h \
|
||||
commissioner.h \
|
||||
crypto.h \
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
* This file defines the top-level functions for the OpenThread CLI server.
|
||||
*/
|
||||
|
||||
#ifndef CLI_CONSOLE_H_
|
||||
#define CLI_CONSOLE_H_
|
||||
#ifndef CLI_H_
|
||||
#define CLI_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -75,6 +75,14 @@ void otCliConsoleInit(otInstance *aInstance, otCliConsoleOutputCallback aCallbac
|
||||
*/
|
||||
void otCliConsoleInputLine(char *aBuf, uint16_t aBufLength);
|
||||
|
||||
/**
|
||||
* Initialize the CLI UART module.
|
||||
*
|
||||
* @param[in] aInstance The OpenThread instance structure.
|
||||
*
|
||||
*/
|
||||
void otCliUartInit(otInstance *aInstance);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
@@ -35,8 +35,9 @@
|
||||
#define CLI_CONSOLE_HPP_
|
||||
|
||||
#include <openthread-types.h>
|
||||
#include "openthread/cli.h"
|
||||
|
||||
#include <cli/cli_server.hpp>
|
||||
#include <cli/cli-console.h>
|
||||
|
||||
namespace Thread {
|
||||
namespace Cli {
|
||||
|
||||
@@ -36,8 +36,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "openthread/cli.h"
|
||||
|
||||
#include <cli/cli.hpp>
|
||||
#include <cli/cli-uart.h>
|
||||
#include <cli/cli_uart.hpp>
|
||||
#include <common/code_utils.hpp>
|
||||
#include <common/encoding.hpp>
|
||||
|
||||
Reference in New Issue
Block a user