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

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

@ -54,13 +54,13 @@
#endif /* __CYGWIN__ */
#ifdef __CYGWIN__
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_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
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &tapdev_process, &tcpip_process, &serial_line_process);
#else
PROCINIT(&etimer_process, &tapdev_process, &serial_line_process);
@ -143,7 +143,7 @@ PROCESS_THREAD(border_router_process, ev, data)
}
#endif /* RPL_BORDER_ROUTER */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/*---------------------------------------------------------------------------*/
static void
sprint_ip6(uip_ip6addr_t addr)
@ -182,7 +182,7 @@ sprint_ip6(uip_ip6addr_t addr)
*result=0;
printf("%s", thestring);
}
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
/*---------------------------------------------------------------------------*/
int contiki_argc = 0;
char **contiki_argv;
@ -206,7 +206,7 @@ main(int argc, char **argv)
#endif
clock_init();
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
/* A hard coded address overrides the stack default MAC address to
allow multiple instances. uip6.c defines it as
{0x00,0x06,0x98,0x00,0x02,0x32} giving an ipv6 address of
@ -237,7 +237,7 @@ main(int argc, char **argv)
}
}
#endif /* HARD_CODED_ADDRESS */
#endif /* UIP_CONF_IPV6 */
#endif /* NETSTACK_CONF_WITH_IPV6 */
process_init();
/* procinit_init initializes RPL which sets a ctimer for the first DIS */
@ -256,7 +256,7 @@ main(int argc, char **argv)
autostart_start(autostart_processes);
/* Set default IP addresses if not specified */
#if !UIP_CONF_IPV6
#if !NETSTACK_CONF_WITH_IPV6
{
uip_ipaddr_t addr;
@ -281,7 +281,7 @@ main(int argc, char **argv)
}
printf("Def. Router: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&addr));
}
#else /* UIP_CONF_IPV6 */
#else /* NETSTACK_CONF_WITH_IPV6 */
#if !UIP_CONF_IPV6_RPL
{
@ -313,7 +313,7 @@ main(int argc, char **argv)
}
#endif /* !UIP_CONF_IPV6_RPL */
#endif /* !UIP_CONF_IPV6 */
#endif /* !NETSTACK_CONF_WITH_IPV6 */
// procinit_init();
// autostart_start(autostart_processes);
@ -323,7 +323,7 @@ main(int argc, char **argv)
printf("\n*******%s online*******\n",CONTIKI_VERSION_STRING);
#if UIP_CONF_IPV6 && !RPL_BORDER_ROUTER /* Border router process prints addresses later */
#if NETSTACK_CONF_WITH_IPV6 && !RPL_BORDER_ROUTER /* Border router process prints addresses later */
{
int i = 0;
int interface_count = 0;