diff --git a/src/posix/client.c b/src/posix/client.c index a8a37f95e..dfd88fc54 100644 --- a/src/posix/client.c +++ b/src/posix/client.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "openthread-core-config.h" +#include "platform/openthread-posix-config.h" #include diff --git a/src/posix/console_cli.h b/src/posix/console_cli.h index 41b0f9855..10732ff1a 100644 --- a/src/posix/console_cli.h +++ b/src/posix/console_cli.h @@ -29,6 +29,8 @@ #ifndef OPENTHREAD_CONSOLE_CLI_H_ #define OPENTHREAD_CONSOLE_CLI_H_ +#include "platform/openthread-posix-config.h" + #include #include "openthread-system.h" diff --git a/src/posix/main.c b/src/posix/main.c index 144de83a7..eaa955bd2 100644 --- a/src/posix/main.c +++ b/src/posix/main.c @@ -26,6 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "platform/openthread-posix-config.h" + #include #include diff --git a/src/posix/platform/Makefile.am b/src/posix/platform/Makefile.am index 3d36340f7..1772a3a44 100644 --- a/src/posix/platform/Makefile.am +++ b/src/posix/platform/Makefile.am @@ -58,6 +58,7 @@ libopenthread_posix_a_SOURCES = \ $(NULL) noinst_HEADERS = \ + openthread-posix-config.h \ platform-posix.h \ hdlc_interface.hpp \ radio_spinel.hpp \ diff --git a/src/posix/platform/alarm.c b/src/posix/platform/alarm.c index 778efe9bc..00dd1ffc5 100644 --- a/src/posix/platform/alarm.c +++ b/src/posix/platform/alarm.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/entropy.c b/src/posix/platform/entropy.c index b31b78cdc..c7d2523c9 100644 --- a/src/posix/platform/entropy.c +++ b/src/posix/platform/entropy.c @@ -32,9 +32,9 @@ * */ -#include +#include "openthread-posix-config.h" -#include "openthread-core-config.h" +#include #include #include diff --git a/src/posix/platform/hdlc_interface.cpp b/src/posix/platform/hdlc_interface.cpp index 0b908643e..1bbd24b27 100644 --- a/src/posix/platform/hdlc_interface.cpp +++ b/src/posix/platform/hdlc_interface.cpp @@ -31,11 +31,10 @@ * This file includes the implementation for the HDLC interface to radio (RCP). */ -#include "openthread-core-config.h" -#include "platform-posix.h" - #include "hdlc_interface.hpp" +#include "platform-posix.h" + #include #include #include diff --git a/src/posix/platform/hdlc_interface.hpp b/src/posix/platform/hdlc_interface.hpp index 14b321aed..34948ea2c 100644 --- a/src/posix/platform/hdlc_interface.hpp +++ b/src/posix/platform/hdlc_interface.hpp @@ -34,7 +34,8 @@ #ifndef POSIX_APP_HDLC_INTERFACE_HPP_ #define POSIX_APP_HDLC_INTERFACE_HPP_ -#include "platform-config.h" +#include "openthread-posix-config.h" +#include "platform-posix.h" #include "spinel_interface.hpp" #include "ncp/hdlc.hpp" diff --git a/src/posix/platform/logging.c b/src/posix/platform/logging.c index 0903bdbc7..717156d54 100644 --- a/src/posix/platform/logging.c +++ b/src/posix/platform/logging.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/misc.c b/src/posix/platform/misc.c index 3c08fa101..649d7b250 100644 --- a/src/posix/platform/misc.c +++ b/src/posix/platform/misc.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/netif.cpp b/src/posix/platform/netif.cpp index c86a3fd6c..f5c60bf78 100644 --- a/src/posix/platform/netif.cpp +++ b/src/posix/platform/netif.cpp @@ -30,7 +30,8 @@ * @file * This file implements the platform network on Linux. */ -#include "openthread-core-config.h" + +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/platform-config.h b/src/posix/platform/openthread-posix-config.h similarity index 98% rename from src/posix/platform/platform-config.h rename to src/posix/platform/openthread-posix-config.h index 1508fc3ff..6d8ab5820 100644 --- a/src/posix/platform/platform-config.h +++ b/src/posix/platform/openthread-posix-config.h @@ -29,6 +29,8 @@ #ifndef OPENTHREAD_PLATFORM_CONFIG_H_ #define OPENTHREAD_PLATFORM_CONFIG_H_ +#include "openthread-core-config.h" + /** * @file * @brief diff --git a/src/posix/platform/platform-posix.h b/src/posix/platform/platform-posix.h index d2a19cc0d..08b687702 100644 --- a/src/posix/platform/platform-posix.h +++ b/src/posix/platform/platform-posix.h @@ -35,6 +35,8 @@ #ifndef PLATFORM_POSIX_H_ #define PLATFORM_POSIX_H_ +#include "openthread-posix-config.h" + #include #include #include @@ -45,7 +47,6 @@ #include #include -#include "platform-config.h" #include "common/logging.hpp" /** diff --git a/src/posix/platform/radio_spinel.cpp b/src/posix/platform/radio_spinel.cpp index 2f8048ed0..a0dd5c09a 100644 --- a/src/posix/platform/radio_spinel.cpp +++ b/src/posix/platform/radio_spinel.cpp @@ -31,12 +31,11 @@ * This file implements the spinel based radio transceiver. */ -#include "openthread-core-config.h" +#include "radio_spinel.hpp" + #include "platform-posix.h" #include "ncp/spinel_decoder.hpp" -#include "radio_spinel.hpp" - #include #include #include diff --git a/src/posix/platform/radio_spinel.hpp b/src/posix/platform/radio_spinel.hpp index 76761aed4..48c97ba3e 100644 --- a/src/posix/platform/radio_spinel.hpp +++ b/src/posix/platform/radio_spinel.hpp @@ -34,6 +34,8 @@ #ifndef RADIO_SPINEL_HPP_ #define RADIO_SPINEL_HPP_ +#include "openthread-posix-config.h" + #include #if OPENTHREAD_POSIX_RCP_UART_ENABLE diff --git a/src/posix/platform/settings.cpp b/src/posix/platform/settings.cpp index 3263af169..e408cea93 100644 --- a/src/posix/platform/settings.cpp +++ b/src/posix/platform/settings.cpp @@ -32,7 +32,7 @@ * */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/sim.c b/src/posix/platform/sim.c index 5ff05d9d8..7d03e6cfe 100644 --- a/src/posix/platform/sim.c +++ b/src/posix/platform/sim.c @@ -32,7 +32,7 @@ * This file implements the posix simulation. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/spi_interface.cpp b/src/posix/platform/spi_interface.cpp index eb3c77c1a..121079236 100644 --- a/src/posix/platform/spi_interface.cpp +++ b/src/posix/platform/spi_interface.cpp @@ -31,10 +31,9 @@ * This file includes the implementation for the SPI interface to radio (RCP). */ -#include "openthread-core-config.h" +#include "spi_interface.hpp" #include "platform-posix.h" -#include "spi_interface.hpp" #include #include diff --git a/src/posix/platform/spi_interface.hpp b/src/posix/platform/spi_interface.hpp index 3338d769d..b0ace12fb 100644 --- a/src/posix/platform/spi_interface.hpp +++ b/src/posix/platform/spi_interface.hpp @@ -34,6 +34,8 @@ #ifndef POSIX_APP_SPI_INTERFACE_HPP_ #define POSIX_APP_SPI_INTERFACE_HPP_ +#include "openthread-posix-config.h" + #include "spinel_interface.hpp" #include "ncp/hdlc.hpp" @@ -164,7 +166,7 @@ private: kSpiTxRefuseExitCount = 100, kImmediateRetryCount = 5, kFastRetryCount = 15, - kDebugBytesPerLine = 16, + kDebugBytesPerLine = 16, kGpioIntAssertState = 0, kGpioResetAssertState = 0, }; diff --git a/src/posix/platform/spinel_interface.hpp b/src/posix/platform/spinel_interface.hpp index 0e016c761..decfefb2c 100644 --- a/src/posix/platform/spinel_interface.hpp +++ b/src/posix/platform/spinel_interface.hpp @@ -35,6 +35,8 @@ #ifndef POSIX_APP_SPINEL_INTERFACE_HPP_ #define POSIX_APP_SPINEL_INTERFACE_HPP_ +#include "openthread-posix-config.h" + #include "ncp/hdlc.hpp" namespace ot { diff --git a/src/posix/platform/system.c b/src/posix/platform/system.c index 8fbc117c1..381695a90 100644 --- a/src/posix/platform/system.c +++ b/src/posix/platform/system.c @@ -32,7 +32,7 @@ * This file includes the platform-specific initializers. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include diff --git a/src/posix/platform/uart.c b/src/posix/platform/uart.c index b8ffa9a2e..af621181e 100644 --- a/src/posix/platform/uart.c +++ b/src/posix/platform/uart.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #if OPENTHREAD_ENABLE_POSIX_APP_DAEMON diff --git a/src/posix/platform/udp.cpp b/src/posix/platform/udp.cpp index 46616f8fc..587714f8c 100644 --- a/src/posix/platform/udp.cpp +++ b/src/posix/platform/udp.cpp @@ -36,7 +36,7 @@ #define __APPLE_USE_RFC_3542 #endif -#include "openthread-core-config.h" +#include "openthread-posix-config.h" #include "platform-posix.h" #include