diff --git a/examples/Makefile.am b/examples/Makefile.am index e0b1051bc..1dd1e0357 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST = \ SUBDIRS = \ platforms \ $(NULL) - + if OPENTHREAD_EXAMPLES SUBDIRS += \ apps \ diff --git a/examples/apps/cli/main.c b/examples/apps/cli/main.c index 9483b2bb9..b787629a0 100644 --- a/examples/apps/cli/main.c +++ b/examples/apps/cli/main.c @@ -33,9 +33,10 @@ #include #include #include -#include #include +#include "platform.h" + #if OPENTHREAD_ENABLE_MULTIPLE_INSTANCES void *otPlatCAlloc(size_t aNum, size_t aSize) { diff --git a/examples/apps/ncp/main.c b/examples/apps/ncp/main.c index 1210aa5ff..0aff87682 100644 --- a/examples/apps/ncp/main.c +++ b/examples/apps/ncp/main.c @@ -33,7 +33,8 @@ #include #include #include -#include + +#include "platform.h" #if OPENTHREAD_ENABLE_MULTIPLE_INSTANCES void *otPlatCAlloc(size_t aNum, size_t aSize) diff --git a/examples/platforms/Makefile.am b/examples/platforms/Makefile.am index 297ece448..fb2641d3c 100644 --- a/examples/platforms/Makefile.am +++ b/examples/platforms/Makefile.am @@ -95,6 +95,10 @@ if OPENTHREAD_EXAMPLES_SAMR21 SUBDIRS += samr21 endif +noinst_HEADERS = \ + platform.h \ + $(NULL) + # Always pretty (e.g. for 'make pretty') these subdirectories. PRETTY_SUBDIRS = \ diff --git a/examples/platforms/cc2538/alarm.c b/examples/platforms/cc2538/alarm.c index d768c79c5..546b1d016 100644 --- a/examples/platforms/cc2538/alarm.c +++ b/examples/platforms/cc2538/alarm.c @@ -39,7 +39,6 @@ #include #include #include -#include #include "platform-cc2538.h" diff --git a/examples/platforms/cc2538/radio.c b/examples/platforms/cc2538/radio.c index d5d444841..b2f745b83 100644 --- a/examples/platforms/cc2538/radio.c +++ b/examples/platforms/cc2538/radio.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "platform-cc2538.h" diff --git a/examples/platforms/cc2652/alarm.c b/examples/platforms/cc2652/alarm.c index 6fd168c8e..61a64950b 100644 --- a/examples/platforms/cc2652/alarm.c +++ b/examples/platforms/cc2652/alarm.c @@ -42,8 +42,6 @@ #include #include -#include - #include "platform-cc2652.h" diff --git a/examples/platforms/cc2652/radio.c b/examples/platforms/cc2652/radio.c index 0890d48a6..b9a15e630 100644 --- a/examples/platforms/cc2652/radio.c +++ b/examples/platforms/cc2652/radio.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include /* to seed the CSMA-CA funciton */ #include diff --git a/examples/platforms/efr32/alarm.c b/examples/platforms/efr32/alarm.c index b553e1700..5a9e735dd 100644 --- a/examples/platforms/efr32/alarm.c +++ b/examples/platforms/efr32/alarm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "utils/code_utils.h" diff --git a/examples/platforms/efr32/radio.c b/examples/platforms/efr32/radio.c index fc27c58a8..8d9a2acb7 100644 --- a/examples/platforms/efr32/radio.c +++ b/examples/platforms/efr32/radio.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/examples/platforms/gp712/alarm.c b/examples/platforms/gp712/alarm.c index d117e048c..dae725b9d 100644 --- a/examples/platforms/gp712/alarm.c +++ b/examples/platforms/gp712/alarm.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include "alarm_qorvo.h" diff --git a/examples/platforms/gp712/radio.c b/examples/platforms/gp712/radio.c index 908bd6b87..99d95ce39 100644 --- a/examples/platforms/gp712/radio.c +++ b/examples/platforms/gp712/radio.c @@ -35,7 +35,6 @@ #include #include -#include #include #include diff --git a/examples/platforms/kw41z/alarm.c b/examples/platforms/kw41z/alarm.c index 1463a78c0..bbb0b9417 100644 --- a/examples/platforms/kw41z/alarm.c +++ b/examples/platforms/kw41z/alarm.c @@ -38,7 +38,6 @@ #include "fsl_pit.h" #include "openthread/openthread.h" -#include "openthread/platform/platform.h" #include "openthread/platform/alarm-milli.h" #include "openthread/platform/diag.h" diff --git a/examples/platforms/nrf52840/alarm.c b/examples/platforms/nrf52840/alarm.c index 4e472d168..20d639365 100644 --- a/examples/platforms/nrf52840/alarm.c +++ b/examples/platforms/nrf52840/alarm.c @@ -43,7 +43,8 @@ #include #include #include -#include + +#include "platform.h" #include "platform-config.h" #include "platform-nrf5.h" diff --git a/examples/platforms/nrf52840/misc.c b/examples/platforms/nrf52840/misc.c index 90905d707..77d776fc5 100644 --- a/examples/platforms/nrf52840/misc.c +++ b/examples/platforms/nrf52840/misc.c @@ -29,7 +29,6 @@ #include #include #include -#include #include diff --git a/examples/platforms/nrf52840/radio.c b/examples/platforms/nrf52840/radio.c index a68ae3b83..8463fa875 100644 --- a/examples/platforms/nrf52840/radio.c +++ b/examples/platforms/nrf52840/radio.c @@ -46,9 +46,9 @@ #include #include #include -#include #include +#include "platform.h" #include "platform-nrf5.h" #include diff --git a/examples/platforms/nrf52840/uart.c b/examples/platforms/nrf52840/uart.c index 94608afd0..b8c556ba2 100644 --- a/examples/platforms/nrf52840/uart.c +++ b/examples/platforms/nrf52840/uart.c @@ -39,11 +39,12 @@ #include #include -#include #include #include #include +#include "platform.h" + #include #include #include diff --git a/include/openthread/platform/platform.h b/examples/platforms/platform.h similarity index 100% rename from include/openthread/platform/platform.h rename to examples/platforms/platform.h diff --git a/examples/platforms/posix/misc.c b/examples/platforms/posix/misc.c index 0dbb69d10..929df0728 100644 --- a/examples/platforms/posix/misc.c +++ b/examples/platforms/posix/misc.c @@ -34,7 +34,8 @@ #include #include -#include + +#include "platform.h" #ifndef _WIN32 extern int gArgumentsCount; diff --git a/examples/platforms/samr21/platform.c b/examples/platforms/samr21/platform.c index 6c708e8e6..e189a0aa2 100644 --- a/examples/platforms/samr21/platform.c +++ b/examples/platforms/samr21/platform.c @@ -34,7 +34,7 @@ #include "asf.h" -#include +#include "platform.h" #include "platform-samr21.h" diff --git a/include/openthread/platform/Makefile.am b/include/openthread/platform/Makefile.am index 56b93958a..745ece16c 100644 --- a/include/openthread/platform/Makefile.am +++ b/include/openthread/platform/Makefile.am @@ -28,14 +28,13 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am -ot_platform_headers =\ +ot_platform_headers = \ alarm-micro.h \ alarm-milli.h \ diag.h \ memory.h \ misc.h \ logging.h \ - platform.h \ radio.h \ random.h \ uart.h \ @@ -45,7 +44,7 @@ ot_platform_headers =\ toolchain.h \ $(NULL) -noinst_HEADERS = \ +noinst_HEADERS = \ debug_uart.h ot_platformdir = $(includedir)/openthread/platform diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 3cd88a558..5b52e25b4 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -51,6 +51,7 @@ if OPENTHREAD_BUILD_TESTS AM_CPPFLAGS = \ -DOPENTHREAD_FTD=1 \ + -I$(top_srcdir)/examples/platforms \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ diff --git a/tests/unit/test_diag.cpp b/tests/unit/test_diag.cpp index bb315b90d..cfbcb7f77 100644 --- a/tests/unit/test_diag.cpp +++ b/tests/unit/test_diag.cpp @@ -27,11 +27,11 @@ */ #include -#include #include #include "utils/wrap_string.h" +#include "platform.h" #include "test_util.h" extern "C" void otTaskletsSignalPending(otInstance *)