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

2
tools/stm32w/uip6_bridge/Makefile
View file

@ -7,7 +7,6 @@ endif
endif
DEFINES=PROJECT_CONF_H=\"bridge-conf.h\"
UIP_CONF_IPV6=1
ifndef TARGET
TARGET=mbxxx
@ -18,4 +17,5 @@ PROJECT_SOURCEFILES = fakeuip.c sicslow_ethernet.c slip.c
all: uip6-bridge-tap
CONTIKI_WITH_IPV6 = 1
include $(CONTIKI)/Makefile.include

4
tools/stm32w/uip6_bridge/dev/slip.c
View file

@ -115,7 +115,7 @@ slip_set_tcpip_input_callback(void (*c)(void))
tcpip_input_callback = c;
}
/*---------------------------------------------------------------------------*/
#if WITH_UIP
#if UIP_CONF_IPV4
uint8_t
slip_send(void)
{
@ -144,7 +144,7 @@ slip_send(void)
return UIP_FW_OK;
}
#endif /* WITH_UIP */
#endif /* UIP_CONF_IPV4 */
/*---------------------------------------------------------------------------*/
uint8_t
slip_write(const void *_ptr, int len)