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

Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack.

Browse source
This commit is contained in:
Simon Duquennoy 2014-11-12 10:18:29 +01:00
parent d3d33c5699
commit 722b3258d1
161 changed files with 475 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platform/minimal-net/contiki-main.c
View file

@ -54,9 +54,17 @@
#endif /* __CYGWIN__ */
#ifdef __CYGWIN__
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
PROCINIT(&etimer_process, &tcpip_process, &wpcap_process, &serial_line_process);
#else
PROCINIT(&etimer_process, &wpcap_process, &serial_line_process);
#endif
#else /* __CYGWIN__ */
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
PROCINIT(&etimer_process, &tapdev_process, &tcpip_process, &serial_line_process);
#else
PROCINIT(&etimer_process, &tapdev_process, &serial_line_process);
#endif
#endif /* __CYGWIN__ */
#if RPL_BORDER_ROUTER