riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3162 from haukepetersen/fix_native_netifinit

Browse Source 
board/native: adapted Makefile.dep for netif init
This commit is contained in:
Martine Lenders 2015-06-11 17:00:15 +02:00
commit 1487b1c84a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.pseudomodules
View File

@ -1,5 +1,6 @@
PSEUDOMODULES += defaulttransceiver
PSEUDOMODULES += transport_layer
PSEUDOMODULES += ng_netif_default
PSEUDOMODULES += ng_ieee802154
PSEUDOMODULES += ng_ipv6_default
PSEUDOMODULES += ng_ipv6_router

14
boards/native/Makefile.dep
View File

@ -1,9 +1,13 @@
ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
ifeq (,$(filter ng_netif,$(USEMODULE)))
USEMODULE += nativenet
USEMODULE += nativenet
ifeq (,$(filter netdev_base,$(USEMODULE)))
USEMODULE += transceiver
else
USEMODULE += ng_nativenet
USEMODULE += ng_netdev_eth
endif
endif
ifneq (,$(filter ng_netif_default,$(USEMODULE)))
USEMODULE += ng_netif
USEMODULE += ng_nativenet
USEMODULE += ng_netdev_eth
USEMODULE += ng_nomac
endif

2
cpu/native/startup.c
View File

@ -374,7 +374,7 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
#endif
#ifdef MODULE_NG_NATIVENET
# ifdef MODULE_NATIVENET
# error "Modules nativenet and ng_native are mutually exclusive."
# error "Modules nativenet and ng_nativenet are mutually exclusive."
# endif
dev_eth_tap_setup(&dev_eth_tap, argv[1]);
#endif