giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Various fixes to netstack config

Browse Source
This commit is contained in:
Simon Duquennoy 2017-10-08 14:47:34 +02:00
parent db344197d4
commit fb0de6dd7a
9 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/cpu/native/Makefile.native
View File

@ -29,7 +29,9 @@ LDFLAGS += -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
endif
endif
MAKE_MAC ?= MAKE_MAC_NULLMAC
### Compilation rules
%.so: $(OBJECTDIR)/%.o
$(LD) -shared -o $@ $^
$(LD) -shared -o $@ $^

4
arch/cpu/nrf52832/Makefile.nrf52832
View File

@ -11,6 +11,10 @@ ifeq ($(NRF52_JLINK_PATH),)
endif
endif
# custom MAC: ble_ipsp_mac_driver
MAKE_MAC ?= MAKE_MAC_OTHER
# we only support IPv6
MAKE_NET ?= MAKE_NET_IPV6
ifneq ($(MAKE_NET),MAKE_NET_IPV6)
$(error Only IPv6 stack is supported!)

4
arch/platform/native/contiki-conf.h
View File

@ -72,10 +72,6 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_NETWORK tun6_net_driver
#endif
#ifndef NETSTACK_CONF_MAC
#define NETSTACK_CONF_MAC nullmac_driver
#endif /* NETSTACK_CONF_MAC */
#ifndef NETSTACK_CONF_RADIO
#define NETSTACK_CONF_RADIO nullradio_driver
#endif /* NETSTACK_CONF_RADIO */

4
examples/6tisch/etsi-plugtest-2017/Makefile
View File

@ -7,7 +7,7 @@ CFLAGS += -DWITH_SECURITY=1
endif
MODULES += os/services/shell
MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop
MODULES += os/net/mac/tsch/sixtop
PROJECT_SOURCEFILES += sf-plugtest.c
CFLAGS += -Wno-nonnull-compare
@ -17,5 +17,7 @@ CFLAGS += -DSET_CCFG_CCFG_TAP_DAP_0_CPU_DAP_ENABLE=0xC5
CFLAGS += -DSET_CCFG_CCFG_TAP_DAP_0_TEST_TAP_ENABLE=0xC5
endif
MAKE_MAC = MAKE_MAC_TSCH
CONTIKI =../../..
include $(CONTIKI)/Makefile.include

4
examples/6tisch/etsi-plugtest-2017/project-conf.h
View File

@ -47,10 +47,6 @@
/********************* Enable TSCH *********************/
/*******************************************************/
/* Netstack layers */
#undef NETSTACK_CONF_MAC
#define NETSTACK_CONF_MAC tschmac_driver
/* TSCH and RPL callbacks */
#define RPL_CALLBACK_PARENT_SWITCH tsch_rpl_callback_parent_switch
#define RPL_CALLBACK_NEW_DIO_INTERVAL tsch_rpl_callback_new_dio_interval

1
examples/ipv6/native-border-router/Makefile
View File

@ -16,6 +16,7 @@ MODULES += $(WITH_WEBSERVER)
CFLAGS += -DWEBSERVER=2
endif
MAKE_MAC = MAKE_MAC_OTHER
MAKE_NET = MAKE_NET_IPV6
include $(CONTIKI)/Makefile.include

2
examples/sensniff/Makefile
View File

@ -17,6 +17,8 @@ endif
all: $(CONTIKI_PROJECT)
# use a custom MAC driver: sensniff_mac_driver
MAKE_MAC = MAKE_MAC_OTHER
CONTIKI = ../..
include $(CONTIKI)/Makefile.include

4
os/net/netstack.h
View File

@ -47,7 +47,7 @@
via the flag MAC_NET */
#ifdef NETSTACK_CONF_NETWORK
#define NETSTACK_NETWORK NETSTACK_CONF_NETWORK
#else
#else /* NETSTACK_CONF_NETWORK */
#if NETSTACK_CONF_WITH_IPV6
#define NETSTACK_NETWORK sicslowpan_driver
#elif NETSTACK_CONF_WITH_NULLNET
@ -61,7 +61,7 @@
via the flag MAKE_MAC */
#ifdef NETSTACK_CONF_MAC
#define NETSTACK_MAC NETSTACK_CONF_MAC
#else
#else /* NETSTACK_CONF_MAC */
#if MAC_CONF_WITH_NULLMAC
#define NETSTACK_MAC nullmac_driver
#elif MAC_CONF_WITH_CSMA

5
tests/16-6tisch/code/Makefile
View File

@ -1,7 +1,7 @@
all:
APPS += unit-test
MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop
MODULES += os/net/mac/tsch/sixtop
PROJECT_SOURCEFILES += common.c
@ -10,5 +10,6 @@ CFLAGS += -DSIXP_MSG_API_TEST=1
endif
CONTIKI = ../../..
# MAC layer set as TSCH even though we actually use test_mac_driver
MAKE_MAC = MAKE_MAC_TSCH
include $(CONTIKI)/Makefile.include