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

22
platform/micaz/init-net.c
View file

@ -54,11 +54,11 @@
#include "dev/ds2401.h"
#include "sys/node-id.h"
#if WITH_UIP6
#if UIP_CONF_IPV6
#include "net/ipv6/uip-ds6.h"
#endif /* WITH_UIP6 */
#endif /* UIP_CONF_IPV6 */
#if WITH_UIP
#if UIP_CONF_IPV4
#include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h"
@ -70,7 +70,7 @@ static struct uip_fw_netif meshif =
static uint8_t is_gateway;
#endif /* WITH_UIP */
#endif /* UIP_CONF_IPV4 */
#define UIP_OVER_MESH_CHANNEL 8
@ -103,7 +103,7 @@ set_rime_addr(void)
}
/*--------------------------------------------------------------------------*/
#if WITH_UIP
#if UIP_CONF_IPV4
static void
set_gateway(void)
{
@ -118,7 +118,7 @@ set_gateway(void)
is_gateway = 1;
}
}
#endif /* WITH_UIP */
#endif /* UIP_CONF_IPV4 */
/*---------------------------------------------------------------------------*/
void
init_net(void)
@ -141,7 +141,7 @@ init_net(void)
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
}
#if WITH_UIP6
#if UIP_CONF_IPV6
memcpy(&uip_lladdr.addr, ds2401_id, sizeof(uip_lladdr.addr));
/* Setup nullmac-like MAC for 802.15.4 */
/* sicslowpan_init(sicslowmac_init(&cc2420_driver)); */
@ -188,7 +188,7 @@ init_net(void)
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
}
#else /* WITH_UIP6 */
#else /* UIP_CONF_IPV6 */
NETSTACK_RDC.init();
NETSTACK_MAC.init();
@ -199,10 +199,10 @@ init_net(void)
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1:
NETSTACK_RDC.channel_check_interval()),
CC2420_CONF_CHANNEL);
#endif /* WITH_UIP6 */
#endif /* UIP_CONF_IPV6 */
#if WITH_UIP
#if UIP_CONF_IPV4
uip_ipaddr_t hostaddr, netmask;
uip_init();
@ -236,7 +236,7 @@ init_net(void)
uip_over_mesh_init(UIP_OVER_MESH_CHANNEL);
printf_P(PSTR("uIP started with IP address %d.%d.%d.%d\n"),
uip_ipaddr_to_quad(&hostaddr));
#endif /* WITH_UIP */
#endif /* UIP_CONF_IPV4 */