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

Include the core/net and core/net/ip modules in the core/net/ipv4 module

Browse source
This commit is contained in:
Adam Dunkels 2013-11-26 16:17:39 +01:00
parent d10a0f8830
commit c80615913f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/ipv4/Makefile.core-net-ipv4
View file

@ -1,3 +1,9 @@
core-net-ipv4_src = \ core-net-ipv4_src = \
uaodv-rt.c uip.c uip-fw-drv.c uip-over-mesh.c \ uaodv-rt.c uip.c uip-fw-drv.c uip-over-mesh.c \
uaodv.c uip_arp.c uip-fw.c uip-neighbor.c uaodv.c uip_arp.c uip-fw.c uip-neighbor.c
MODULES += core/net core/net/ip
include $(CONTIKI)/core/net/Makefile.core-net
include $(CONTIKI)/core/net/ip/Makefile.core-net-ip

2
platform/sky/contiki-sky-main.c
View file

@ -79,7 +79,7 @@ extern int msp430_dco_required;
#if WITH_UIP #if WITH_UIP
#include "net/ip/uip.h" #include "net/ip/uip.h"
#include "net/ipv4/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h" #include "net/ipv4/uip-fw-drv.h"
#include "net/ipv4/uip-over-mesh.h" #include "net/ipv4/uip-over-mesh.h"
static struct uip_fw_netif slipif = static struct uip_fw_netif slipif =
{UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)}; {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)};