deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid multiple definitions of NETSTACK_CONF_MAC. Turn on RPL by default.

Browse source
This commit is contained in:
Adam Dunkels 2012-11-21 19:48:54 +01:00
parent d51d3f6b3e
commit 91206e2249
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/micaz/contiki-conf.h
View file

@ -71,7 +71,6 @@
#define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_NETWORK rime_driver
#define NETSTACK_CONF_MAC csma_driver #define NETSTACK_CONF_MAC csma_driver
#define NETSTACK_CONF_MAC nullmac_driver
#define NETSTACK_CONF_RDC cxmac_driver #define NETSTACK_CONF_RDC cxmac_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
@ -116,7 +115,7 @@
#define UIP_CONF_LLH_LEN 0 #define UIP_CONF_LLH_LEN 0
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0
#define UIP_CONF_IPV6_RPL 0 #define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5 #define UIP_CONF_DS6_NBR_NBU 5