From 821eb5bc76d8ff1afa062b1abc71bded1a965450 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sun, 7 Jun 2020 18:20:24 +0200 Subject: [PATCH] sys/net/auto_init: remove useless preprocessor directives The files are now built only when the corresponding module is used --- sys/net/gnrc/netif/init_devs/auto_init_at86rf215.c | 7 ------- sys/net/gnrc/netif/init_devs/auto_init_at86rf2xx.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_cc110x.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_cc2420.c | 7 ------- sys/net/gnrc/netif/init_devs/auto_init_cc2538_rf.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_dose.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_encx24j600.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_ethos.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_kw2xrf.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_kw41zrf.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_mrf24j40.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_netdev_tap.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_nrf802154.c | 7 ------- sys/net/gnrc/netif/init_devs/auto_init_slipdev.c | 5 ----- sys/net/gnrc/netif/init_devs/auto_init_socket_zep.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_stm32_eth.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_sx127x.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_usbus_cdc_ecm.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_w5100.c | 6 ------ sys/net/gnrc/netif/init_devs/auto_init_xbee.c | 6 ------ 21 files changed, 128 deletions(-) diff --git a/sys/net/gnrc/netif/init_devs/auto_init_at86rf215.c b/sys/net/gnrc/netif/init_devs/auto_init_at86rf215.c index 2acb0fd36e..4d43ada3a5 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_at86rf215.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_at86rf215.c @@ -17,8 +17,6 @@ * @author Benjamin Valentin */ -#ifdef MODULE_AT86RF215 - #define USED_BANDS (IS_USED(MODULE_AT86RF215_SUBGHZ) + IS_USED(MODULE_AT86RF215_24GHZ)) #include "log.h" @@ -114,9 +112,4 @@ void auto_init_at86rf215(void) _setup_netif(netif_24, dev_24, stack_24, AT86RF215_MAC_PRIO); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_AT86RF215 */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_at86rf2xx.c b/sys/net/gnrc/netif/init_devs/auto_init_at86rf2xx.c index f5dc4094b5..4e00f2806c 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_at86rf2xx.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_at86rf2xx.c @@ -17,8 +17,6 @@ * @author Kaspar Schleiser */ -#ifdef MODULE_AT86RF2XX - #include "log.h" #include "board.h" #include "net/gnrc/netif/ieee802154.h" @@ -72,8 +70,4 @@ void auto_init_at86rf2xx(void) #endif } } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_AT86RF2XX */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_cc110x.c b/sys/net/gnrc/netif/init_devs/auto_init_cc110x.c index 1caddc7d0b..80ecc39332 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_cc110x.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_cc110x.c @@ -19,8 +19,6 @@ * @author Hauke Petersen */ -#ifdef MODULE_CC110X - #include "cc110x.h" #include "cc1xxx_common.h" #include "cc110x_params.h" @@ -79,8 +77,4 @@ void auto_init_cc110x(void) "cc110x", (netdev_t *)&_cc110x_devs[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_CC110X */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_cc2420.c b/sys/net/gnrc/netif/init_devs/auto_init_cc2420.c index 8834897fee..829e13e97e 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_cc2420.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_cc2420.c @@ -19,8 +19,6 @@ * @author Francisco Acosta */ -#ifdef MODULE_CC2420 - #include "log.h" #include "board.h" #include "net/gnrc/netif/ieee802154.h" @@ -64,9 +62,4 @@ void auto_init_cc2420(void) (netdev_t *)&cc2420_devs[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_CC2420 */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_cc2538_rf.c b/sys/net/gnrc/netif/init_devs/auto_init_cc2538_rf.c index c3b0d04bf0..302cda7e24 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_cc2538_rf.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_cc2538_rf.c @@ -17,8 +17,6 @@ * @author Aaron Sowry */ -#ifdef MODULE_CC2538_RF - #include "log.h" #include "net/gnrc/netif/ieee802154.h" @@ -47,8 +45,4 @@ void auto_init_cc2538_rf(void) CC2538_MAC_PRIO, "cc2538_rf", (netdev_t *)&cc2538_rf_dev); } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_CC2538_RF */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_dose.c b/sys/net/gnrc/netif/init_devs/auto_init_dose.c index 5b71d15eb1..70934c8866 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_dose.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_dose.c @@ -17,8 +17,6 @@ * @author Juergen Fitschen */ -#ifdef MODULE_DOSE - #include "log.h" #include "debug.h" #include "dose.h" @@ -51,8 +49,4 @@ void auto_init_dose(void) DOSE_MAC_PRIO, "dose", (netdev_t *)&dose[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_DOSE */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c b/sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c index bdd434a317..27b9b14b6c 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c @@ -19,8 +19,6 @@ * @author Hauke Petersen */ -#ifdef MODULE_ENC28J60 - #include "log.h" #include "enc28j60.h" #include "enc28j60_params.h" @@ -68,8 +66,4 @@ void auto_init_enc28j60(void) (netdev_t *)&dev[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_ENC28J60 */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_encx24j600.c b/sys/net/gnrc/netif/init_devs/auto_init_encx24j600.c index c8640330e4..1c32df4e22 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_encx24j600.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_encx24j600.c @@ -17,8 +17,6 @@ * @author Kaspar Schleiser */ -#ifdef MODULE_ENCX24J600 - #include "log.h" #include "debug.h" #include "encx24j600.h" @@ -57,8 +55,4 @@ void auto_init_encx24j600(void) ENCX24J600_MAC_PRIO, "encx24j600", (netdev_t *)&encx24j600); } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_ENCX24J600 */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_ethos.c b/sys/net/gnrc/netif/init_devs/auto_init_ethos.c index 8fd33040a9..adaf636b2f 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_ethos.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_ethos.c @@ -17,8 +17,6 @@ * @author Kaspar Schleiser */ -#ifdef MODULE_ETHOS - #include "log.h" #include "debug.h" #include "ethos.h" @@ -64,8 +62,4 @@ void auto_init_ethos(void) gnrc_netif_ethernet_create(&_netif, _netdev_eth_stack, ETHOS_MAC_STACKSIZE, ETHOS_MAC_PRIO, "ethos", (netdev_t *)ðos); } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_ETHOS */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_kw2xrf.c b/sys/net/gnrc/netif/init_devs/auto_init_kw2xrf.c index f181cbb117..cd3818e086 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_kw2xrf.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_kw2xrf.c @@ -20,8 +20,6 @@ * @author Sebastian Meiling */ -#ifdef MODULE_KW2XRF - #include "log.h" #include "board.h" #include "net/gnrc/netif/ieee802154.h" @@ -58,8 +56,4 @@ void auto_init_kw2xrf(void) (netdev_t *)&kw2xrf_devs[i]); } } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_KW2XRF */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_kw41zrf.c b/sys/net/gnrc/netif/init_devs/auto_init_kw41zrf.c index 6f80e44408..0df1a71c42 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_kw41zrf.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_kw41zrf.c @@ -18,8 +18,6 @@ * @author Thomas Stilwell */ -#ifdef MODULE_KW41ZRF - #include "log.h" #include "board.h" #include "net/gnrc.h" @@ -75,8 +73,4 @@ void auto_init_kw41zrf(void) #endif } } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_KW41ZRF */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_mrf24j40.c b/sys/net/gnrc/netif/init_devs/auto_init_mrf24j40.c index b72a9caf8a..15e2c9b7d4 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_mrf24j40.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_mrf24j40.c @@ -17,8 +17,6 @@ * @author Neo Nenaco */ -#ifdef MODULE_MRF24J40 - #include "log.h" #include "board.h" #include "net/gnrc/netif/ieee802154.h" @@ -55,8 +53,4 @@ void auto_init_mrf24j40(void) (netdev_t *)&mrf24j40_devs[i]); } } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_MRF24J40 */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_netdev_tap.c b/sys/net/gnrc/netif/init_devs/auto_init_netdev_tap.c index eb683b7723..1fd10e41b1 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_netdev_tap.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_netdev_tap.c @@ -17,8 +17,6 @@ * @author Kaspar Schleiser */ -#ifdef MODULE_NETDEV_TAP - #include "log.h" #include "debug.h" #include "netdev_tap_params.h" @@ -46,8 +44,4 @@ void auto_init_netdev_tap(void) &netdev_tap[i].netdev); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_NETDEV_TAP */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_nrf802154.c b/sys/net/gnrc/netif/init_devs/auto_init_nrf802154.c index 11cdf5623c..ddc389ebc8 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_nrf802154.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_nrf802154.c @@ -17,9 +17,6 @@ * @author Hauke Petersen */ -#ifdef MODULE_NRF802154 - - #include "log.h" #include "board.h" #include "nrf802154.h" @@ -49,8 +46,4 @@ void auto_init_nrf802154(void) NRF802154_MAC_PRIO, "nrf802154", (netdev_t *)&nrf802154_dev); } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_NRF802154 */ - /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_slipdev.c b/sys/net/gnrc/netif/init_devs/auto_init_slipdev.c index ef398355ba..7781a7e318 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_slipdev.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_slipdev.c @@ -17,8 +17,6 @@ * @author Kaspar Schleiser */ -#ifdef MODULE_SLIPDEV - #include "log.h" #include "board.h" #include "net/gnrc/netif/raw.h" @@ -56,7 +54,4 @@ void auto_init_slipdev(void) (netdev_t *)&slipdevs[i]); } } -#else -typedef int dont_be_pedantic; -#endif /* MODULE_SLIPDEV */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_socket_zep.c b/sys/net/gnrc/netif/init_devs/auto_init_socket_zep.c index a28f8570ec..511404c0c8 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_socket_zep.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_socket_zep.c @@ -17,8 +17,6 @@ * @author Martine Lenders */ -#ifdef MODULE_SOCKET_ZEP - #include "log.h" #include "socket_zep.h" #include "socket_zep_params.h" @@ -54,8 +52,4 @@ void auto_init_socket_zep(void) (netdev_t *)&_socket_zeps[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_SOCKET_ZEP */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_stm32_eth.c b/sys/net/gnrc/netif/init_devs/auto_init_stm32_eth.c index e58b5d7507..9f94205bf4 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_stm32_eth.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_stm32_eth.c @@ -7,8 +7,6 @@ * @author Robin Lösch */ -#ifdef MODULE_STM32_ETH - #include "stm32_eth.h" #include "net/gnrc/netif/ethernet.h" @@ -24,8 +22,4 @@ void auto_init_stm32_eth(void) gnrc_netif_ethernet_create(&_netif, stack, THREAD_STACKSIZE_DEFAULT, GNRC_NETIF_PRIO, "stm32_eth", &stm32eth); } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_STM32_ETH */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_sx127x.c b/sys/net/gnrc/netif/init_devs/auto_init_sx127x.c index 5a021a6d78..301eb231a0 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_sx127x.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_sx127x.c @@ -17,8 +17,6 @@ * @author Alexandre Abadie */ -#ifdef MODULE_SX127X - #include "log.h" #include "board.h" #include "net/gnrc/netif/lorawan_base.h" @@ -73,8 +71,4 @@ void auto_init_sx127x(void) } } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_SX127X */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_usbus_cdc_ecm.c b/sys/net/gnrc/netif/init_devs/auto_init_usbus_cdc_ecm.c index 5d7e25d2b8..8e1db4a7e2 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_usbus_cdc_ecm.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_usbus_cdc_ecm.c @@ -17,8 +17,6 @@ * @author Koen Zandberg */ -#ifdef MODULE_USBUS_CDC_ECM - #define USB_H_USER_IS_RIOT_INTERNAL #include "log.h" @@ -55,8 +53,4 @@ void auto_init_netdev_cdcecm(void) gnrc_netif_ethernet_create(&_netif, _netdev_eth_stack, CDCECM_MAC_STACKSIZE, CDCECM_MAC_PRIO, "cdcecm", &cdcecm.netdev); } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_CDC_ECM */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_w5100.c b/sys/net/gnrc/netif/init_devs/auto_init_w5100.c index 32718cfead..61258fa94d 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_w5100.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_w5100.c @@ -17,8 +17,6 @@ * @author Hauke Petersen */ -#ifdef MODULE_W5100 - #include "log.h" #include "w5100.h" #include "w5100_params.h" @@ -64,8 +62,4 @@ void auto_init_w5100(void) (netdev_t *)&dev[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_W5100 */ /** @} */ diff --git a/sys/net/gnrc/netif/init_devs/auto_init_xbee.c b/sys/net/gnrc/netif/init_devs/auto_init_xbee.c index 046c35185a..e85ccb9a23 100644 --- a/sys/net/gnrc/netif/init_devs/auto_init_xbee.c +++ b/sys/net/gnrc/netif/init_devs/auto_init_xbee.c @@ -19,8 +19,6 @@ * @author Hauke Petersen */ -#ifdef MODULE_XBEE - #include "log.h" #include "board.h" #include "gnrc_netif_xbee.h" @@ -58,8 +56,4 @@ void auto_init_xbee(void) "xbee", (netdev_t *)&xbee_devs[i]); } } - -#else -typedef int dont_be_pedantic; -#endif /* MODULE_XBEE */ /** @} */