Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-08-12 06:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Move compower configuration out of the non-IPv6 conditional clause.

Browse Source
This commit is contained in:
nvt
2011-10-10 22:11:29 +02:00
parent 6611291dd0
commit 4f3528f7ed
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/sky/contiki-conf.h
View File

@@ -34,6 +34,11 @@
#define CC2420_CONF_AUTOACK 1 #define CC2420_CONF_AUTOACK 1
#endif /* CC2420_CONF_AUTOACK */ #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 #if WITH_UIP6
/* Network setup for IPv6 */ /* Network setup for IPv6 */
@@ -64,10 +69,6 @@
#define XMAC_CONF_ANNOUNCEMENTS 0 #define XMAC_CONF_ANNOUNCEMENTS 0
#define CONTIKIMAC_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 #ifndef COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS
#define COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS 32 #define COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS 32
#endif /* COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS */ #endif /* COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS */