espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-07 03:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix-app] clean up posix app defines (#3611)

Browse Source
This commit is contained in:
Yakun Xu
2019-02-26 13:28:37 -08:00
committed by Jonathan Hui
parent e7acaa8879
commit 127e3bb84e
9 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+11 -3
View File
@@ -75,9 +75,11 @@ LOCAL_CFLAGS := \
-DOPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE=1 \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_PLATFORM_POSIX_APP=1 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
LOCAL_CPPFLAGS := \
-Wno-non-virtual-dtor \
$(NULL)
@@ -268,9 +270,12 @@ LOCAL_CFLAGS := \
-DOPENTHREAD_CONFIG_UART_CLI_RAW=1 \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_POSIX_APP=2 \
-DOPENTHREAD_POSIX_APP_TYPE=2 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
LOCAL_CPPFLAGS := \
-Wno-non-virtual-dtor \
$(NULL)
@@ -316,9 +321,12 @@ LOCAL_CFLAGS := \
-DOPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE=1 \
-DOPENTHREAD_FTD=1 \
-DOPENTHREAD_POSIX=1 \
-DOPENTHREAD_POSIX_APP=1 \
-DOPENTHREAD_POSIX_APP_TYPE=1 \
-DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"openthread-core-posix-config.h\" \
-DSPINEL_PLATFORM_HEADER=\"spinel_platform.h\" \
$(NULL)
LOCAL_CPPFLAGS := \
-Wno-non-virtual-dtor \
$(NULL)
configure.ac
+6 -6
View File
@@ -468,15 +468,15 @@ AC_ARG_ENABLE(posix-app,
[enable_posix_app=no])
if test "$enable_posix_app" = "yes"; then
OPENTHREAD_ENABLE_POSIX_APP=1
OPENTHREAD_PLATFORM_POSIX_APP=1
else
OPENTHREAD_ENABLE_POSIX_APP=0
OPENTHREAD_PLATFORM_POSIX_APP=0
fi
AC_MSG_RESULT(${enable_posix_app})
AC_SUBST(OPENTHREAD_ENABLE_POSIX_APP)
AM_CONDITIONAL([OPENTHREAD_ENABLE_POSIX_APP], [test "${enable_posix_app}" = "yes"])
AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_POSIX_APP], [${OPENTHREAD_ENABLE_POSIX_APP}], [Define to 1 to build posix application.])
AC_SUBST(OPENTHREAD_PLATFORM_POSIX_APP)
AM_CONDITIONAL([OPENTHREAD_PLATFORM_POSIX_APP], [test "${enable_posix_app}" = "yes"])
AC_DEFINE_UNQUOTED([OPENTHREAD_PLATFORM_POSIX_APP], [${OPENTHREAD_PLATFORM_POSIX_APP}], [Define to 1 to build posix application.])
#
# POSIX Daemon
@@ -1846,7 +1846,7 @@ NL_ENABLE_DOCS([auto],[NO])
AM_CONDITIONAL(OPENTHREAD_BUILD_DOCS, [test "${nl_cv_build_docs}" = "yes"])
AM_CONDITIONAL(OPENTHREAD_POSIX, [test "${OPENTHREAD_ENABLE_POSIX_APP}" = "1" -o "${OPENTHREAD_EXAMPLES_POSIX}" = "1"])
AM_CONDITIONAL(OPENTHREAD_POSIX, [test "${OPENTHREAD_PLATFORM_POSIX_APP}" = "1" -o "${OPENTHREAD_EXAMPLES_POSIX}" = "1"])
#
# Checks for libraries and packages.
include/openthread-config-android.h
+1 -1
View File
@@ -97,7 +97,7 @@
#define OPENTHREAD_ENABLE_NCP_VENDOR_HOOK 0
/* Define to 1 to build posix application. */
#define OPENTHREAD_ENABLE_POSIX_APP 1
#define OPENTHREAD_PLATFORM_POSIX_APP 1
/* Define to 1 if you want to enable raw link-layer API */
#define OPENTHREAD_ENABLE_RAW_LINK_API 0
src/Makefile.am
+1 -1
View File
@@ -56,7 +56,7 @@ if OPENTHREAD_ENABLE_DIAG
SUBDIRS += diag
endif
if OPENTHREAD_ENABLE_POSIX_APP
if OPENTHREAD_PLATFORM_POSIX_APP
SUBDIRS += posix
endif
src/posix/Makefile.am
+8 -8
View File
@@ -79,7 +79,7 @@ bin_PROGRAMS = \
if OPENTHREAD_ENABLE_EXECUTABLE
ot_ncp_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
-DOPENTHREAD_POSIX_APP=1 \
-DOPENTHREAD_POSIX_APP_TYPE=1 \
$(NULL)
ot_ncp_SOURCES = \
@@ -128,16 +128,16 @@ ot_ctl_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
$(NULL)
ot_daemon_CPPFLAGS = \
ot_daemon_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
-DOPENTHREAD_POSIX_APP=2 \
-DOPENTHREAD_POSIX_APP_TYPE=2 \
$(NULL)
ot_daemon_SOURCES = \
ot_daemon_SOURCES = \
main.c \
$(NULL)
ot_daemon_LDADD = \
ot_daemon_LDADD = \
$(top_builddir)/src/cli/libopenthread-cli-ftd.a \
$(top_builddir)/src/core/libopenthread-ftd.a \
$(LDADD_COMMON) \
@@ -145,17 +145,17 @@ ot_daemon_LDADD = \
$(LDADD_COMMON) \
$(NULL)
ot_daemon_LDFLAGS = \
ot_daemon_LDFLAGS = \
$(LDFLAGS_COMMON) \
$(NULL)
ot_daemon_LIBTOOLFLAGS = \
ot_daemon_LIBTOOLFLAGS = \
$(LIBTOOLFLAGS_COMMON) \
$(NULL)
ot_cli_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
-DOPENTHREAD_POSIX_APP=2 \
-DOPENTHREAD_POSIX_APP_TYPE=2 \
$(NULL)
ot_cli_SOURCES = \
src/posix/main.c
+9 -9
View File
@@ -40,17 +40,17 @@
#include <sys/prctl.h>
#endif
#define OPENTHREAD_POSIX_APP_NCP 1
#define OPENTHREAD_POSIX_APP_CLI 2
#define OPENTHREAD_POSIX_APP_TYPE_NCP 1
#define OPENTHREAD_POSIX_APP_TYPE_CLI 2
#include <openthread/diag.h>
#include <openthread/tasklet.h>
#if OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_NCP
#if OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_NCP
#include <openthread/ncp.h>
#elif OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_CLI
#elif OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_CLI
#include <openthread/cli.h>
#else
#error "Unknown posix app mode!"
#error "Unknown posix app type!"
#endif
#include <openthread/platform/logging.h>
@@ -86,9 +86,9 @@ int main(int argc, char *argv[])
instance = otSysInit(argc, argv);
#if OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_NCP
#if OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_NCP
otNcpInit(instance);
#elif OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_CLI
#elif OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_CLI
#if OPENTHREAD_ENABLE_PLATFORM_NETIF
otSysInitNetif(instance);
#endif
@@ -142,9 +142,9 @@ void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat
va_list ap;
va_start(ap, aFormat);
#if OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_NCP
#if OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_NCP
otNcpPlatLogv(aLogLevel, aLogRegion, aFormat, ap);
#elif OPENTHREAD_POSIX_APP == OPENTHREAD_POSIX_APP_CLI
#elif OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_CLI
otCliPlatLogv(aLogLevel, aLogRegion, aFormat, ap);
#endif
va_end(ap);
src/posix/platform/Makefile.am
-1
View File
@@ -36,7 +36,6 @@ libopenthread_posix_a_CPPFLAGS = \
-I$(top_srcdir)/src/ncp \
-I$(top_srcdir)/src/posix/platform \
-D_GNU_SOURCE \
-DOPENTHREAD_PLATFORM_POSIX_APP=1 \
$(OPENTHREAD_TARGET_DEFINES) \
$(NULL)
tests/toranj/openthread-core-toranj-config.h
+1 -1
View File
@@ -42,7 +42,7 @@
*/
#if OPENTHREAD_RADIO
#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-RCP-toranj"
#elif OPENTHREAD_ENABLE_POSIX_APP
#elif OPENTHREAD_PLATFORM_POSIX_APP
#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-App-toranj"
#else
#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-toranj"
tests/unit/Makefile.am
+3 -3
View File
@@ -62,9 +62,9 @@ AM_CPPFLAGS += \
$(NULL)
endif
if OPENTHREAD_ENABLE_POSIX_APP
if OPENTHREAD_PLATFORM_POSIX_APP
AM_CPPFLAGS += \
-DOPENTHREAD_ENABLE_POSIX_APP=1 \
-DOPENTHREAD_PLATFORM_POSIX_APP=1 \
-I$(top_srcdir)/src/posix/platform \
$(NULL)
endif
@@ -89,7 +89,7 @@ COMMON_LDADD += \
$(NULL)
endif
if OPENTHREAD_ENABLE_POSIX_APP
if OPENTHREAD_PLATFORM_POSIX_APP
COMMON_LDADD += \
-lutil
$(NULL)