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

Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*

Browse source
This commit is contained in:
Simon Duquennoy 2014-12-01 21:02:57 +01:00
parent 229c53a2e6
commit a9cc909794
107 changed files with 617 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

12
platform/eval-adf7xxxmb4z/contiki-main.c
View file

@ -45,9 +45,9 @@
#include "dev/button-sensor.h"
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include "net/rime/rime.h"
#include "uart0.h"
@ -76,7 +76,7 @@ set_rime_addr(void)
int i;
memset(&addr, 0, sizeof(linkaddr_t));
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(addr.u8, serial_id, sizeof(addr.u8));
#else
if(node_id == 0) {
@ -158,7 +158,7 @@ main(int argc, char **argv)
PM3 &= ~BIT(0); /* LED7 */
PM5 &= ~BIT(0); /* LED8 */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#if UIP_CONF_IPV6_RPL
printf(CONTIKI_VERSION_STRING " started with IPV6, RPL" NEWLINE);
#else
@ -183,7 +183,7 @@ main(int argc, char **argv)
netstack_init();
printf("MAC %s RDC %s NETWORK %s" NEWLINE, NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_NETWORK.name);
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, serial_id, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL);
@ -201,7 +201,7 @@ main(int argc, char **argv)
printf("%02x%02x" NEWLINE, lladdr->ipaddr.u8[14], lladdr->ipaddr.u8[15]);
}
#elif UIP_CONF_IPV4
#elif NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif