Skip to content

Commit 9dcb5cc

Browse files
miri64miri64
committed
Merge pull request RIOT-OS#5134 from OlegHahm/netif_default
make: introduce netdev_default pseudomodule
2 parents bd8d1dd + 10f5f1a commit 9dcb5cc

File tree

23 files changed

+50
-34
lines changed

23 files changed

+50
-34
lines changed

‎Makefile.dep

+25-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,33 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
1212
USEMODULE += oonf_rfc5444
1313
endif
1414

15+
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
16+
USEMODULE += gnrc_netif
17+
USEMODULE += netdev_default
18+
endif
19+
20+
ifneq (,$(filter cc110x,$(USEMODULE)))
21+
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
22+
USEMODULE += gnrc_cc110x
23+
# XXX: this can be modelled as a dependency for gnrc_netdev_default as soon
24+
# as all drivers are ported to netdev2
25+
USEMODULE += gnrc_netdev2
26+
endif
27+
endif
28+
29+
ifneq (,$(filter kw2xrf,$(USEMODULE)))
30+
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
31+
USEMODULE += gnrc_nomac
32+
endif
33+
endif
34+
1535
ifneq (,$(filter at86rf2%,$(USEMODULE)))
1636
USEMODULE += netdev2_ieee802154
37+
ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
38+
# XXX: this can be modelled as a dependency for gnrc_netdev_default as soon
39+
# as all drivers are ported to netdev2
40+
USEMODULE += gnrc_netdev2
41+
endif
1742
endif
1843

1944
ifneq (,$(filter netdev2_ieee802154,$(USEMODULE)))
@@ -32,10 +57,6 @@ ifneq (,$(filter gnrc_conn_udp,$(USEMODULE)))
3257
USEMODULE += gnrc_udp
3358
endif
3459

35-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
36-
USEMODULE += gnrc_netif
37-
endif
38-
3960
ifneq (,$(filter netdev2_tap,$(USEMODULE)))
4061
USEMODULE += netif
4162
USEMODULE += netdev2_eth

‎Makefile.pseudomodules

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PSEUDOMODULES += conn
22
PSEUDOMODULES += conn_ip
33
PSEUDOMODULES += conn_tcp
44
PSEUDOMODULES += conn_udp
5-
PSEUDOMODULES += gnrc_netif_default
5+
PSEUDOMODULES += gnrc_netdev_default
66
PSEUDOMODULES += gnrc_ipv6_default
77
PSEUDOMODULES += gnrc_ipv6_router
88
PSEUDOMODULES += gnrc_ipv6_router_default
@@ -16,6 +16,7 @@ PSEUDOMODULES += gnrc_sixlowpan_iphc_nhc
1616
PSEUDOMODULES += gnrc_pktbuf
1717
PSEUDOMODULES += log
1818
PSEUDOMODULES += log_printfnoformat
19+
PSEUDOMODULES += netdev_default
1920
PSEUDOMODULES += newlib
2021
PSEUDOMODULES += newlib_nano
2122
PSEUDOMODULES += pktqueue

‎boards/fox/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += at86rf231
3-
USEMODULE += gnrc_netdev2
43
endif
54

65
ifneq (,$(filter saul_default,$(USEMODULE)))

‎boards/iotlab-m3/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += at86rf231
3-
USEMODULE += gnrc_netdev2
43
endif
54

65
ifneq (,$(filter saul_default,$(USEMODULE)))

‎boards/msba2/Makefile.include

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
2-
USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
2+
USEMODULE += cc110x
33
endif
44

55
USEMODULE += msba2-common

‎boards/mulle/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += at86rf212b
3-
USEMODULE += gnrc_netdev2
43
endif
54

65
ifneq (,$(filter saul_default,$(USEMODULE)))

‎boards/native/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += netdev2_tap
3-
USEMODULE += gnrc_netdev2
43
endif

‎boards/pba-d-01-kw2x/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
22
USEMODULE += kw2xrf
3-
USEMODULE += gnrc_nomac
43
endif
54

65
ifneq (,$(filter saul_default,$(USEMODULE)))

‎boards/samr21-xpro/Makefile.dep

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
1+
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
22
USEMODULE += at86rf233
3-
USEMODULE += gnrc_netdev2
43
endif
54

65
ifneq (,$(filter saul_default,$(USEMODULE)))

‎cpu/native/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module, you need to specify a network interface like this:
4040
make term PORT=tap0
4141

4242
**Please note:** in case you're using RIOT's default network stack, the GNRC
43-
stack, you may also use `gnrc_netif_default` module and also add
43+
stack, you may also use `gnrc_netdev_default` module and also add
4444
`auto_init_gnrc_netif` in order to automatically initialize the interface.
4545

4646

‎examples/ccn-lite-relay/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ USEMODULE += shell
2626
USEMODULE += shell_commands
2727
# Include packages that pull up and auto-init the link layer.
2828
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
29-
USEMODULE += gnrc_netif_default
29+
USEMODULE += gnrc_netdev_default
3030
USEMODULE += auto_init_gnrc_netif
3131
USEMODULE += timex
3232
USEMODULE += xtimer

‎examples/default/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ifneq (,$(filter $(BOARD),$(BOARD_PROVIDES_NETIF)))
4646
# gnrc is a meta module including all required, basic gnrc networking modules
4747
USEMODULE += gnrc
4848
# use the default network interface for the board
49-
USEMODULE += gnrc_netif_default
49+
USEMODULE += gnrc_netdev_default
5050
# automatically initialize the network interface
5151
USEMODULE += auto_init_gnrc_netif
5252
# the application dumps received packets to stdout

‎examples/gnrc_border_router/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE)
2828

2929
# Include packages that pull up and auto-init the link layer.
3030
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
31-
USEMODULE += gnrc_netif_default
31+
USEMODULE += gnrc_netdev_default
3232
USEMODULE += auto_init_gnrc_netif
3333
# Include SLIP package for IP over Serial communication
3434
USEMODULE += gnrc_slip

‎examples/gnrc_minimal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h
1111

1212
# Include packages that pull up and auto-init the link layer.
1313
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
14-
USEMODULE += gnrc_netif_default
14+
USEMODULE += gnrc_netdev_default
1515
USEMODULE += auto_init_gnrc_netif
1616
# Specify the minimum networking modules for IPv6
1717
USEMODULE += gnrc_ipv6

‎examples/gnrc_networking/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
1414

1515
# Include packages that pull up and auto-init the link layer.
1616
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
17-
USEMODULE += gnrc_netif_default
17+
USEMODULE += gnrc_netdev_default
1818
USEMODULE += auto_init_gnrc_netif
1919
# Specify the mandatory networking modules for IPv6 and UDP
2020
USEMODULE += gnrc_ipv6_router_default

‎examples/gnrc_tftp/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
1414

1515
# Include packages that pull up and auto-init the link layer.
1616
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
17-
USEMODULE += gnrc_netif_default
17+
USEMODULE += gnrc_netdev_default
1818
USEMODULE += auto_init_gnrc_netif
1919
# Specify the mandatory networking modules for IPv6 and UDP
2020
USEMODULE += gnrc_ipv6_router_default

‎examples/microcoap_server/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
1414

1515
# Include packages that pull up and auto-init the link layer.
1616
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
17-
USEMODULE += gnrc_netif_default
17+
USEMODULE += gnrc_netdev_default
1818
USEMODULE += auto_init_gnrc_netif
1919
# Specify the mandatory networking modules for IPv6 and UDP
2020
USEMODULE += gnrc_ipv6_router_default

‎examples/posix_sockets/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle n
1313

1414
# Include packages that pull up and auto-init the link layer.
1515
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
16-
USEMODULE += gnrc_netif_default
16+
USEMODULE += gnrc_netdev_default
1717
USEMODULE += auto_init_gnrc_netif
1818
# Specify the mandatory networking modules for socket communication via UDP
1919
USEMODULE += gnrc_ipv6_default

‎sys/include/net/gnrc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
*
181181
* - To include the default network device(s) on your board:
182182
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
183-
* USEMODULE += gnrc_netif_default
183+
* USEMODULE += gnrc_netdev_default
184184
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
185185
*
186186
* - To auto-initialize these network devices as GNRC network interfaces

‎tests/conn_ip/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RIOTBASE ?= $(CURDIR)/../..
77
BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 stm32f0discovery telosb \
88
weio wsn430-v1_3b wsn430-v1_4 z1
99

10-
USEMODULE += gnrc_netif_default
10+
USEMODULE += gnrc_netdev_default
1111
USEMODULE += auto_init_gnrc_netif
1212
USEMODULE += gnrc_icmpv6_echo
1313
USEMODULE += gnrc_ipv6_default

‎tests/driver_enc28j60/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FEATURES_REQUIRED = periph_spi periph_gpio
66
BOARD_INSUFFICIENT_MEMORY := msb-430h nucleo-f334 stm32f0discovery weio z1
77

88
USEMODULE += gnrc_netdev2
9-
USEMODULE += gnrc_netif_default
9+
USEMODULE += gnrc_netdev_default
1010
USEMODULE += auto_init_gnrc_netif
1111
USEMODULE += enc28j60
1212
USEMODULE += gnrc_ipv6_router_default

‎tests/gnrc_ipv6_ext/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
1414

1515
# Include packages that pull up and auto-init the link layer.
1616
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
17-
USEMODULE += gnrc_netif_default
17+
USEMODULE += gnrc_netdev_default
1818
USEMODULE += auto_init_gnrc_netif
1919
# Specify the mandatory networking modules for IPv6
2020
USEMODULE += gnrc_ipv6_router_default

‎tests/zep/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include ../Makefile.tests_common
66
BOARD_WHITELIST = native
77

88
USEMODULE += gnrc_zep
9-
USEMODULE += gnrc_netif_default
9+
USEMODULE += gnrc_netdev_default
1010
USEMODULE += auto_init_gnrc_netif
1111
USEMODULE += gnrc_ipv6_default
1212
USEMODULE += gnrc_nomac
@@ -25,7 +25,7 @@ CFLAGS += -DZEP_DST="\"$(ZEP_DST)\""
2525
CFLAGS += -DZEP_SRC_PORT=$(ZEP_SRC_PORT)
2626
CFLAGS += -DZEP_DST_PORT=$(ZEP_DST_PORT)
2727

28-
# one for gnrc_netif_default and one for ZEP
28+
# one for gnrc_netdev_default and one for ZEP
2929
CFLAGS += -DGNRC_NETIF_NUMOF=2
3030

3131
include $(RIOTBASE)/Makefile.include

0 commit comments

Comments
 (0)