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

Merge pull request #1960 from pablocorbalan/rm-rpl-conf-of

Browse source 
Remove definitions of outdated RPL_CONF_OF
This commit is contained in:
Antonio Lignan 2016-12-01 16:30:46 +01:00 committed by GitHub
parent 238e8b4dcf 983d858570
commit 63322fdfb2
6 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/er-rest-example/project-conf.h
View file

@ -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__ */

4
platform/cc2530dk/contiki-conf.h
View file

@ -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

4
platform/cc2538dk/contiki-conf.h
View file

@ -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

4
platform/openmote-cc2538/contiki-conf.h
View file

@ -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

4
platform/srf06-cc26xx/contiki-conf.h
View file

@ -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

4
platform/zoul/contiki-conf.h
View file

@ -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