diff --git a/.travis.yml b/.travis.yml index 914dd1834..c1015aee5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,27 +53,27 @@ jobs: os: linux compiler: gcc script: .travis/script.sh - - env: BUILD_TARGET="posix-app-cli" VERBOSE=1 VIRTUAL_TIME=1 + - env: BUILD_TARGET="posix-cli" VERBOSE=1 VIRTUAL_TIME=1 os: linux compiler: gcc script: .travis/script.sh - - env: BUILD_TARGET="posix-app-ncp" VERBOSE=1 VIRTUAL_TIME=1 + - env: BUILD_TARGET="posix-ncp" VERBOSE=1 VIRTUAL_TIME=1 os: linux compiler: gcc script: .travis/script.sh - - env: BUILD_TARGET="posix-app-pty" VERBOSE=1 COVERAGE=1 + - env: BUILD_TARGET="posix-pty" VERBOSE=1 COVERAGE=1 os: linux compiler: clang script: .travis/script.sh - - env: BUILD_TARGET="posix-app-pty" DAEMON=1 VERBOSE=1 COVERAGE=1 + - env: BUILD_TARGET="posix-pty" DAEMON=1 VERBOSE=1 COVERAGE=1 os: linux compiler: gcc script: .travis/script.sh - - env: BUILD_TARGET="posix-app-migrate" VERBOSE=1 COVERAGE=1 + - env: BUILD_TARGET="posix-migrate" VERBOSE=1 COVERAGE=1 os: linux compiler: clang script: .travis/script.sh - - env: BUILD_TARGET="posix-app-spi" VERBOSE=1 COVERAGE=1 + - env: BUILD_TARGET="posix-spi" VERBOSE=1 COVERAGE=1 os: linux compiler: gcc script: .travis/script.sh @@ -195,7 +195,7 @@ jobs: os: linux compiler: gcc script: .travis/script.sh - - env: BUILD_TARGET="toranj-test-framework" COVERAGE=1 VERBOSE=1 TORANJ_POSIX_APP_RCP_MODEL=1 + - env: BUILD_TARGET="toranj-test-framework" COVERAGE=1 VERBOSE=1 TORANJ_POSIX_RCP_MODEL=1 os: linux compiler: gcc script: .travis/script.sh diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 5deb6c6b6..67cadcfcc 100755 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -48,10 +48,10 @@ cd /tmp || die pip3 install cmake case "${BUILD_TARGET}" in - simulation-distcheck|simulation-32-bit|posix-app-cli|simulation-mtd|simulation-ncp|posix-app-ncp|v1.2) + simulation-distcheck|simulation-32-bit|posix-cli|simulation-mtd|simulation-ncp|posix-ncp|v1.2) pip install --upgrade pip || die pip install -r $TRAVIS_BUILD_DIR/tests/scripts/thread-cert/requirements.txt || die - [ $BUILD_TARGET != simulation-ncp -a $BUILD_TARGET != posix-app-ncp ] || { + [ $BUILD_TARGET != simulation-ncp -a $BUILD_TARGET != posix-ncp ] || { # Packages used by ncp tools. pip install git+https://github.com/openthread/pyspinel || die } @@ -91,7 +91,7 @@ cd /tmp || die ) || die } - [ $BUILD_TARGET != posix-app-pty ] || { + [ $BUILD_TARGET != posix-pty ] || { sudo apt-get --no-install-recommends install -y socat expect || die JOBS=$(getconf _NPROCESSORS_ONLN) ( @@ -108,7 +108,8 @@ cd /tmp || die ) || die } - [ $BUILD_TARGET != posix-app-migrate ] || { + [ $BUILD_TARGET != posix-migrate ] || { + sudo apt-get install expect || die sudo apt-get --no-install-recommends install -y expect || die } diff --git a/.travis/check-posix-app-pty b/.travis/check-posix-pty similarity index 100% rename from .travis/check-posix-app-pty rename to .travis/check-posix-pty diff --git a/.travis/script.sh b/.travis/script.sh index 98719499f..b6ee0a84f 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -597,7 +597,7 @@ build_samr21() { REFERENCE_DEVICE=1 COVERAGE=1 CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 make -f examples/Makefile-simulation check || die } -[ $BUILD_TARGET != posix-app-cli ] || { +[ $BUILD_TARGET != posix-cli ] || { ./bootstrap || die # enable code coverage for OpenThread transceiver only COVERAGE=1 VIRTUAL_TIME_UART=1 make -f examples/Makefile-simulation || die @@ -612,27 +612,27 @@ build_samr21() { ./script/test cert_suite tests/scripts/thread-cert/v1_2_* || die } -[ $BUILD_TARGET != posix-app-pty ] || { +[ $BUILD_TARGET != posix-pty ] || { # check daemon mode git checkout -- . || die git clean -xfd || die mkdir build && cd build || die - cmake -GNinja -DOT_PLATFORM=posix-host -DOT_DAEMON=ON -DCOMPILE_WARNING_AS_ERROR=ON .. || die + cmake -GNinja -DOT_PLATFORM=posix -DOT_DAEMON=ON -DCOMPILE_WARNING_AS_ERROR=ON .. || die ninja || die cd .. || die git checkout -- . || die git clean -xfd || die mkdir build && cd build || die - cmake -GNinja -DOT_PLATFORM=posix-host -DCOMPILE_WARNING_AS_ERROR=ON .. || die + cmake -GNinja -DOT_PLATFORM=posix -DCOMPILE_WARNING_AS_ERROR=ON .. || die ninja || die cd .. || die ./bootstrap - .travis/check-posix-app-pty || die + .travis/check-posix-pty || die } -[ $BUILD_TARGET != posix-app-migrate ] || { +[ $BUILD_TARGET != posix-migrate ] || { ./bootstrap .travis/check-ncp-rcp-migrate || die } @@ -649,14 +649,14 @@ build_samr21() { make -f examples/Makefile-simulation check configure_OPTIONS="--enable-ncp --enable-ftd --with-examples=simulation" || die } -[ $BUILD_TARGET != posix-app-ncp ] || { +[ $BUILD_TARGET != posix-ncp ] || { ./bootstrap || die REFERENCE_DEVICE=1 COVERAGE=1 VIRTUAL_TIME_UART=1 make -f examples/Makefile-simulation || die REFERENCE_DEVICE=1 COVERAGE=1 READLINE=readline make -f src/posix/Makefile-posix || die REFERENCE_DEVICE=1 COVERAGE=1 PYTHONUNBUFFERED=1 OT_NCP_PATH="$(pwd)/$(ls output/posix/*/bin/ot-ncp)" RADIO_DEVICE="$(pwd)/$(ls output/*/bin/ot-rcp)" NODE_TYPE=ncp-sim make -f src/posix/Makefile-posix check || die } -[ $BUILD_TARGET != posix-app-spi ] || { +[ $BUILD_TARGET != posix-spi ] || { ./bootstrap || die REFERENCE_DEVICE=1 READLINE=readline RCP_SPI=1 make -f src/posix/Makefile-posix || die } diff --git a/Android.mk b/Android.mk index 18a009e72..e8e965ae2 100644 --- a/Android.mk +++ b/Android.mk @@ -37,7 +37,7 @@ OPENTHREAD_COMMON_FLAGS := \ -DOPENTHREAD_CONFIG_FILE=\ \ -DOPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1 \ -DOPENTHREAD_CONFIG_MAC_FILTER_ENABLE=1 \ - -DOPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE=1 \ + -DOPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE=1 \ -DOPENTHREAD_FTD=1 \ -DOPENTHREAD_POSIX=1 \ -DOPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE=1 \ @@ -63,16 +63,16 @@ ifeq ($(USE_OTBR_DAEMON), 1) OPENTHREAD_COMMON_FLAGS += \ -DOPENTHREAD_CONFIG_PLATFORM_NETIF_ENABLE=1 \ -DOPENTHREAD_CONFIG_PLATFORM_UDP_ENABLE=1 \ - -DOPENTHREAD_ENABLE_POSIX_APP_DAEMON \ + -DOPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE=1 \ $(NULL) else OPENTHREAD_COMMON_FLAGS += -DOPENTHREAD_CONFIG_UDP_FORWARD_ENABLE=1 endif ifeq ($(USE_OT_RCP_BUS), spi) -OPENTHREAD_COMMON_FLAGS += -DOPENTHREAD_POSIX_RCP_SPI_ENABLE=1 +OPENTHREAD_COMMON_FLAGS += -DOPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE=1 else -OPENTHREAD_COMMON_FLAGS += -DOPENTHREAD_POSIX_RCP_UART_ENABLE=1 +OPENTHREAD_COMMON_FLAGS += -DOPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE=1 endif # Enable all optional features for CI tests. @@ -311,7 +311,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ $(OPENTHREAD_COMMON_FLAGS) \ -DOPENTHREAD_CONFIG_UART_CLI_RAW=1 \ - -DOPENTHREAD_POSIX_APP_TYPE=2 \ $(OPENTHREAD_PROJECT_CFLAGS) \ $(NULL) @@ -353,8 +352,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ $(OPENTHREAD_COMMON_FLAGS) \ - -DOPENTHREAD_CONFIG_UART_CLI_RAW=1 \ - -DOPENTHREAD_POSIX_APP_TYPE=2 \ + -DOPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_CLI \ $(OPENTHREAD_PROJECT_CFLAGS) \ $(NULL) @@ -391,7 +389,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ $(OPENTHREAD_COMMON_FLAGS) \ - -DOPENTHREAD_POSIX_APP_TYPE=1 \ $(OPENTHREAD_PROJECT_CFLAGS) \ $(NULL) @@ -430,7 +427,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ $(OPENTHREAD_COMMON_FLAGS) \ - -DOPENTHREAD_POSIX_APP_TYPE=1 \ + -DOPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_NCP \ $(OPENTHREAD_PROJECT_CFLAGS) \ $(NULL) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd9d093d0..b9de5ef20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,7 @@ set(OT_PLATFORM "none" CACHE STRING "Target platform chosen by the user at confi ot_get_platforms(OT_EXAMPLE_PLATFORMS) set_property(CACHE OT_PLATFORM PROPERTY STRINGS ${OT_EXAMPLE_PLATFORMS}) if(NOT OT_PLATFORM IN_LIST OT_EXAMPLE_PLATFORMS) - if(NOT OT_PLATFORM STREQUAL "posix-host") + if(NOT OT_PLATFORM STREQUAL "posix") message(FATAL_ERROR "Platform unknown: ${OT_PLATFORM}") endif() endif() @@ -93,7 +93,7 @@ list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_BINARY_DIR}/etc/cmake) list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_SOURCE_DIR}/etc/cmake) list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_SOURCE_DIR}/include) -if(OT_PLATFORM STREQUAL "posix-host") +if(OT_PLATFORM STREQUAL "posix") list(APPEND OT_PRIVATE_INCLUDES ${PROJECT_SOURCE_DIR}/src/posix/platform) add_subdirectory("${PROJECT_SOURCE_DIR}/src/posix/platform") elseif(NOT OT_PLATFORM MATCHES "none") @@ -108,7 +108,7 @@ endif() list(APPEND OT_PRIVATE_DEFINES ${OT_PLATFORM_DEFINES}) -if(OT_PLATFORM STREQUAL "posix-host") +if(OT_PLATFORM STREQUAL "posix") add_subdirectory(src/posix) elseif(NOT OT_PLATFORM MATCHES "none") add_subdirectory(examples) diff --git a/configure.ac b/configure.ac index 2a7eee2ec..96a694411 100644 --- a/configure.ac +++ b/configure.ac @@ -447,65 +447,35 @@ AC_MSG_CHECKING([whether mbed TLS should be enabled]) AC_MSG_RESULT(${enable_builtin_mbedtls}) AM_CONDITIONAL([OPENTHREAD_ENABLE_BUILTIN_MBEDTLS], [test "${enable_builtin_mbedtls}" = "yes"]) -# -# POSIX Application -# - -AC_MSG_CHECKING([whether to build POSIX applicaton]) -AC_ARG_ENABLE(posix-app, - [AS_HELP_STRING([--enable-posix-app], [Build POSIX application @<:@default=no@:>@.])], - [ - case "${enableval}" in - - no|yes) - enable_posix_app=${enableval} - ;; - - *) - AC_MSG_ERROR([Invalid value ${enable_posix_app} for --enable-posix-app]) - ;; - esac - ], - [enable_posix_app=no]) - -if test "$enable_posix_app" = "yes"; then - CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_PLATFORM_POSIX_APP=1" -else - CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_PLATFORM_POSIX_APP=0" -fi - -AC_MSG_RESULT(${enable_posix_app}) -AM_CONDITIONAL([OPENTHREAD_PLATFORM_POSIX_APP], [test "${enable_posix_app}" = "yes"]) - # # POSIX Daemon # AC_MSG_CHECKING([whether to build POSIX applicaton in daemon mode]) -AC_ARG_ENABLE(posix-app-daemon, - [AS_HELP_STRING([--enable-posix-app-daemon], [Build POSIX application in daemon mode@<:@default=no@:>@.])], +AC_ARG_ENABLE(posix-daemon, + [AS_HELP_STRING([--enable-posix-daemon], [Build POSIX application in daemon mode@<:@default=no@:>@.])], [ case "${enableval}" in no|yes) - enable_posix_app_daemon=${enableval} + enable_posix_daemon=${enableval} ;; *) - AC_MSG_ERROR([Invalid value ${enable_posix_app} for --enable-posix-app-daemon]) + AC_MSG_ERROR([Invalid value ${enable_posix} for --enable-posix-daemon]) ;; esac ], - [enable_posix_app_daemon=no]) + [enable_posix_daemon=no]) -if test "$enable_posix_app_daemon" = "yes"; then - CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_ENABLE_POSIX_APP_DAEMON=1" +if test "$enable_posix_daemon" = "yes"; then + CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE=1" else - CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_ENABLE_POSIX_APP_DAEMON=0" + CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE=0" fi -AC_MSG_RESULT(${enable_posix_app_daemon}) -AM_CONDITIONAL([OPENTHREAD_ENABLE_POSIX_APP_DAEMON], [test "${enable_posix_app_daemon}" = "yes"]) +AC_MSG_RESULT(${enable_posix_daemon}) +AM_CONDITIONAL([OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE], [test "${enable_posix_daemon}" = "yes"]) # # FTD Library @@ -826,10 +796,6 @@ AC_ARG_WITH(examples, no) ;; simulation|cc1352|cc2538|cc2650|cc2652|efr32mg12|efr32mg13|efr32mg21|gp712|kw41z|nrf52811|nrf52833|nrf52840|qpg6095|samr21) - if test ${enable_posix_app} = "yes"; then - AC_MSG_RESULT(ERROR) - AC_MSG_ERROR([--with-examples must be no when POSIX apps are enabled by --enable-posix-app]) - fi ;; *) AC_MSG_RESULT(ERROR) @@ -878,12 +844,12 @@ AC_MSG_CHECKING([whether to build platform libraries]) AC_ARG_WITH(platform, [AS_HELP_STRING([--with-platform=TARGET], - [Build OpenThread platform libraries for one of: posix, cc1352, cc2538, cc2650, cc2652, - efr32mg12, efr32mg13, efr32mg21, gp712, kw41z, nrf52811, nrf52833, nrf52840, qpg6095, samr21 @<:@default=no@:>@.])], + [Build OpenThread platform libraries for one of: cc1352, cc2538, cc2650, cc2652, + efr32mg12, efr32mg13, efr32mg21, gp712, kw41z, nrf52811, nrf52833, nrf52840, posix, qpg6095, samr21, simulation @<:@default=simulation@:>@.])], [ # Make sure the given target is valid. case "${with_platform}" in - no|posix|cc1352|cc2538|cc2650|cc2652|efr32mg12|efr32mg13|efr32mg21|gp712|kw41z|nrf52811|nrf52833|nrf52840|qpg6095|samr21) + no|cc1352|cc2538|cc2650|cc2652|efr32mg12|efr32mg13|efr32mg21|gp712|kw41z|nrf52811|nrf52833|nrf52840|posix|qpg6095|samr21|simulation) ;; *) AC_MSG_RESULT(ERROR) @@ -914,7 +880,6 @@ AM_CONDITIONAL([OPENTHREAD_ENABLE_PLATFORM], [test ${with_platform} != "no"]) OPENTHREAD_ENABLE_PLATFORM=${with_platform} -AM_CONDITIONAL([OPENTHREAD_PLATFORM_SIMULATION],[test "${with_platform}" = "simulation"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_CC1352], [test "${with_platform}" = "cc1352"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_CC2538], [test "${with_platform}" = "cc2538"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_CC2650], [test "${with_platform}" = "cc2650"]) @@ -927,11 +892,15 @@ AM_CONDITIONAL([OPENTHREAD_PLATFORM_KW41Z], [test "${with_platform}" = "kw41 AM_CONDITIONAL([OPENTHREAD_PLATFORM_NRF52811], [test "${with_platform}" = "nrf52811"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_NRF52833], [test "${with_platform}" = "nrf52833"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_NRF52840], [test "${with_platform}" = "nrf52840"]) +AM_CONDITIONAL([OPENTHREAD_PLATFORM_POSIX], [test "${with_platform}" = "posix"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_QPG6095], [test "${with_platform}" = "qpg6095"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_SAMR21], [test "${with_platform}" = "samr21"]) +AM_CONDITIONAL([OPENTHREAD_PLATFORM_SIMULATION],[test "${with_platform}" = "simulation"]) AM_CONDITIONAL([OPENTHREAD_PLATFORM_NRF528XX], [test OPENTHREAD_PLATFORM_NRF52811 || test OPENTHREAD_PLATFORM_NRF52833 || test OPENTHREAD_PLATFORM_NRF52840]) +AM_COND_IF([OPENTHREAD_PLATFORM_POSIX], CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_PLATFORM_POSIX=1", CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_PLATFORM_POSIX=0") + case ${with_platform} in no) AC_MSG_RESULT([no]) @@ -977,7 +946,7 @@ NL_ENABLE_DOCS([auto],[NO]) AM_CONDITIONAL(OPENTHREAD_BUILD_DOCS, [test "${nl_cv_build_docs}" = "yes"]) -AM_CONDITIONAL(OPENTHREAD_POSIX, [test "${enable_posix_app}" = "yes" -o "${with_examples}" = "simulation"]) +AM_CONDITIONAL(OPENTHREAD_POSIX, [test "${with_platform}" = "posix" -o "${with_examples}" = "simulation"]) # # Checks for libraries and packages. @@ -1167,6 +1136,5 @@ AC_MSG_NOTICE([ OpenThread builtin mbedtls support : ${enable_builtin_mbedtls} OpenThread Examples : ${with_examples} OpenThread Platform Libraries : ${with_platform} - OpenThread POSIX Application : ${enable_posix_app} ]) diff --git a/include/openthread-config-android.h b/include/openthread-config-android.h index 0d0808347..2df68cd28 100644 --- a/include/openthread-config-android.h +++ b/include/openthread-config-android.h @@ -56,8 +56,8 @@ /* Define to 1 to enable the NCP UART interface. */ #define OPENTHREAD_CONFIG_NCP_UART_ENABLE 1 -/* Define to 1 to build posix application. */ -#define OPENTHREAD_PLATFORM_POSIX_APP 1 +/* Define to 1 to enable posix platform. */ +#define OPENTHREAD_PLATFORM_POSIX 1 /* Define to 1 if you want to enable Service */ #define OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE 1 diff --git a/script/test b/script/test index a3b44c520..ec6e25c45 100755 --- a/script/test +++ b/script/test @@ -180,14 +180,14 @@ do_package() { builddir="${OT_BUILDDIR}/cmake/openthread-host" (mkdir -p "${builddir}" \ && cd "${builddir}" \ - && cmake "${OT_SRCDIR}" -DOT_PLATFORM="posix-host" \ + && cmake "${OT_SRCDIR}" -DOT_PLATFORM="posix" \ && make -j"${OT_BUILD_JOBS}" package \ && ls "${builddir}"/openthread-standalone-*.deb) builddir="${OT_BUILDDIR}/cmake/openthread-daemon" (mkdir -p "${builddir}" \ && cd "${builddir}" \ - && cmake "${OT_SRCDIR}" -DOT_PLATFORM="posix-host" -DOT_DAEMON=1 -DOT_PLATFORM_NETIF=1 -DOT_PLATFORM_UDP=1 \ + && cmake "${OT_SRCDIR}" -DOT_PLATFORM="posix" -DOT_DAEMON=1 -DOT_PLATFORM_NETIF=1 -DOT_PLATFORM_UDP=1 \ && make -j"${OT_BUILD_JOBS}" package \ && ls "${builddir}"/openthread-daemon-*.deb) } diff --git a/src/Makefile.am b/src/Makefile.am index 801214acb..b06a7e428 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ if OPENTHREAD_ENABLE_NCP SUBDIRS += ncp endif -if OPENTHREAD_PLATFORM_POSIX_APP +if OPENTHREAD_PLATFORM_POSIX SUBDIRS += posix endif diff --git a/src/core/config/openthread-core-default-config.h b/src/core/config/openthread-core-default-config.h index c55306d1c..f3c17d4b5 100644 --- a/src/core/config/openthread-core-default-config.h +++ b/src/core/config/openthread-core-default-config.h @@ -107,16 +107,6 @@ #define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 0 #endif -/** - * @def OPENTHREAD_ENABLE_POSIX_APP_DAEMON - * - * Define to 1 to enable posix-app daemon support. - * - */ -#ifndef OPENTHREAD_ENABLE_POSIX_APP_DAEMON -#define OPENTHREAD_ENABLE_POSIX_APP_DAEMON 0 -#endif - /** * @def OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE * diff --git a/src/lib/spinel/spinel.c b/src/lib/spinel/spinel.c index 335d71529..c09fcd57f 100644 --- a/src/lib/spinel/spinel.c +++ b/src/lib/spinel/spinel.c @@ -2631,8 +2631,8 @@ const char *spinel_capability_to_cstr(spinel_capability_t capability) ret = "CHILD_SUPERVISION"; break; - case SPINEL_CAP_POSIX_APP: - ret = "POSIX_APP"; + case SPINEL_CAP_POSIX: + ret = "POSIX"; break; case SPINEL_CAP_SLAAC: diff --git a/src/lib/spinel/spinel.h b/src/lib/spinel/spinel.h index 359a7e9b2..b5e5e13d5 100644 --- a/src/lib/spinel/spinel.h +++ b/src/lib/spinel/spinel.h @@ -1055,7 +1055,7 @@ enum SPINEL_CAP_OPENTHREAD_LOG_METADATA = (SPINEL_CAP_OPENTHREAD__BEGIN + 6), SPINEL_CAP_TIME_SYNC = (SPINEL_CAP_OPENTHREAD__BEGIN + 7), SPINEL_CAP_CHILD_SUPERVISION = (SPINEL_CAP_OPENTHREAD__BEGIN + 8), - SPINEL_CAP_POSIX_APP = (SPINEL_CAP_OPENTHREAD__BEGIN + 9), + SPINEL_CAP_POSIX = (SPINEL_CAP_OPENTHREAD__BEGIN + 9), SPINEL_CAP_SLAAC = (SPINEL_CAP_OPENTHREAD__BEGIN + 10), SPINEL_CAP_RADIO_COEX = (SPINEL_CAP_OPENTHREAD__BEGIN + 11), SPINEL_CAP_MAC_RETRY_HISTOGRAM = (SPINEL_CAP_OPENTHREAD__BEGIN + 12), @@ -3412,11 +3412,10 @@ enum // RCP (NCP in radio only mode) version /** Format `U` - Read only * - * Required capability: SPINEL_CAP_POSIX_APP + * Required capability: SPINEL_CAP_POSIX * - * This property gives the version string of RCP (NCP in radio mode) which is being controlled by the POSIX - * application. It is available only in "POSIX Application" configuration (i.e., `OPENTHREAD_PLATFORM_POSIX_APP` is - * enabled). + * This property gives the version string of RCP (NCP in radio mode) which is being controlled by a POSIX + * application. It is available only in "POSIX" platform (i.e., `OPENTHREAD_PLATFORM_POSIX` is enabled). * */ SPINEL_PROP_RCP_VERSION = SPINEL_PROP_OPENTHREAD__BEGIN + 12, diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index 90abe65f1..4e0da193a 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -1771,8 +1771,8 @@ template <> otError NcpBase::HandlePropertyGet(void) SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_MAC_RAW)); #endif -#if OPENTHREAD_PLATFORM_POSIX_APP - SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_POSIX_APP)); +#if OPENTHREAD_PLATFORM_POSIX + SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_POSIX)); #endif #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL) diff --git a/src/ncp/ncp_base_dispatcher.cpp b/src/ncp/ncp_base_dispatcher.cpp index b5ccb4406..b7e989d55 100644 --- a/src/ncp/ncp_base_dispatcher.cpp +++ b/src/ncp/ncp_base_dispatcher.cpp @@ -306,7 +306,7 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey) OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_CHILD_SUPERVISION_CHECK_TIMEOUT), #endif #endif // OPENTHREAD_FTD -#if OPENTHREAD_PLATFORM_POSIX_APP +#if OPENTHREAD_PLATFORM_POSIX OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_RCP_VERSION), #endif #if OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index 6af3a1bb3..fbb0d1443 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -3084,7 +3084,7 @@ exit: #endif // OPENTHREAD_CONFIG_MAC_FILTER_ENABLE -#if OPENTHREAD_PLATFORM_POSIX_APP +#if OPENTHREAD_PLATFORM_POSIX template <> otError NcpBase::HandlePropertyGet(void) { diff --git a/src/posix/Makefile-posix b/src/posix/Makefile-posix index fbfc9d9d8..1d3931d0c 100644 --- a/src/posix/Makefile-posix +++ b/src/posix/Makefile-posix @@ -76,13 +76,13 @@ configure_OPTIONS = \ --enable-cli \ --enable-ftd \ --enable-ncp \ - --enable-posix-app \ + --with-platform=posix \ $(NULL) # Platform specific switches ifeq ($(DAEMON),1) -configure_OPTIONS += --enable-posix-app-daemon +configure_OPTIONS += --enable-posix-daemon endif ifneq ($(DEBUG),1) @@ -104,9 +104,9 @@ configure_OPTIONS += --with-readline=$(READLINE) endif ifeq ($(RCP_SPI),1) -COMMONCFLAGS += -DOPENTHREAD_POSIX_RCP_SPI_ENABLE=1 +COMMONCFLAGS += -DOPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE=1 else -COMMONCFLAGS += -DOPENTHREAD_POSIX_RCP_UART_ENABLE=1 +COMMONCFLAGS += -DOPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE=1 endif ifeq ($(VIRTUAL_TIME),1) diff --git a/src/posix/Makefile.am b/src/posix/Makefile.am index 49b1f43a2..92741934f 100644 --- a/src/posix/Makefile.am +++ b/src/posix/Makefile.am @@ -70,7 +70,7 @@ bin_PROGRAMS = \ if OPENTHREAD_ENABLE_EXECUTABLE ot_ncp_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ - -DOPENTHREAD_POSIX_APP_TYPE=1 \ + -DOPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_NCP \ $(NULL) ot_ncp_SOURCES = \ @@ -94,12 +94,12 @@ ot_ncp_LIBTOOLFLAGS = \ $(LIBTOOLFLAGS_COMMON) \ $(NULL) -if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE bin_PROGRAMS += \ ot-ctl \ ot-daemon \ $(NULL) -else # OPENTHREAD_ENABLE_POSIX_APP_DAEMON +else # OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if OPENTHREAD_ENABLE_CLI bin_PROGRAMS += \ ot-cli \ @@ -110,7 +110,7 @@ bin_PROGRAMS += \ ot-ncp \ $(NULL) endif -endif # OPENTHREAD_ENABLE_POSIX_APP_DAEMON +endif # OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE ot_ctl_SOURCES = \ client.cpp \ @@ -122,7 +122,7 @@ ot_ctl_CPPFLAGS = \ ot_daemon_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ - -DOPENTHREAD_POSIX_APP_TYPE=2 \ + -DOPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_CLI \ $(NULL) ot_daemon_SOURCES = \ @@ -150,7 +150,7 @@ ot_daemon_LIBTOOLFLAGS = \ ot_cli_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ - -DOPENTHREAD_POSIX_APP_TYPE=2 \ + -DOPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_CLI \ $(NULL) ot_cli_SOURCES = \ diff --git a/src/posix/client.cpp b/src/posix/client.cpp index c6e7a7931..0a53d5e25 100644 --- a/src/posix/client.cpp +++ b/src/posix/client.cpp @@ -214,7 +214,7 @@ int main(int argc, char *argv[]) memset(&sockname, 0, sizeof(struct sockaddr_un)); sockname.sun_family = AF_UNIX; - strncpy(sockname.sun_path, OPENTHREAD_POSIX_APP_SOCKET_NAME, sizeof(sockname.sun_path) - 1); + strncpy(sockname.sun_path, OPENTHREAD_POSIX_DAEMON_SOCKET_NAME, sizeof(sockname.sun_path) - 1); ret = connect(sSessionFd, (const struct sockaddr *)&sockname, sizeof(struct sockaddr_un)); diff --git a/src/posix/daemon.cmake b/src/posix/daemon.cmake index 79d458dfc..6e02c163c 100644 --- a/src/posix/daemon.cmake +++ b/src/posix/daemon.cmake @@ -33,7 +33,7 @@ add_executable(ot-daemon target_include_directories(ot-daemon PRIVATE ${COMMON_INCLUDES}) target_compile_definitions(ot-daemon PRIVATE - OPENTHREAD_POSIX_APP_TYPE=2 + OPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_CLI ) target_compile_options(ot-daemon PRIVATE diff --git a/src/posix/main.c b/src/posix/main.c index 9da07732f..3f2b06630 100644 --- a/src/posix/main.c +++ b/src/posix/main.c @@ -52,20 +52,20 @@ #define HAVE_LIBREADLINE 0 #endif -#define OPENTHREAD_POSIX_APP_TYPE_NCP 1 -#define OPENTHREAD_POSIX_APP_TYPE_CLI 2 +#define OT_POSIX_APP_TYPE_NCP 1 +#define OT_POSIX_APP_TYPE_CLI 2 #include #include #include #include #include -#if OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_NCP +#if OPENTHREAD_POSIX_APP_TYPE == OT_POSIX_APP_TYPE_NCP #include #define OPENTHREAD_USE_CONSOLE 0 -#elif OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_CLI +#elif OPENTHREAD_POSIX_APP_TYPE == OT_POSIX_APP_TYPE_CLI #include -#if (HAVE_LIBEDIT || HAVE_LIBREADLINE) && !OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if (HAVE_LIBEDIT || HAVE_LIBREADLINE) && !OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE #define OPENTHREAD_USE_CONSOLE 1 #include "console_cli.h" #else @@ -123,7 +123,7 @@ static const struct option kOptions[] = {{"debug-level", required_argument, NULL {"ncp-dataset", no_argument, NULL, ARG_RESTORE_NCP_DATASET}, {"time-speed", required_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE {"gpio-int-dev", required_argument, NULL, ARG_SPI_GPIO_INT_DEV}, {"gpio-int-line", required_argument, NULL, ARG_SPI_GPIO_INT_LINE}, {"gpio-reset-dev", required_argument, NULL, ARG_SPI_GPIO_RESET_DEV}, @@ -153,7 +153,7 @@ static void PrintUsage(const char *aProgramName, FILE *aStream, int aExitCode) " -s --time-speed factor Time speed up factor.\n" " -v --verbose Also log to stderr.\n", aProgramName); -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE fprintf(aStream, " --gpio-int-dev[=gpio-device-path]\n" " Specify a path to the Linux sysfs-exported GPIO device for the\n" @@ -364,9 +364,9 @@ int main(int argc, char *argv[]) instance = InitInstance(argc, argv); -#if OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_NCP +#if OPENTHREAD_POSIX_APP_TYPE == OT_POSIX_APP_TYPE_NCP otNcpInit(instance); -#elif OPENTHREAD_POSIX_APP_TYPE == OPENTHREAD_POSIX_APP_TYPE_CLI +#elif OPENTHREAD_POSIX_APP_TYPE == OT_POSIX_APP_TYPE_CLI #if OPENTHREAD_USE_CONSOLE otxConsoleInit(instance); #else diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt index 0e38520b1..632f0013b 100644 --- a/src/posix/platform/CMakeLists.txt +++ b/src/posix/platform/CMakeLists.txt @@ -30,7 +30,7 @@ set(OT_PLATFORM_LIB "openthread-posix" PARENT_SCOPE) option(OT_DAEMON "Enable daemon mode" OFF) if(OT_DAEMON) - list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_ENABLE_POSIX_APP_DAEMON=1") + list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE=1") endif() if(NOT OT_CONFIG) @@ -42,7 +42,7 @@ list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_CONFIG_LOG_LEVEL_DYNAMIC_ENABLE=1" "OPENTHREAD_CONFIG_NCP_UART_ENABLE=1" "OPENTHREAD_POSIX=1" - "OPENTHREAD_POSIX_RCP_UART_ENABLE=1" + "OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE=1" ) set(OT_PLATFORM_DEFINES ${OT_PLATFORM_DEFINES} PARENT_SCOPE) diff --git a/src/posix/platform/hdlc_interface.cpp b/src/posix/platform/hdlc_interface.cpp index d4d7221f2..e97197f50 100644 --- a/src/posix/platform/hdlc_interface.cpp +++ b/src/posix/platform/hdlc_interface.cpp @@ -38,7 +38,7 @@ #include #include #include -#if OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#if OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE #if defined(__APPLE__) || defined(__NetBSD__) #include #else @@ -118,7 +118,7 @@ #endif // __APPLE__ -#if OPENTHREAD_POSIX_RCP_UART_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE namespace ot { namespace PosixApp { @@ -145,13 +145,13 @@ otError HdlcInterface::Init(const otPlatformConfig &aPlatformConfig) mSockFd = OpenFile(aPlatformConfig.mRadioFile, aPlatformConfig.mRadioConfig); VerifyOrExit(mSockFd != -1, error = OT_ERROR_INVALID_ARGS); } -#if OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#if OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE else if (S_ISREG(st.st_mode)) { mSockFd = ForkPty(aPlatformConfig.mRadioFile, aPlatformConfig.mRadioConfig); VerifyOrExit(mSockFd != -1, error = OT_ERROR_INVALID_ARGS); } -#endif // OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE else { otLogCritPlat("Radio file '%s' not supported", aPlatformConfig.mRadioFile); @@ -574,7 +574,7 @@ exit: return fd; } -#if OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#if OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE int HdlcInterface::ForkPty(const char *aCommand, const char *aArguments) { int fd = -1; @@ -615,7 +615,7 @@ exit: VerifyOrDie(rval == 0, OT_EXIT_ERROR_ERRNO); return fd; } -#endif // OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE void HdlcInterface::HandleHdlcFrame(void *aContext, otError aError) { @@ -637,4 +637,4 @@ void HdlcInterface::HandleHdlcFrame(otError aError) } // namespace PosixApp } // namespace ot -#endif // OPENTHREAD_POSIX_RCP_UART_ENABLE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE diff --git a/src/posix/platform/hdlc_interface.hpp b/src/posix/platform/hdlc_interface.hpp index dcd2b7514..dd4ec8236 100644 --- a/src/posix/platform/hdlc_interface.hpp +++ b/src/posix/platform/hdlc_interface.hpp @@ -39,7 +39,7 @@ #include "spinel_interface.hpp" #include "lib/hdlc/hdlc.hpp" -#if OPENTHREAD_POSIX_RCP_UART_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE namespace ot { namespace PosixApp { @@ -198,7 +198,7 @@ private: void HandleHdlcFrame(otError aError); static int OpenFile(const char *aFile, const char *aConfig); -#if OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE +#if OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE static int ForkPty(const char *aCommand, const char *aArguments); #endif @@ -218,5 +218,5 @@ private: } // namespace PosixApp } // namespace ot -#endif // OPENTHREAD_POSIX_RCP_UART_ENABLE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE #endif // POSIX_APP_HDLC_INTERFACE_HPP_ diff --git a/src/posix/platform/openthread-core-posix-config.h b/src/posix/platform/openthread-core-posix-config.h index 41d83d516..6ba17a31c 100644 --- a/src/posix/platform/openthread-core-posix-config.h +++ b/src/posix/platform/openthread-core-posix-config.h @@ -50,7 +50,7 @@ * The platform-specific string to insert into the OpenThread version string. * */ -#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-APP" +#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX" /** * @def OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE @@ -82,7 +82,7 @@ #define OPENTHREAD_CONFIG_PLATFORM_RADIO_COEX_ENABLE 1 #endif -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE #ifndef OPENTHREAD_CONFIG_PLATFORM_NETIF_ENABLE #define OPENTHREAD_CONFIG_PLATFORM_NETIF_ENABLE 1 diff --git a/src/posix/platform/openthread-posix-config.h b/src/posix/platform/openthread-posix-config.h index 73feb166b..021f37c70 100644 --- a/src/posix/platform/openthread-posix-config.h +++ b/src/posix/platform/openthread-posix-config.h @@ -38,53 +38,53 @@ */ /** - * @def OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE + * @def OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE * - * Define as 1 to enable PTY device support in POSIX app. + * Define as 1 to enable PTY RCP support. * */ -#ifndef OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE -#define OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE 1 +#ifndef OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE +#define OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE 1 #endif /** - * @def OPENTHREAD_POSIX_APP_SOCKET_BASENAME + * @def OPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME * * Define socket basename used by POSIX app daemon. * */ -#ifndef OPENTHREAD_POSIX_APP_SOCKET_BASENAME -#define OPENTHREAD_POSIX_APP_SOCKET_BASENAME "/tmp/openthread" +#ifndef OPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME +#define OPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME "/tmp/openthread" #endif /** - * @def OPENTHREAD_POSIX_VIRTUAL_TIME - * - * This setting configures whether to use virtual time. - * - */ -#ifndef OPENTHREAD_POSIX_VIRTUAL_TIME -#define OPENTHREAD_POSIX_VIRTUAL_TIME 0 -#endif - -/** - * @def OPENTHREAD_POSIX_RCP_UART_ENABLE + * @def OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE * * Define as 1 to enable UART interface to RCP. * */ -#ifndef OPENTHREAD_POSIX_RCP_UART_ENABLE -#define OPENTHREAD_POSIX_RCP_UART_ENABLE 0 +#ifndef OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE +#define OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE 0 #endif /** - * @def OPENTHREAD_POSIX_RCP_SPI_ENABLE + * @def OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE * * Define as 1 to enable SPI interface to RCP. * */ -#ifndef OPENTHREAD_POSIX_RCP_SPI_ENABLE -#define OPENTHREAD_POSIX_RCP_SPI_ENABLE 0 +#ifndef OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE +#define OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE 0 +#endif + +/** + * @def OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE + * + * Define to 1 to enable POSIX daemon. + * + */ +#ifndef OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE +#define OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE 0 #endif #endif // OPENTHREAD_PLATFORM_CONFIG_H_ diff --git a/src/posix/platform/platform-posix.h b/src/posix/platform/platform-posix.h index df2a5858c..343a9f60d 100644 --- a/src/posix/platform/platform-posix.h +++ b/src/posix/platform/platform-posix.h @@ -49,11 +49,21 @@ #include "common/logging.hpp" +/** + * @def OPENTHREAD_POSIX_VIRTUAL_TIME + * + * This setting configures whether to use virtual time. + * + */ +#ifndef OPENTHREAD_POSIX_VIRTUAL_TIME +#define OPENTHREAD_POSIX_VIRTUAL_TIME 0 +#endif + /** * This is the socket name used by daemon mode. * */ -#define OPENTHREAD_POSIX_APP_SOCKET_NAME OPENTHREAD_POSIX_APP_SOCKET_BASENAME ".sock" +#define OPENTHREAD_POSIX_DAEMON_SOCKET_NAME OPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME ".sock" #ifdef __cplusplus extern "C" { diff --git a/src/posix/platform/radio_spinel.hpp b/src/posix/platform/radio_spinel.hpp index 1a7727039..64e11f6f7 100644 --- a/src/posix/platform/radio_spinel.hpp +++ b/src/posix/platform/radio_spinel.hpp @@ -38,16 +38,16 @@ #include -#if OPENTHREAD_POSIX_RCP_UART_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE #include "hdlc_interface.hpp" #endif -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE #include "spi_interface.hpp" #endif -#if !OPENTHREAD_POSIX_RCP_UART_ENABLE && !OPENTHREAD_POSIX_RCP_SPI_ENABLE -#error "Please enable either OPENTHREAD_POSIX_RCP_UART_ENABLE or OPENTHREAD_POSIX_RCP_SPI_ENABLE." +#if !OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE && !OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE +#error "Please enable either OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE or OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE." #endif #include "spinel_interface.hpp" @@ -680,11 +680,11 @@ private: SpinelInterface::RxFrameBuffer mRxFrameBuffer; -#if OPENTHREAD_POSIX_RCP_UART_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE HdlcInterface mSpinelInterface; #endif -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE SpiInterface mSpinelInterface; #endif diff --git a/src/posix/platform/spi_interface.cpp b/src/posix/platform/spi_interface.cpp index 74a13de67..b3e8b66df 100644 --- a/src/posix/platform/spi_interface.cpp +++ b/src/posix/platform/spi_interface.cpp @@ -54,7 +54,7 @@ #include #include -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE #include #include #include @@ -785,4 +785,4 @@ void SpiInterface::LogStats(void) } // namespace PosixApp } // namespace ot -#endif // OPENTHREAD_POSIX_RCP_SPI_ENABLE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE diff --git a/src/posix/platform/spi_interface.hpp b/src/posix/platform/spi_interface.hpp index 0fbf571a0..3e4891c4a 100644 --- a/src/posix/platform/spi_interface.hpp +++ b/src/posix/platform/spi_interface.hpp @@ -41,7 +41,7 @@ #include -#if OPENTHREAD_POSIX_RCP_SPI_ENABLE +#if OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE #include "ncp/ncp_spi.hpp" @@ -223,5 +223,5 @@ private: } // namespace PosixApp } // namespace ot -#endif // OPENTHREAD_POSIX_RCP_SPI_ENABLE +#endif // OPENTHREAD_POSIX_CONFIG_RCP_SPI_ENABLE #endif // POSIX_APP_SPI_INTERFACE_HPP_ diff --git a/src/posix/platform/uart.cpp b/src/posix/platform/uart.cpp index 8b22f7e97..b47cad3fd 100644 --- a/src/posix/platform/uart.cpp +++ b/src/posix/platform/uart.cpp @@ -29,7 +29,7 @@ #include "openthread-posix-config.h" #include "platform-posix.h" -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE #include #include #include @@ -47,9 +47,9 @@ #include "common/code_utils.hpp" -#define OPENTHREAD_POSIX_APP_SOCKET_LOCK OPENTHREAD_POSIX_APP_SOCKET_BASENAME ".lock" +#define OPENTHREAD_POSIX_DAEMON_SOCKET_LOCK OPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME ".lock" -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE static int sUartSocket = -1; static int sUartLock = -1; static int sSessionSocket = -1; @@ -62,7 +62,7 @@ static uint16_t sWriteLength = 0; otError otPlatUartEnable(void) { otError error = OT_ERROR_NONE; -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE struct sockaddr_un sockname; int ret; @@ -76,7 +76,7 @@ otError otPlatUartEnable(void) DieNow(OT_EXIT_FAILURE); } - sUartLock = open(OPENTHREAD_POSIX_APP_SOCKET_LOCK, O_CREAT | O_RDONLY | O_CLOEXEC, 0600); + sUartLock = open(OPENTHREAD_POSIX_DAEMON_SOCKET_LOCK, O_CREAT | O_RDONLY | O_CLOEXEC, 0600); if (sUartLock == -1) { @@ -90,11 +90,11 @@ otError otPlatUartEnable(void) memset(&sockname, 0, sizeof(struct sockaddr_un)); - (void)unlink(OPENTHREAD_POSIX_APP_SOCKET_NAME); + (void)unlink(OPENTHREAD_POSIX_DAEMON_SOCKET_NAME); sockname.sun_family = AF_UNIX; - assert(sizeof(OPENTHREAD_POSIX_APP_SOCKET_NAME) < sizeof(sockname.sun_path)); - strncpy(sockname.sun_path, OPENTHREAD_POSIX_APP_SOCKET_NAME, sizeof(sockname.sun_path) - 1); + assert(sizeof(OPENTHREAD_POSIX_DAEMON_SOCKET_NAME) < sizeof(sockname.sun_path)); + strncpy(sockname.sun_path, OPENTHREAD_POSIX_DAEMON_SOCKET_NAME, sizeof(sockname.sun_path) - 1); ret = bind(sUartSocket, (const struct sockaddr *)&sockname, sizeof(struct sockaddr_un)); @@ -113,7 +113,7 @@ otError otPlatUartEnable(void) } exit: -#endif // OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#endif // OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE sEnabled = true; return error; @@ -124,7 +124,7 @@ otError otPlatUartDisable(void) otError error = OT_ERROR_NONE; sEnabled = false; -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if (sSessionSocket != -1) { close(sSessionSocket); @@ -143,7 +143,7 @@ otError otPlatUartDisable(void) close(sUartLock); sUartLock = -1; } -#endif // OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#endif // OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE return error; } @@ -173,7 +173,7 @@ void platformUartUpdateFdSet(fd_set *aReadFdSet, fd_set *aWriteFdSet, fd_set *aE if (aReadFdSet != NULL) { -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE int fd = (sSessionSocket == -1 ? sUartSocket : sSessionSocket); #else int fd = STDIN_FILENO; @@ -193,7 +193,7 @@ void platformUartUpdateFdSet(fd_set *aReadFdSet, fd_set *aWriteFdSet, fd_set *aE } if ((aWriteFdSet != NULL) && (sWriteLength > 0)) { -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE int fd = (sSessionSocket == -1 ? sUartSocket : sSessionSocket); #else int fd = STDOUT_FILENO; @@ -222,7 +222,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co int fd; VerifyOrExit(sEnabled); -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if (FD_ISSET(sUartSocket, aErrorFdSet)) { DieNowWithMessage("socket", OT_EXIT_FAILURE); @@ -251,7 +251,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co VerifyOrExit(sSessionSocket != -1); fd = sSessionSocket; -#else // OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#else // OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if (FD_ISSET(STDIN_FILENO, aErrorFdSet)) { DieNowWithMessage("stdin", OT_EXIT_FAILURE); @@ -263,7 +263,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co } fd = STDIN_FILENO; -#endif // OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#endif // OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if (FD_ISSET(fd, aReadFdSet)) { @@ -277,7 +277,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co } else if (rval <= 0) { -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE if (rval < 0) { perror("UART read"); @@ -291,7 +291,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co } } -#if !OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if !OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE fd = STDOUT_FILENO; #endif @@ -301,7 +301,7 @@ void platformUartProcess(const fd_set *aReadFdSet, const fd_set *aWriteFdSet, co if (rval < 0) { -#if OPENTHREAD_ENABLE_POSIX_APP_DAEMON +#if OPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE perror("UART write"); close(sSessionSocket); sSessionSocket = -1; diff --git a/src/posix/standalone.cmake b/src/posix/standalone.cmake index 72143e4ed..3aa48a031 100644 --- a/src/posix/standalone.cmake +++ b/src/posix/standalone.cmake @@ -33,7 +33,7 @@ add_executable(ot-cli target_include_directories(ot-cli PRIVATE ${COMMON_INCLUDES}) target_compile_definitions(ot-cli PRIVATE - OPENTHREAD_POSIX_APP_TYPE=2 + OPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_CLI ) target_compile_options(ot-cli PRIVATE @@ -56,7 +56,7 @@ add_executable(ot-ncp target_include_directories(ot-ncp PRIVATE ${COMMON_INCLUDES}) target_compile_definitions(ot-ncp PRIVATE - OPENTHREAD_POSIX_APP_TYPE=1 + OPENTHREAD_POSIX_APP_TYPE=OT_POSIX_APP_TYPE_NCP ) target_compile_options(ot-ncp PRIVATE diff --git a/tests/toranj/build.sh b/tests/toranj/build.sh index 122e3efd4..fa52ae8b0 100755 --- a/tests/toranj/build.sh +++ b/tests/toranj/build.sh @@ -38,7 +38,7 @@ display_usage() { echo " can be:" echo " ncp : Build OpenThread NCP FTD mode with simulation platform" echo " rcp : Build OpenThread RCP (NCP in radio mode) with simulation platform" - echo " posix-app : Build OpenThread POSIX App NCP" + echo " posix : Build OpenThread POSIX App NCP" echo " cmake : Configure and build OpenThread using cmake/ninja (RCP and NCP) only" echo " cmake-posix: Configure and build OpenThread POSIX host using cmake/ninja" echo "" @@ -131,7 +131,7 @@ case ${build_config} in make -j 8 || die ;; - posix-app|posixapp) + posix|posix-app|posixapp) echo "====================================================================================================" echo "Building OpenThread POSIX App NCP" echo "====================================================================================================" @@ -139,7 +139,7 @@ case ${build_config} in cd "${top_builddir}" ${top_srcdir}/configure \ CPPFLAGS="$cppflags_config" \ - --enable-posix-app \ + --with-platform=posix \ $configure_options || die make -j 8 || die ;; @@ -156,7 +156,7 @@ case ${build_config} in echo "====================================================================================================" echo "Building OpenThread POSIX host platform using cmake" echo "====================================================================================================" - cmake -GNinja -DOT_PLATFORM=posix-host -DOT_CONFIG=../tests/toranj/openthread-core-toranj-config.h . || die + cmake -GNinja -DOT_PLATFORM=posix -DOT_CONFIG=../tests/toranj/openthread-core-toranj-config.h . || die ninja || die ;; diff --git a/tests/toranj/openthread-core-toranj-config.h b/tests/toranj/openthread-core-toranj-config.h index 2e4116d0f..ad223fba0 100644 --- a/tests/toranj/openthread-core-toranj-config.h +++ b/tests/toranj/openthread-core-toranj-config.h @@ -45,11 +45,11 @@ * */ #if OPENTHREAD_RADIO -#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-RCP-toranj" -#elif OPENTHREAD_PLATFORM_POSIX_APP -#define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-App-toranj" -#else +#define OPENTHREAD_CONFIG_PLATFORM_INFO "SIMULATION-RCP-toranj" +#elif OPENTHREAD_PLATFORM_POSIX #define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-toranj" +#else +#define OPENTHREAD_CONFIG_PLATFORM_INFO "SIMULATION-toranj" #endif /** @@ -426,19 +426,19 @@ // POSIX-App configurations /** - * @def OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE + * @def OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE * * Define as 1 to enable PTY device support in POSIX app. * */ -#define OPENTHREAD_CONFIG_POSIX_APP_ENABLE_PTY_DEVICE 1 +#define OPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE 1 /** - * @def OPENTHREAD_POSIX_RCP_UART_ENABLE + * @def OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE * * Define as 1 to enable UART interface to RCP. * */ -#define OPENTHREAD_POSIX_RCP_UART_ENABLE 1 +#define OPENTHREAD_POSIX_CONFIG_RCP_UART_ENABLE 1 #endif /* OPENTHREAD_CORE_TORANJ_CONFIG_H_ */ diff --git a/tests/toranj/start.sh b/tests/toranj/start.sh index 39cbebd7f..a9e484cbb 100755 --- a/tests/toranj/start.sh +++ b/tests/toranj/start.sh @@ -83,21 +83,21 @@ else coverage_option="" fi -case $TORANJ_POSIX_APP_RCP_MODEL in +case $TORANJ_POSIX_RCP_MODEL in 1|yes) - use_posix_app_with_rcp=yes + use_posix_with_rcp=yes ;; *) - use_posix_app_with_rcp=no + use_posix_with_rcp=no ;; esac -if [ "$use_posix_app_with_rcp" = "no" ]; then +if [ "$use_posix_with_rcp" = "no" ]; then ./build.sh ${coverage_option} ncp || die else ./build.sh ${coverage_option} rcp || die - ./build.sh ${coverage_option} posix-app || die + ./build.sh ${coverage_option} posix || die fi cleanup diff --git a/tests/toranj/test-001-get-set.py b/tests/toranj/test-001-get-set.py index c8a841df4..023d430ee 100644 --- a/tests/toranj/test-001-get-set.py +++ b/tests/toranj/test-001-get-set.py @@ -174,7 +174,7 @@ all_gettable_props = [ wpan.WPAN_THREAD_STABLE_LEADER_NETWORK_DATA, ] -all_posix_app_gettable_props = [wpan.WPAN_RCP_VERSION] +all_posix_gettable_props = [wpan.WPAN_RCP_VERSION] # note: partitionid only takes effect after forming one Thread network. node.set(wpan.WPAN_PARTITION_ID, '12345678') @@ -187,8 +187,8 @@ verify(int(node.get(wpan.WPAN_PARTITION_ID), 0) == 12345678) for prop in all_gettable_props: node.get(prop) -if node.using_posix_app_with_rcp: - for prop in all_posix_app_gettable_props: +if node.using_posix_with_rcp: + for prop in all_posix_gettable_props: node.get(prop) # ----------------------------------------------------------------------------------------------------------------------- diff --git a/tests/toranj/wpan.py b/tests/toranj/wpan.py index 22b11479f..b8cdeb4e0 100644 --- a/tests/toranj/wpan.py +++ b/tests/toranj/wpan.py @@ -281,13 +281,13 @@ class Node(object): _WPANCTL = '%s/bin/wpanctl' % _WPANTUND_PREFIX _OT_NCP_FTD = '%s/examples/apps/ncp/ot-ncp-ftd' % _OT_BUILDDIR - _OT_NCP_FTD_POSIX_APP = '%s/src/posix/ot-ncp' % _OT_BUILDDIR + _OT_NCP_FTD_POSIX = '%s/src/posix/ot-ncp' % _OT_BUILDDIR _OT_RCP = '%s/examples/apps/ncp/ot-rcp' % _OT_BUILDDIR # Environment variable used to determine how to run OpenThread - # If set to 1, then posix-app (`ot-ncp`) is used along with a posix RCP `ot-rcp`. + # If set to 1, then posix NCP (`ot-ncp`) is used along with a posix RCP `ot-rcp`. # Otherwise, the posix NCP `ot-ncp-ftd` is used - _POSIX_APP_ENV_VAR = 'TORANJ_POSIX_APP_RCP_MODEL' + _POSIX_ENV_VAR = 'TORANJ_POSIX_RCP_MODEL' # determines if the wpantund logs are saved in file or sent to stdout _TUND_LOG_TO_FILE = True @@ -312,17 +312,18 @@ class Node(object): self._interface_name = self._INTFC_NAME_PREFIX + str(index) self._verbose = verbose - # Check if env variable `TORANJ_POSIX_APP_RCP_MODEL` is defined + # Check if env variable `TORANJ_POSIX_RCP_MODEL` is defined # and use it to determine if to use operate in "posix-ncp-app". - if self._POSIX_APP_ENV_VAR in os.environ: - self._use_posix_app_with_rcp = ( - os.environ[self._POSIX_APP_ENV_VAR] in ['1', 'yes']) + if self._POSIX_ENV_VAR in os.environ: + self._use_posix_with_rcp = (os.environ[self._POSIX_ENV_VAR] in [ + '1', 'yes' + ]) else: - self._use_posix_app_with_rcp = False + self._use_posix_with_rcp = False - if self._use_posix_app_with_rcp: + if self._use_posix_with_rcp: ncp_socket_path = 'system:{} -s {} {} {}'.format( - self._OT_NCP_FTD_POSIX_APP, self._SPEED_UP_FACTOR, self._OT_RCP, + self._OT_NCP_FTD_POSIX, self._SPEED_UP_FACTOR, self._OT_RCP, index) else: ncp_socket_path = 'system:{} {} {}'.format(self._OT_NCP_FTD, index, @@ -376,8 +377,8 @@ class Node(object): return self._tund_log_file @property - def using_posix_app_with_rcp(self): - return self._use_posix_app_with_rcp + def using_posix_with_rcp(self): + return self._use_posix_with_rcp # ------------------------------------------------------------------------------------------------------------------ # Executing a `wpanctl` command diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index a4083c280..173f0deaa 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -65,9 +65,9 @@ AM_CPPFLAGS += \ $(NULL) endif -if OPENTHREAD_PLATFORM_POSIX_APP +if OPENTHREAD_PLATFORM_POSIX AM_CPPFLAGS += \ - -DOPENTHREAD_PLATFORM_POSIX_APP=1 \ + -DOPENTHREAD_PLATFORM_POSIX=1 \ -I$(top_srcdir)/src/posix/platform \ $(NULL) endif @@ -92,7 +92,7 @@ COMMON_LDADD += \ $(NULL) endif -if OPENTHREAD_PLATFORM_POSIX_APP +if OPENTHREAD_PLATFORM_POSIX COMMON_LDADD += \ -lutil $(NULL)