From 983d85857084220decf9141c4b5bf2415085dce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Corbal=C3=A1n?= Date: Thu, 1 Dec 2016 13:13:41 +0100 Subject: [PATCH] Remove definitions of outdated RPL_CONF_OF --- examples/er-rest-example/project-conf.h | 5 +---- platform/cc2530dk/contiki-conf.h | 4 ---- platform/cc2538dk/contiki-conf.h | 4 ---- platform/openmote-cc2538/contiki-conf.h | 4 ---- platform/srf06-cc26xx/contiki-conf.h | 4 ---- platform/zoul/contiki-conf.h | 4 ---- 6 files changed, 1 insertion(+), 24 deletions(-) diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h index adcb75ee1..450a4215d 100644 --- a/examples/er-rest-example/project-conf.h +++ b/examples/er-rest-example/project-conf.h @@ -96,13 +96,10 @@ #undef COAP_PROXY_OPTION_PROCESSING #define COAP_PROXY_OPTION_PROCESSING 0 -/* Turn of DAO ACK to make code smaller */ +/* Turn off DAO ACK to make code smaller */ #undef RPL_CONF_WITH_DAO_ACK #define RPL_CONF_WITH_DAO_ACK 0 -#undef RPL_CONF_OF -#define RPL_CONF_OF rpl_of0 - /* Enable client-side support for COAP observe */ #define COAP_OBSERVE_CLIENT 1 #endif /* __PROJECT_ERBIUM_CONF_H__ */ diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 527ee2aba..0ec4836a5 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -220,10 +220,6 @@ #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 -#ifndef RPL_CONF_OF -#define RPL_CONF_OF rpl_mrhof -#endif - #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h index c8b0a216e..54206b242 100644 --- a/platform/cc2538dk/contiki-conf.h +++ b/platform/cc2538dk/contiki-conf.h @@ -424,10 +424,6 @@ typedef uint32_t rtimer_clock_t; #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 -#ifndef RPL_CONF_OF -#define RPL_CONF_OF rpl_mrhof -#endif - #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 diff --git a/platform/openmote-cc2538/contiki-conf.h b/platform/openmote-cc2538/contiki-conf.h index 8b7e8e869..b4569b34e 100644 --- a/platform/openmote-cc2538/contiki-conf.h +++ b/platform/openmote-cc2538/contiki-conf.h @@ -476,10 +476,6 @@ typedef uint32_t rtimer_clock_t; #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 -#ifndef RPL_CONF_OF -#define RPL_CONF_OF rpl_mrhof -#endif - #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h index d3df471c0..eb2612efc 100644 --- a/platform/srf06-cc26xx/contiki-conf.h +++ b/platform/srf06-cc26xx/contiki-conf.h @@ -221,10 +221,6 @@ #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 -#ifndef RPL_CONF_OF -#define RPL_CONF_OF rpl_mrhof -#endif - #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 diff --git a/platform/zoul/contiki-conf.h b/platform/zoul/contiki-conf.h index 2288e1bc9..dd11aea7c 100644 --- a/platform/zoul/contiki-conf.h +++ b/platform/zoul/contiki-conf.h @@ -493,10 +493,6 @@ typedef uint32_t rtimer_clock_t; #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 -#ifndef RPL_CONF_OF -#define RPL_CONF_OF rpl_mrhof -#endif - #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000