From 24a24f1f9e71d293bab5f9c7b01c967f2bfe0d1c Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Tue, 25 Feb 2020 05:16:03 +0800 Subject: [PATCH] [build] move openthread-system.h under openthread (#4593) This commit moves openthread-system.h to a directory named openthread so that projects depends on OpenThread can use it without installing OpenThread project. --- Android.mk | 16 +++++++--- src/posix/CMakeLists.txt | 1 + src/posix/Makefile.am | 1 + src/posix/console_cli.h | 2 +- src/posix/main.c | 2 +- src/posix/platform/CMakeLists.txt | 3 +- src/posix/platform/Makefile.am | 32 ++++++++++--------- .../openthread}/openthread-system.h | 0 src/posix/platform/platform-posix.h | 2 +- src/posix/platform/spi_interface.hpp | 28 ++++++++-------- 10 files changed, 49 insertions(+), 38 deletions(-) rename src/posix/platform/{ => include/openthread}/openthread-system.h (100%) diff --git a/Android.mk b/Android.mk index b5176c16c..ca22a7fed 100644 --- a/Android.mk +++ b/Android.mk @@ -104,6 +104,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/core \ $(LOCAL_PATH)/src/ncp \ $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(LOCAL_PATH)/third_party \ $(LOCAL_PATH)/third_party/mbedtls \ $(LOCAL_PATH)/third_party/mbedtls/repo/include \ @@ -297,6 +298,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/cli \ $(LOCAL_PATH)/src/core \ $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(LOCAL_PATH)/third_party/mbedtls \ $(LOCAL_PATH)/third_party/mbedtls/repo/include \ $(NULL) @@ -339,6 +341,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/cli \ $(LOCAL_PATH)/src/core \ $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(LOCAL_PATH)/third_party/mbedtls \ $(LOCAL_PATH)/third_party/mbedtls/repo/include \ $(NULL) @@ -376,6 +379,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/core \ $(LOCAL_PATH)/src/ncp \ $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(LOCAL_PATH)/third_party/mbedtls \ $(LOCAL_PATH)/third_party/mbedtls/repo/include \ $(NULL) @@ -414,6 +418,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src/core \ $(LOCAL_PATH)/src/ncp \ $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(LOCAL_PATH)/third_party/mbedtls \ $(LOCAL_PATH)/third_party/mbedtls/repo/include \ $(NULL) @@ -449,11 +454,12 @@ LOCAL_CFLAGS := \ -DOPENTHREAD_CONFIG_FILE=\ \ $(NULL) -LOCAL_C_INCLUDES := \ - $(OPENTHREAD_PROJECT_INCLUDES) \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/src/core \ - $(LOCAL_PATH)/src/posix/platform \ +LOCAL_C_INCLUDES := \ + $(OPENTHREAD_PROJECT_INCLUDES) \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/src/core \ + $(LOCAL_PATH)/src/posix/platform \ + $(LOCAL_PATH)/src/posix/platform/include \ $(NULL) LOCAL_SRC_FILES := src/posix/client.cpp diff --git a/src/posix/CMakeLists.txt b/src/posix/CMakeLists.txt index 19a0b8fae..b8a2024db 100644 --- a/src/posix/CMakeLists.txt +++ b/src/posix/CMakeLists.txt @@ -31,6 +31,7 @@ set(COMMON_INCLUDES ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/posix/platform + ${PROJECT_SOURCE_DIR}/src/posix/platform/include ) if(OT_DAEMON) diff --git a/src/posix/Makefile.am b/src/posix/Makefile.am index 1b30e98aa..a239f795b 100644 --- a/src/posix/Makefile.am +++ b/src/posix/Makefile.am @@ -50,6 +50,7 @@ CPPFLAGS_COMMON = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/core \ -I$(top_srcdir)/src/posix/platform \ + -I$(top_srcdir)/src/posix/platform/include \ -D_GNU_SOURCE \ -DOPENTHREAD_FTD=1 \ -DOPENTHREAD_MTD=0 \ diff --git a/src/posix/console_cli.h b/src/posix/console_cli.h index a7c22140e..2728e18e7 100644 --- a/src/posix/console_cli.h +++ b/src/posix/console_cli.h @@ -33,7 +33,7 @@ #include -#include "openthread-system.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/posix/main.c b/src/posix/main.c index 284bc51a1..7f64959bc 100644 --- a/src/posix/main.c +++ b/src/posix/main.c @@ -73,7 +73,7 @@ #else #error "Unknown posix app type!" #endif -#include +#include #ifndef OPENTHREAD_ENABLE_COVERAGE #define OPENTHREAD_ENABLE_COVERAGE 0 diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt index 228155d9a..2d3617c6c 100644 --- a/src/posix/platform/CMakeLists.txt +++ b/src/posix/platform/CMakeLists.txt @@ -73,6 +73,7 @@ target_include_directories(openthread-posix PRIVATE ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core - ${PROJECT_SOURCE_DIR}/src/posix/platform ${PROJECT_SOURCE_DIR}/third_party/mbedtls/repo/include + PUBLIC + ${PROJECT_SOURCE_DIR}/src/posix/platform/include ) diff --git a/src/posix/platform/Makefile.am b/src/posix/platform/Makefile.am index 451e6538e..d0088e154 100644 --- a/src/posix/platform/Makefile.am +++ b/src/posix/platform/Makefile.am @@ -30,15 +30,16 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am lib_LIBRARIES = libopenthread-posix.a -libopenthread_posix_a_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/src/posix/platform \ - -D_GNU_SOURCE \ - -DOPENTHREAD_FTD=1 \ - -DOPENTHREAD_MTD=0 \ - -DOPENTHREAD_RADIO=0 \ +libopenthread_posix_a_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core \ + -I$(top_srcdir)/src/posix/platform \ + -I$(top_srcdir)/src/posix/platform/include \ + -D_GNU_SOURCE \ + -DOPENTHREAD_FTD=1 \ + -DOPENTHREAD_MTD=0 \ + -DOPENTHREAD_RADIO=0 \ $(NULL) libopenthread_posix_a_SOURCES = \ @@ -66,7 +67,7 @@ noinst_HEADERS = \ $(NULL) openthread_HEADERS = \ - openthread-system.h \ + include/openthread/openthread-system.h \ $(NULL) openthreaddir = $(includedir)/openthread @@ -84,11 +85,12 @@ endif # OPENTHREAD_BUILD_COVERAGE check_PROGRAMS = test-settings -test_settings_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/core \ - -DOPENTHREAD_CONFIG_LOG_PLATFORM=0 \ - -DSELF_TEST \ +test_settings_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/core \ + -I$(top_srcdir)/src/posix/platform/include \ + -DOPENTHREAD_CONFIG_LOG_PLATFORM=0 \ + -DSELF_TEST \ $(NULL) test_settings_SOURCES = \ diff --git a/src/posix/platform/openthread-system.h b/src/posix/platform/include/openthread/openthread-system.h similarity index 100% rename from src/posix/platform/openthread-system.h rename to src/posix/platform/include/openthread/openthread-system.h diff --git a/src/posix/platform/platform-posix.h b/src/posix/platform/platform-posix.h index aed45eef2..df2a5858c 100644 --- a/src/posix/platform/platform-posix.h +++ b/src/posix/platform/platform-posix.h @@ -43,9 +43,9 @@ #include #include -#include #include #include +#include #include "common/logging.hpp" diff --git a/src/posix/platform/spi_interface.hpp b/src/posix/platform/spi_interface.hpp index b0ace12fb..621c313b4 100644 --- a/src/posix/platform/spi_interface.hpp +++ b/src/posix/platform/spi_interface.hpp @@ -39,7 +39,7 @@ #include "spinel_interface.hpp" #include "ncp/hdlc.hpp" -#include +#include #if OPENTHREAD_POSIX_RCP_SPI_ENABLE @@ -153,22 +153,22 @@ private: bool CheckInterrupt(void); void HandleReceivedFrame(Ncp::SpiFrame &aSpiFrame); void LogStats(void); - void LogError(const char * aString); + void LogError(const char *aString); void LogBuffer(const char *aDesc, const uint8_t *aBuffer, uint16_t aLength, bool aForce); enum { - kSpiModeMax = 3, - kSpiAlignAllowanceMax = 16, - kSpiFrameHeaderSize = 5, - kSpiBitsPerWord = 8, - kSpiTxRefuseWarnCount = 30, - kSpiTxRefuseExitCount = 100, - kImmediateRetryCount = 5, - kFastRetryCount = 15, - kDebugBytesPerLine = 16, - kGpioIntAssertState = 0, - kGpioResetAssertState = 0, + kSpiModeMax = 3, + kSpiAlignAllowanceMax = 16, + kSpiFrameHeaderSize = 5, + kSpiBitsPerWord = 8, + kSpiTxRefuseWarnCount = 30, + kSpiTxRefuseExitCount = 100, + kImmediateRetryCount = 5, + kFastRetryCount = 15, + kDebugBytesPerLine = 16, + kGpioIntAssertState = 0, + kGpioResetAssertState = 0, }; enum @@ -212,7 +212,7 @@ private: uint64_t mSpiTxFrameCount; uint64_t mSpiTxFrameByteCount; - uint8_t mSpiRxFrameBuffer[kMaxFrameSize + kSpiAlignAllowanceMax]; + uint8_t mSpiRxFrameBuffer[kMaxFrameSize + kSpiAlignAllowanceMax]; bool mSpiTxIsReady; uint16_t mSpiTxRefusedCount;