RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #5134 from OlegHahm/netif_default

Browse Source 
make: introduce netdev_default pseudomodule
This commit is contained in:
Martine Lenders 2016-03-24 18:23:49 +01:00
commit 9dcb5cc476
23 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile.dep
View File

@ -12,8 +12,33 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
USEMODULE += oonf_rfc5444 USEMODULE += oonf_rfc5444
endif endif
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += gnrc_netif
USEMODULE += netdev_default
endif
ifneq (,$(filter cc110x,$(USEMODULE)))
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += gnrc_cc110x
# XXX: this can be modelled as a dependency for gnrc_netdev_default as soon
# as all drivers are ported to netdev2
USEMODULE += gnrc_netdev2
endif
endif
ifneq (,$(filter kw2xrf,$(USEMODULE)))
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
USEMODULE += gnrc_nomac
endif
endif
ifneq (,$(filter at86rf2%,$(USEMODULE))) ifneq (,$(filter at86rf2%,$(USEMODULE)))
USEMODULE += netdev2_ieee802154 USEMODULE += netdev2_ieee802154
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
# XXX: this can be modelled as a dependency for gnrc_netdev_default as soon
# as all drivers are ported to netdev2
USEMODULE += gnrc_netdev2
endif
endif endif
ifneq (,$(filter netdev2_ieee802154,$(USEMODULE))) ifneq (,$(filter netdev2_ieee802154,$(USEMODULE)))
@ -32,10 +57,6 @@ ifneq (,$(filter gnrc_conn_udp,$(USEMODULE)))
USEMODULE += gnrc_udp USEMODULE += gnrc_udp
endif endif
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
USEMODULE += gnrc_netif
endif
ifneq (,$(filter netdev2_tap,$(USEMODULE))) ifneq (,$(filter netdev2_tap,$(USEMODULE)))
USEMODULE += netif USEMODULE += netif
USEMODULE += netdev2_eth USEMODULE += netdev2_eth

3
Makefile.pseudomodules
View File

@ -2,7 +2,7 @@ PSEUDOMODULES += conn
PSEUDOMODULES += conn_ip PSEUDOMODULES += conn_ip
PSEUDOMODULES += conn_tcp PSEUDOMODULES += conn_tcp
PSEUDOMODULES += conn_udp PSEUDOMODULES += conn_udp
PSEUDOMODULES += gnrc_netif_default PSEUDOMODULES += gnrc_netdev_default
PSEUDOMODULES += gnrc_ipv6_default PSEUDOMODULES += gnrc_ipv6_default
PSEUDOMODULES += gnrc_ipv6_router PSEUDOMODULES += gnrc_ipv6_router
PSEUDOMODULES += gnrc_ipv6_router_default PSEUDOMODULES += gnrc_ipv6_router_default
@ -16,6 +16,7 @@ PSEUDOMODULES += gnrc_sixlowpan_iphc_nhc
PSEUDOMODULES += gnrc_pktbuf PSEUDOMODULES += gnrc_pktbuf
PSEUDOMODULES += log PSEUDOMODULES += log
PSEUDOMODULES += log_printfnoformat PSEUDOMODULES += log_printfnoformat
PSEUDOMODULES += netdev_default
PSEUDOMODULES += newlib PSEUDOMODULES += newlib
PSEUDOMODULES += newlib_nano PSEUDOMODULES += newlib_nano
PSEUDOMODULES += pktqueue PSEUDOMODULES += pktqueue

3
boards/fox/Makefile.dep
View File

@ -1,6 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += at86rf231 USEMODULE += at86rf231
USEMODULE += gnrc_netdev2
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

3
boards/iotlab-m3/Makefile.dep
View File

@ -1,6 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += at86rf231 USEMODULE += at86rf231
USEMODULE += gnrc_netdev2
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

4
boards/msba2/Makefile.include
View File

@ -1,5 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x USEMODULE += cc110x
endif endif
USEMODULE += msba2-common USEMODULE += msba2-common

3
boards/mulle/Makefile.dep
View File

@ -1,6 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += at86rf212b USEMODULE += at86rf212b
USEMODULE += gnrc_netdev2
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

3
boards/native/Makefile.dep
View File

@ -1,4 +1,3 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += netdev2_tap USEMODULE += netdev2_tap
USEMODULE += gnrc_netdev2
endif endif

3
boards/pba-d-01-kw2x/Makefile.dep
View File

@ -1,6 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
USEMODULE += kw2xrf USEMODULE += kw2xrf
USEMODULE += gnrc_nomac
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

3
boards/samr21-xpro/Makefile.dep
View File

@ -1,6 +1,5 @@
ifneq (,$(filter gnrc_netif_default,$(USEMODULE))) ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
USEMODULE += at86rf233 USEMODULE += at86rf233
USEMODULE += gnrc_netdev2
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

2
cpu/native/README.md
View File

@ -40,7 +40,7 @@ module, you need to specify a network interface like this:
make term PORT=tap0 make term PORT=tap0
**Please note:** in case you're using RIOT's default network stack, the GNRC **Please note:** in case you're using RIOT's default network stack, the GNRC
stack, you may also use `gnrc_netif_default` module and also add stack, you may also use `gnrc_netdev_default` module and also add
`auto_init_gnrc_netif` in order to automatically initialize the interface. `auto_init_gnrc_netif` in order to automatically initialize the interface.

2
examples/ccn-lite-relay/Makefile
View File

@ -26,7 +26,7 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
USEMODULE += timex USEMODULE += timex
USEMODULE += xtimer USEMODULE += xtimer

2
examples/default/Makefile
View File

@ -46,7 +46,7 @@ ifneq (,$(filter $(BOARD),$(BOARD_PROVIDES_NETIF)))
# gnrc is a meta module including all required, basic gnrc networking modules # gnrc is a meta module including all required, basic gnrc networking modules
USEMODULE += gnrc USEMODULE += gnrc
# use the default network interface for the board # use the default network interface for the board
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
# automatically initialize the network interface # automatically initialize the network interface
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# the application dumps received packets to stdout # the application dumps received packets to stdout

2
examples/gnrc_border_router/Makefile
View File

@ -28,7 +28,7 @@ CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE)
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Include SLIP package for IP over Serial communication # Include SLIP package for IP over Serial communication
USEMODULE += gnrc_slip USEMODULE += gnrc_slip

2
examples/gnrc_minimal/Makefile
View File

@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the minimum networking modules for IPv6 # Specify the minimum networking modules for IPv6
USEMODULE += gnrc_ipv6 USEMODULE += gnrc_ipv6

2
examples/gnrc_networking/Makefile
View File

@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP # Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_ipv6_router_default

2
examples/gnrc_tftp/Makefile
View File

@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP # Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_ipv6_router_default

2
examples/microcoap_server/Makefile
View File

@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 and UDP # Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_ipv6_router_default

2
examples/posix_sockets/Makefile
View File

@ -13,7 +13,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle n
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for socket communication via UDP # Specify the mandatory networking modules for socket communication via UDP
USEMODULE += gnrc_ipv6_default USEMODULE += gnrc_ipv6_default

2
sys/include/net/gnrc.h
View File

@ -180,7 +180,7 @@
* *
* - To include the default network device(s) on your board: * - To include the default network device(s) on your board:
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk} * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
* USEMODULE += gnrc_netif_default * USEMODULE += gnrc_netdev_default
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* *
* - To auto-initialize these network devices as GNRC network interfaces * - To auto-initialize these network devices as GNRC network interfaces

2
tests/conn_ip/Makefile
View File

@ -7,7 +7,7 @@ RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 stm32f0discovery telosb \ BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 stm32f0discovery telosb \
weio wsn430-v1_3b wsn430-v1_4 z1 weio wsn430-v1_3b wsn430-v1_4 z1
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_icmpv6_echo USEMODULE += gnrc_icmpv6_echo
USEMODULE += gnrc_ipv6_default USEMODULE += gnrc_ipv6_default

2
tests/driver_enc28j60/Makefile
View File

@ -6,7 +6,7 @@ FEATURES_REQUIRED = periph_spi periph_gpio
BOARD_INSUFFICIENT_MEMORY := msb-430h nucleo-f334 stm32f0discovery weio z1 BOARD_INSUFFICIENT_MEMORY := msb-430h nucleo-f334 stm32f0discovery weio z1
USEMODULE += gnrc_netdev2 USEMODULE += gnrc_netdev2
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
USEMODULE += enc28j60 USEMODULE += enc28j60
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_ipv6_router_default

2
tests/gnrc_ipv6_ext/Makefile
View File

@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
# Include packages that pull up and auto-init the link layer. # Include packages that pull up and auto-init the link layer.
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# Specify the mandatory networking modules for IPv6 # Specify the mandatory networking modules for IPv6
USEMODULE += gnrc_ipv6_router_default USEMODULE += gnrc_ipv6_router_default

4
tests/zep/Makefile
View File

@ -6,7 +6,7 @@ include ../Makefile.tests_common
BOARD_WHITELIST = native BOARD_WHITELIST = native
USEMODULE += gnrc_zep USEMODULE += gnrc_zep
USEMODULE += gnrc_netif_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
USEMODULE += gnrc_ipv6_default USEMODULE += gnrc_ipv6_default
USEMODULE += gnrc_nomac USEMODULE += gnrc_nomac
@ -25,7 +25,7 @@ CFLAGS += -DZEP_DST="\"$(ZEP_DST)\""
CFLAGS += -DZEP_SRC_PORT=$(ZEP_SRC_PORT) CFLAGS += -DZEP_SRC_PORT=$(ZEP_SRC_PORT)
CFLAGS += -DZEP_DST_PORT=$(ZEP_DST_PORT) CFLAGS += -DZEP_DST_PORT=$(ZEP_DST_PORT)
# one for gnrc_netif_default and one for ZEP # one for gnrc_netdev_default and one for ZEP
CFLAGS += -DGNRC_NETIF_NUMOF=2 CFLAGS += -DGNRC_NETIF_NUMOF=2
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include