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

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

@ -82,13 +82,13 @@ FUSES =
};
#if RF230BB
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
//PROCINIT(&etimer_process, &tcpip_process );
#else
//PROCINIT(&etimer_process );
#endif
#else
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
PROCINIT(&etimer_process, &mac_process, &tcpip_process );
#else
PROCINIT(&etimer_process, &mac_process );
@ -132,7 +132,7 @@ init_lowlevel(void)
memset(&addr, 0, sizeof(linkaddr_t));
eeprom_read_block ((void *)&addr.u8, &mac_address, 8);
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
memcpy(&uip_lladdr.addr, &addr.u8, 8);
#endif
rf230_set_pan_addr(IEEE802154_PANID, 0, (uint8_t *)&addr.u8);
@ -170,13 +170,13 @@ init_lowlevel(void)
rime_init(rime_udp_init(NULL));
uip_router_register(&rimeroute);
#endif
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_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
#if NETSTACK_CONF_WITH_IPV6 || NETSTACK_CONF_WITH_IPV4
process_start(&tcpip_process, NULL);
#endif
#endif /*RF230BB*/

6
platform/avr-zigbit/contiki-conf.h
View file

@ -98,8 +98,8 @@ void clock_adjust_ticks(clock_time_t howmany);
#define LINKADDR_CONF_SIZE 8
#define PACKETBUF_CONF_HDR_SIZE 0
//define UIP_CONF_IPV6 1 //Let the makefile do this, allows hello-world to compile
#if UIP_CONF_IPV6
//define NETSTACK_CONF_WITH_IPV6 1 //Let the makefile do this, allows hello-world to compile
#if NETSTACK_CONF_WITH_IPV6
#define UIP_CONF_ICMP6 1
#define UIP_CONF_UDP 1
#define UIP_CONF_TCP 1
@ -113,7 +113,7 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_LLH_LEN 0
/* No radio cycling */
#if UIP_CONF_IPV6
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_CONF_NETWORK sicslowpan_driver
#else
#define NETSTACK_CONF_NETWORK rime_driver