From e6ba2664b8fae777cd6818ac17292d07ac919558 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Tue, 31 Oct 2017 22:12:47 +0100 Subject: [PATCH] energest: removed include of energest from contiki.h to avoid circular dependency --- arch/dev/cc1200/cc1200.c | 1 + arch/dev/cc2420/cc2420.c | 1 + arch/platform/jn516x/dev/micromac-radio.c | 1 + arch/platform/jn516x/platform.c | 1 + arch/platform/sky/platform.c | 1 + os/contiki-main.c | 1 + os/contiki.h | 2 -- os/sys/energest.c | 2 +- 8 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/dev/cc1200/cc1200.c b/arch/dev/cc1200/cc1200.c index 78f3791610b..3d9b1befce0 100644 --- a/arch/dev/cc1200/cc1200.c +++ b/arch/dev/cc1200/cc1200.c @@ -40,6 +40,7 @@ #include "net/netstack.h" #include "net/packetbuf.h" #include "dev/watchdog.h" +#include "sys/energest.h" #include "dev/leds.h" diff --git a/arch/dev/cc2420/cc2420.c b/arch/dev/cc2420/cc2420.c index a9f56d8a984..00ec6467572 100644 --- a/arch/dev/cc2420/cc2420.c +++ b/arch/dev/cc2420/cc2420.c @@ -36,6 +36,7 @@ #include #include "contiki.h" +#include "sys/energest.h" #include "dev/leds.h" #include "dev/spi.h" diff --git a/arch/platform/jn516x/dev/micromac-radio.c b/arch/platform/jn516x/dev/micromac-radio.c index 6e221c72f0c..c3117c6f8e3 100644 --- a/arch/platform/jn516x/dev/micromac-radio.c +++ b/arch/platform/jn516x/dev/micromac-radio.c @@ -44,6 +44,7 @@ #include "contiki.h" #include "dev/leds.h" #include "sys/rtimer.h" +#include "sys/energest.h" #include "net/packetbuf.h" #include "net/netstack.h" #include "net/mac/framer/frame802154.h" diff --git a/arch/platform/jn516x/platform.c b/arch/platform/jn516x/platform.c index f1f4ad4316e..20dabfb61a7 100644 --- a/arch/platform/jn516x/platform.c +++ b/arch/platform/jn516x/platform.c @@ -52,6 +52,7 @@ #include "dev/uart-driver.h" #include "contiki.h" +#include "sys/energest.h" #include "net/netstack.h" #include "dev/serial-line.h" diff --git a/arch/platform/sky/platform.c b/arch/platform/sky/platform.c index 24296653f13..b14858d9a82 100644 --- a/arch/platform/sky/platform.c +++ b/arch/platform/sky/platform.c @@ -31,6 +31,7 @@ #include #include #include "contiki.h" +#include "sys/energest.h" #include "cc2420.h" #include "dev/ds2411/ds2411.h" #include "dev/leds.h" diff --git a/os/contiki-main.c b/os/contiki-main.c index b7813847273..a995d5ee515 100644 --- a/os/contiki-main.c +++ b/os/contiki-main.c @@ -43,6 +43,7 @@ #include "contiki.h" #include "contiki-net.h" #include "sys/platform.h" +#include "sys/energest.h" #include "dev/watchdog.h" #if BUILD_WITH_ORCHESTRA diff --git a/os/contiki.h b/os/contiki.h index a929afebae1..a964758f4c3 100644 --- a/os/contiki.h +++ b/os/contiki.h @@ -49,6 +49,4 @@ #include "sys/clock.h" -#include "sys/energest.h" - #endif /* CONTIKI_H_ */ diff --git a/os/sys/energest.c b/os/sys/energest.c index 3fbb8f46faf..beaf411bc95 100644 --- a/os/sys/energest.c +++ b/os/sys/energest.c @@ -37,8 +37,8 @@ * Adam Dunkels */ -#include "sys/energest.h" #include "contiki.h" +#include "sys/energest.h" #if ENERGEST_CONF_ON