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

14
platform/avr-zigbit/contiki-avr-zigbit-main.c
View file

@ -82,9 +82,17 @@ FUSES =
};
#if RF230BB
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
//PROCINIT(&etimer_process, &tcpip_process );
#else
//PROCINIT(&etimer_process );
#endif
#else
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
PROCINIT(&etimer_process, &mac_process, &tcpip_process );
#else
PROCINIT(&etimer_process, &mac_process );
#endif
#endif
/* Put default MAC address in EEPROM */
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
@ -162,13 +170,15 @@ init_lowlevel(void)
rime_init(rime_udp_init(NULL));
uip_router_register(&rimeroute);
#endif
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
process_start(&tcpip_process, NULL);
#endif
#else
/* mac process must be started before tcpip process! */
process_start(&mac_process, NULL);
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
process_start(&tcpip_process, NULL);
#endif
#endif /*RF230BB*/
}