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

gnrc_netif: introduce gnrc_netif_mac pseudo-module for gnrc_mac members

Browse Source 
This aims to reduce circular dependencies in GNRC.
This commit is contained in:
Martine S. Lenders 2020-05-05 19:04:44 +02:00
parent a48629b395
commit 5e8f8ddc4a
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.dep
View File

@ -61,6 +61,9 @@ ifneq (,$(filter gnrc_mac,$(USEMODULE)))
USEMODULE += gnrc_priority_pktqueue USEMODULE += gnrc_priority_pktqueue
USEMODULE += csma_sender USEMODULE += csma_sender
USEMODULE += evtimer USEMODULE += evtimer
ifneq (,$(filter gnrc_netif,$(USEMODULE)))
USEMODULE += gnrc_netif_mac
endif
endif endif
ifneq (,$(filter gnrc_gomach,$(USEMODULE))) ifneq (,$(filter gnrc_gomach,$(USEMODULE)))

1
makefiles/pseudomodules.inc.mk
View File

@ -35,6 +35,7 @@ PSEUDOMODULES += gnrc_netif_events
PSEUDOMODULES += gnrc_pktbuf_cmd PSEUDOMODULES += gnrc_pktbuf_cmd
PSEUDOMODULES += gnrc_netif_6lo PSEUDOMODULES += gnrc_netif_6lo
PSEUDOMODULES += gnrc_netif_ipv6 PSEUDOMODULES += gnrc_netif_ipv6
PSEUDOMODULES += gnrc_netif_mac
PSEUDOMODULES += gnrc_netif_cmd_% PSEUDOMODULES += gnrc_netif_cmd_%
PSEUDOMODULES += gnrc_netif_dedup PSEUDOMODULES += gnrc_netif_dedup
PSEUDOMODULES += gnrc_nettype_% PSEUDOMODULES += gnrc_nettype_%

6
sys/include/net/gnrc/netif.h
View File

@ -48,7 +48,7 @@
#if IS_USED(MODULE_GNRC_NETIF_IPV6) #if IS_USED(MODULE_GNRC_NETIF_IPV6)
#include "net/gnrc/netif/ipv6.h" #include "net/gnrc/netif/ipv6.h"
#endif #endif
#ifdef MODULE_GNRC_MAC #if IS_USED(MODULE_GNRC_NETIF_MAC)
#include "net/gnrc/netif/mac.h" #include "net/gnrc/netif/mac.h"
#endif #endif
#include "net/ndp.h" #include "net/ndp.h"
@ -86,9 +86,9 @@ typedef struct {
#if IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN) #if IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN)
gnrc_netif_ipv6_t ipv6; /**< IPv6 component */ gnrc_netif_ipv6_t ipv6; /**< IPv6 component */
#endif #endif
#if defined(MODULE_GNRC_MAC) || DOXYGEN #if IS_USED(MODULE_GNRC_NETIF_MAC) || defined(DOXYGEN)
gnrc_netif_mac_t mac; /**< @ref net_gnrc_mac component */ gnrc_netif_mac_t mac; /**< @ref net_gnrc_mac component */
#endif /* MODULE_GNRC_MAC */ #endif /* IS_USED(MODULE_GNRC_NETIF_MAC) || defined(DOXYGEN) */
/** /**
* @brief Flags for the interface * @brief Flags for the interface
* *