mirror of
https://github.com/espressif/openthread.git
synced 2026-09-20 16:07:36 +00:00
[posix] detect POSIX in source (#6259)
This commit is contained in:
@@ -45,7 +45,6 @@ OPENTHREAD_PUBLIC_CFLAGS := \
|
||||
-DOPENTHREAD_CONFIG_MAC_FILTER_ENABLE=1 \
|
||||
-DOPENTHREAD_POSIX_CONFIG_RCP_PTY_ENABLE=1 \
|
||||
-DOPENTHREAD_FTD=1 \
|
||||
-DOPENTHREAD_POSIX=1 \
|
||||
-DOPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE=1 \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -55,9 +55,6 @@ declare_args() {
|
||||
# Use external mbedtls. If blank, internal mbedtls will be used.
|
||||
openthread_external_mbedtls = ""
|
||||
|
||||
# Enable building for POSIX platforms.
|
||||
openthread_posix = current_os == "linux"
|
||||
|
||||
# Package name for OpenThread.
|
||||
openthread_package_name = "OPENTHREAD"
|
||||
|
||||
|
||||
@@ -52,7 +52,6 @@ list(APPEND OT_PLATFORM_DEFINES
|
||||
"_BSD_SOURCE=1"
|
||||
"_DEFAULT_SOURCE=1"
|
||||
"OPENTHREAD_EXAMPLES_SIMULATION=1"
|
||||
"OPENTHREAD_POSIX=1"
|
||||
"OPENTHREAD_CONFIG_NCP_UART_ENABLE=1"
|
||||
)
|
||||
set(OT_PLATFORM_DEFINES ${OT_PLATFORM_DEFINES} PARENT_SCOPE)
|
||||
|
||||
@@ -53,7 +53,7 @@ extern "C" {
|
||||
* @note This number versions both OpenThread platform and user APIs.
|
||||
*
|
||||
*/
|
||||
#define OPENTHREAD_API_VERSION (83)
|
||||
#define OPENTHREAD_API_VERSION (84)
|
||||
|
||||
/**
|
||||
* @addtogroup api-instance
|
||||
|
||||
@@ -58,11 +58,6 @@ openthread_cli_sources = [
|
||||
|
||||
config("cli_config") {
|
||||
defines = []
|
||||
if (openthread_posix) {
|
||||
defines += ["OPENTHREAD_POSIX=1"]
|
||||
} else {
|
||||
defines += ["OPENTHREAD_POSIX=0"]
|
||||
}
|
||||
}
|
||||
|
||||
static_library("libopenthread-cli-ftd") {
|
||||
|
||||
@@ -125,16 +125,6 @@ CPPFLAGS_COMMON = \
|
||||
$(OPENTHREAD_TARGET_DEFINES) \
|
||||
$(NULL)
|
||||
|
||||
if OPENTHREAD_POSIX
|
||||
CPPFLAGS_COMMON += \
|
||||
-DOPENTHREAD_POSIX=1 \
|
||||
$(NULL)
|
||||
else
|
||||
CPPFLAGS_COMMON += \
|
||||
-DOPENTHREAD_POSIX=0 \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
libopenthread_cli_mtd_a_CPPFLAGS = \
|
||||
-DOPENTHREAD_MTD=1 \
|
||||
-DOPENTHREAD_FTD=0 \
|
||||
|
||||
+1
-1
@@ -1662,7 +1662,7 @@ exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
#if OPENTHREAD_POSIX
|
||||
#if OPENTHREAD_POSIX && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
otError Interpreter::ProcessExit(uint8_t aArgsLength, char *aArgs[])
|
||||
{
|
||||
OT_UNUSED_VARIABLE(aArgsLength);
|
||||
|
||||
+2
-2
@@ -367,7 +367,7 @@ private:
|
||||
otError ProcessEidCache(uint8_t aArgsLength, char *aArgs[]);
|
||||
#endif
|
||||
otError ProcessEui64(uint8_t aArgsLength, char *aArgs[]);
|
||||
#if OPENTHREAD_POSIX
|
||||
#if OPENTHREAD_POSIX && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
otError ProcessExit(uint8_t aArgsLength, char *aArgs[]);
|
||||
#endif
|
||||
otError ProcessLog(uint8_t aArgsLength, char *aArgs[]);
|
||||
@@ -678,7 +678,7 @@ private:
|
||||
{"eidcache", &Interpreter::ProcessEidCache},
|
||||
#endif
|
||||
{"eui64", &Interpreter::ProcessEui64},
|
||||
#if OPENTHREAD_POSIX
|
||||
#if OPENTHREAD_POSIX && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
{"exit", &Interpreter::ProcessExit},
|
||||
#endif
|
||||
{"extaddr", &Interpreter::ProcessExtAddress},
|
||||
|
||||
@@ -37,6 +37,15 @@
|
||||
|
||||
#include "openthread-core-config.h"
|
||||
|
||||
#ifndef OPENTHREAD_POSIX
|
||||
#if defined(__ANDROID__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__NetBSD__) || \
|
||||
defined(__unix__)
|
||||
#define OPENTHREAD_POSIX 1
|
||||
#else
|
||||
#define OPENTHREAD_POSIX 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @def OPENTHREAD_CONFIG_CLI_MAX_LINE_LENGTH
|
||||
*
|
||||
|
||||
@@ -152,7 +152,7 @@ void Uart::ReceiveTask(const uint8_t *aBuf, uint16_t aBufLength)
|
||||
break;
|
||||
|
||||
#if !OPENTHREAD_CONFIG_UART_CLI_RAW
|
||||
#if OPENTHREAD_POSIX
|
||||
#if OPENTHREAD_POSIX && !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
|
||||
|
||||
case 0x03: // ASCII for Ctrl-C
|
||||
kill(0, SIGINT);
|
||||
|
||||
@@ -53,8 +53,6 @@ if(NOT OT_CONFIG)
|
||||
set(OT_CONFIG ${OT_CONFIG} PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_POSIX=1")
|
||||
|
||||
set(OT_PLATFORM_DEFINES ${OT_PLATFORM_DEFINES} PARENT_SCOPE)
|
||||
|
||||
list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_PROJECT_CORE_CONFIG_FILE=\"${OT_CONFIG}\"")
|
||||
|
||||
Reference in New Issue
Block a user