From 4f3528f7ed6da5885aac4740524b7a47150ce799 Mon Sep 17 00:00:00 2001 From: nvt Date: Mon, 10 Oct 2011 22:11:29 +0200 Subject: [PATCH] Move compower configuration out of the non-IPv6 conditional clause. --- platform/sky/contiki-conf.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h index 9794f39df..0534385b4 100644 --- a/platform/sky/contiki-conf.h +++ b/platform/sky/contiki-conf.h @@ -34,6 +34,11 @@ #define CC2420_CONF_AUTOACK 1 #endif /* CC2420_CONF_AUTOACK */ +/* Specify whether the RDC layer should enable + per-packet power profiling. */ +#define CONTIKIMAC_CONF_COMPOWER 1 +#define XMAC_CONF_COMPOWER 1 +#define CXMAC_CONF_COMPOWER 1 #if WITH_UIP6 /* Network setup for IPv6 */ @@ -64,10 +69,6 @@ #define XMAC_CONF_ANNOUNCEMENTS 0 #define CONTIKIMAC_CONF_ANNOUNCEMENTS 0 -#define CONTIKIMAC_CONF_COMPOWER 1 -#define XMAC_CONF_COMPOWER 1 -#define CXMAC_CONF_COMPOWER 1 - #ifndef COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS #define COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS 32 #endif /* COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS */