From 77325b4cdeb8bccf999538399d6a6c044c4c57c3 Mon Sep 17 00:00:00 2001 From: Jose Alamos Date: Fri, 7 Feb 2020 12:02:45 +0100 Subject: [PATCH] ieee802154: add CONFIG_ prefix to config macros --- cpu/cc2538/include/cc2538_rf.h | 4 ++-- cpu/native/socket_zep/socket_zep.c | 2 +- cpu/nrf52/radio/nrf802154/nrf802154.c | 4 ++-- drivers/at86rf215/at86rf215.c | 2 +- drivers/include/at86rf215.h | 6 +++--- drivers/include/at86rf2xx.h | 8 ++++---- drivers/include/cc2420.h | 4 ++-- drivers/include/kw2xrf.h | 4 ++-- drivers/include/kw41zrf.h | 4 ++-- drivers/include/xbee.h | 4 ++-- drivers/mrf24j40/mrf24j40.c | 2 +- drivers/netdev_ieee802154/netdev_ieee802154.c | 2 +- makefiles/default-radio-settings.inc.mk | 6 +++--- sys/include/net/ieee802154.h | 20 +++++++++---------- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cpu/cc2538/include/cc2538_rf.h b/cpu/cc2538/include/cc2538_rf.h index 40937e8274..fa2621b087 100644 --- a/cpu/cc2538/include/cc2538_rf.h +++ b/cpu/cc2538/include/cc2538_rf.h @@ -55,8 +55,8 @@ extern "C" { #define CC2538_MIN_FREQ (2394) #define CC2538_MAX_FREQ (2507) -#define CC2538_RF_POWER_DEFAULT (IEEE802154_DEFAULT_TXPOWER) /**< Default output power in dBm */ -#define CC2538_RF_CHANNEL_DEFAULT (IEEE802154_DEFAULT_CHANNEL) +#define CC2538_RF_POWER_DEFAULT (CONFIG_IEEE802154_DEFAULT_TXPOWER) /**< Default output power in dBm */ +#define CC2538_RF_CHANNEL_DEFAULT (CONFIG_IEEE802154_DEFAULT_CHANNEL) #define OUTPUT_POWER_MIN (-24) /**< Min output power in dBm */ #define OUTPUT_POWER_MAX (7) /**< Max output power in dBm */ diff --git a/cpu/native/socket_zep/socket_zep.c b/cpu/native/socket_zep/socket_zep.c index d47d23e802..2fd10a3e7a 100644 --- a/cpu/native/socket_zep/socket_zep.c +++ b/cpu/native/socket_zep/socket_zep.c @@ -294,7 +294,7 @@ static int _init(netdev_t *netdev) netdev_ieee802154_reset(&dev->netdev); assert(dev != NULL); - dev->netdev.chan = IEEE802154_DEFAULT_CHANNEL; + dev->netdev.chan = CONFIG_IEEE802154_DEFAULT_CHANNEL; return 0; } diff --git a/cpu/nrf52/radio/nrf802154/nrf802154.c b/cpu/nrf52/radio/nrf802154/nrf802154.c index 69f5ea3c8f..13640e574a 100644 --- a/cpu/nrf52/radio/nrf802154/nrf802154.c +++ b/cpu/nrf52/radio/nrf802154/nrf802154.c @@ -51,10 +51,10 @@ netdev_ieee802154_t nrf802154_dev = { .proto = GNRC_NETTYPE_UNDEF, #endif #endif - .pan = IEEE802154_DEFAULT_PANID, + .pan = CONFIG_IEEE802154_DEFAULT_PANID, .short_addr = { 0, 0 }, .long_addr = { 0, 0, 0, 0, 0, 0, 0, 0 }, - .chan = IEEE802154_DEFAULT_CHANNEL, + .chan = CONFIG_IEEE802154_DEFAULT_CHANNEL, .flags = 0 }; diff --git a/drivers/at86rf215/at86rf215.c b/drivers/at86rf215/at86rf215.c index 20def8b80b..f48e2b6000 100644 --- a/drivers/at86rf215/at86rf215.c +++ b/drivers/at86rf215/at86rf215.c @@ -71,7 +71,7 @@ void at86rf215_reset_and_cfg(at86rf215_t *dev) dev->netdev.chan = AT86RF215_DEFAULT_CHANNEL; } - dev->netdev.pan = IEEE802154_DEFAULT_PANID; + dev->netdev.pan = CONFIG_IEEE802154_DEFAULT_PANID; /* set default options */ dev->retries_max = AT86RF215_RETRIES_MAX_DEFAULT; diff --git a/drivers/include/at86rf215.h b/drivers/include/at86rf215.h index 7c60f3f1a9..23632424da 100644 --- a/drivers/include/at86rf215.h +++ b/drivers/include/at86rf215.h @@ -96,14 +96,14 @@ typedef void (*at86rf215_batmon_cb_t)(void *arg); * @name Channel configuration * @{ */ -#define AT86RF215_DEFAULT_CHANNEL (IEEE802154_DEFAULT_CHANNEL) -#define AT86RF215_DEFAULT_SUBGHZ_CHANNEL (IEEE802154_DEFAULT_SUBGHZ_CHANNEL) +#define AT86RF215_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_CHANNEL) +#define AT86RF215_DEFAULT_SUBGHZ_CHANNEL (CONFIG_IEEE802154_DEFAULT_SUBGHZ_CHANNEL) /** @} */ /** * @brief Default TX power (0dBm) */ -#define AT86RF215_DEFAULT_TXPOWER (IEEE802154_DEFAULT_TXPOWER) +#define AT86RF215_DEFAULT_TXPOWER (CONFIG_IEEE802154_DEFAULT_TXPOWER) /** * @name Flags for device internal states (see datasheet) diff --git a/drivers/include/at86rf2xx.h b/drivers/include/at86rf2xx.h index 91bc88ce3f..9911206273 100644 --- a/drivers/include/at86rf2xx.h +++ b/drivers/include/at86rf2xx.h @@ -60,13 +60,13 @@ extern "C" { /* the AT86RF212B has a sub-1GHz radio */ #define AT86RF2XX_MIN_CHANNEL (IEEE802154_CHANNEL_MIN_SUBGHZ) #define AT86RF2XX_MAX_CHANNEL (IEEE802154_CHANNEL_MAX_SUBGHZ) -#define AT86RF2XX_DEFAULT_CHANNEL (IEEE802154_DEFAULT_SUBGHZ_CHANNEL) +#define AT86RF2XX_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_SUBGHZ_CHANNEL) /* Page 2 is O-QPSK 100 kbit/s (channel 0), or 250 kbit/s (channels 1-10) */ -#define AT86RF2XX_DEFAULT_PAGE (IEEE802154_DEFAULT_SUBGHZ_PAGE) +#define AT86RF2XX_DEFAULT_PAGE (CONFIG_IEEE802154_DEFAULT_SUBGHZ_PAGE) #else #define AT86RF2XX_MIN_CHANNEL (IEEE802154_CHANNEL_MIN) #define AT86RF2XX_MAX_CHANNEL (IEEE802154_CHANNEL_MAX) -#define AT86RF2XX_DEFAULT_CHANNEL (IEEE802154_DEFAULT_CHANNEL) +#define AT86RF2XX_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_CHANNEL) /* Only page 0 is supported in the 2.4 GHz band */ #endif /** @} */ @@ -74,7 +74,7 @@ extern "C" { /** * @brief Default TX power (0dBm) */ -#define AT86RF2XX_DEFAULT_TXPOWER (IEEE802154_DEFAULT_TXPOWER) +#define AT86RF2XX_DEFAULT_TXPOWER (CONFIG_IEEE802154_DEFAULT_TXPOWER) /** * @brief Base (minimal) RSSI value in dBm diff --git a/drivers/include/cc2420.h b/drivers/include/cc2420.h index 16ba81802f..e48959e0dd 100644 --- a/drivers/include/cc2420.h +++ b/drivers/include/cc2420.h @@ -44,7 +44,7 @@ extern "C" { */ #define CC2420_CHAN_MIN (IEEE802154_CHANNEL_MIN) #define CC2420_CHAN_MAX (IEEE802154_CHANNEL_MAX) -#define CC2420_CHAN_DEFAULT (IEEE802154_DEFAULT_CHANNEL) +#define CC2420_CHAN_DEFAULT (CONFIG_IEEE802154_DEFAULT_CHANNEL) /** @} */ /** @@ -53,7 +53,7 @@ extern "C" { */ #define CC2420_TXPOWER_MIN (-25) #define CC2420_TXPOWER_MAX (0) -#define CC2420_TXPOWER_DEFAULT (IEEE802154_DEFAULT_TXPOWER) +#define CC2420_TXPOWER_DEFAULT (CONFIG_IEEE802154_DEFAULT_TXPOWER) /** @} */ /** diff --git a/drivers/include/kw2xrf.h b/drivers/include/kw2xrf.h index 57b07f64f0..9058fba367 100644 --- a/drivers/include/kw2xrf.h +++ b/drivers/include/kw2xrf.h @@ -48,7 +48,7 @@ extern "C" { * @{ */ #ifndef KW2XRF_DEFAULT_CHANNEL -#define KW2XRF_DEFAULT_CHANNEL (IEEE802154_DEFAULT_CHANNEL) +#define KW2XRF_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_CHANNEL) #endif /** @} */ @@ -64,7 +64,7 @@ extern "C" { /** * @brief Default TX_POWER in dbm used after initialization */ -#define KW2XRF_DEFAULT_TX_POWER (IEEE802154_DEFAULT_TXPOWER) +#define KW2XRF_DEFAULT_TX_POWER (CONFIG_IEEE802154_DEFAULT_TXPOWER) /** * @brief Maximum output power of the kw2x device in dBm diff --git a/drivers/include/kw41zrf.h b/drivers/include/kw41zrf.h index 8cf669c939..1d96b4ad2c 100644 --- a/drivers/include/kw41zrf.h +++ b/drivers/include/kw41zrf.h @@ -44,7 +44,7 @@ extern "C" { * @{ */ #ifndef KW41ZRF_DEFAULT_CHANNEL -#define KW41ZRF_DEFAULT_CHANNEL (IEEE802154_DEFAULT_CHANNEL) +#define KW41ZRF_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_CHANNEL) #endif /** @} */ @@ -80,7 +80,7 @@ extern "C" { /** * @brief Default TX_POWER in dbm used after initialization */ -#define KW41ZRF_DEFAULT_TX_POWER (IEEE802154_DEFAULT_TXPOWER) +#define KW41ZRF_DEFAULT_TX_POWER (CONFIG_IEEE802154_DEFAULT_TXPOWER) /** * @brief Maximum output power of the kw41z device in dBm diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h index ce77a6635e..15551163eb 100644 --- a/drivers/include/xbee.h +++ b/drivers/include/xbee.h @@ -73,12 +73,12 @@ extern "C" { /** * @brief Default PAN ID used after initialization */ -#define XBEE_DEFAULT_PANID (IEEE802154_DEFAULT_PANID) +#define XBEE_DEFAULT_PANID (CONFIG_IEEE802154_DEFAULT_PANID) /** * @brief Default channel used after initialization */ -#define XBEE_DEFAULT_CHANNEL (IEEE802154_DEFAULT_CHANNEL) +#define XBEE_DEFAULT_CHANNEL (CONFIG_IEEE802154_DEFAULT_CHANNEL) /** * @name Address flags diff --git a/drivers/mrf24j40/mrf24j40.c b/drivers/mrf24j40/mrf24j40.c index cf263558a7..3dc2eadbf6 100644 --- a/drivers/mrf24j40/mrf24j40.c +++ b/drivers/mrf24j40/mrf24j40.c @@ -60,7 +60,7 @@ int mrf24j40_reset(mrf24j40_t *dev) mrf24j40_set_addr_long(dev, ntohll(addr_long.uint64.u64)); mrf24j40_set_addr_short(dev, ntohs(addr_long.uint16[0].u16)); - mrf24j40_set_chan(dev, IEEE802154_DEFAULT_CHANNEL); + mrf24j40_set_chan(dev, CONFIG_IEEE802154_DEFAULT_CHANNEL); /* configure Immediate Sleep and Wake-Up mode */ mrf24j40_reg_write_short(dev, MRF24J40_REG_WAKECON, MRF24J40_WAKECON_IMMWAKE); diff --git a/drivers/netdev_ieee802154/netdev_ieee802154.c b/drivers/netdev_ieee802154/netdev_ieee802154.c index 623604f390..4a168d876c 100644 --- a/drivers/netdev_ieee802154/netdev_ieee802154.c +++ b/drivers/netdev_ieee802154/netdev_ieee802154.c @@ -67,7 +67,7 @@ void netdev_ieee802154_reset(netdev_ieee802154_t *dev) #endif /* Initialize PAN ID and call netdev::set to propagate it */ - dev->pan = IEEE802154_DEFAULT_PANID; + dev->pan = CONFIG_IEEE802154_DEFAULT_PANID; dev->netdev.driver->set(&dev->netdev, NETOPT_NID, &dev->pan, sizeof(dev->pan)); } diff --git a/makefiles/default-radio-settings.inc.mk b/makefiles/default-radio-settings.inc.mk index 8583a5ca02..a09eb6d55e 100644 --- a/makefiles/default-radio-settings.inc.mk +++ b/makefiles/default-radio-settings.inc.mk @@ -6,14 +6,14 @@ ifndef CONFIG_KCONFIG_MODULE_IEEE802154 endif ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz - CFLAGS += -DIEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) + CFLAGS += -DCONFIG_IEEE802154_DEFAULT_SUBGHZ_CHANNEL=$(DEFAULT_CHANNEL) else # radio is IEEE 802.15.4 2.4 GHz - CFLAGS += -DIEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) + CFLAGS += -DCONFIG_IEEE802154_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) endif endif # Set a custom PAN ID if needed ifneq (,$(DEFAULT_PAN_ID)) - CFLAGS += -DIEEE802154_DEFAULT_PANID=$(DEFAULT_PAN_ID) + CFLAGS += -DCONFIG_IEEE802154_DEFAULT_PANID=$(DEFAULT_PAN_ID) endif endif diff --git a/sys/include/net/ieee802154.h b/sys/include/net/ieee802154.h index 19da9c5d64..661eed1f68 100644 --- a/sys/include/net/ieee802154.h +++ b/sys/include/net/ieee802154.h @@ -124,29 +124,29 @@ extern const uint8_t ieee802154_addr_bcast[IEEE802154_ADDR_BCAST_LEN]; /** * @brief IEEE802.15.4 default sub-GHZ channel */ -#ifndef IEEE802154_DEFAULT_SUBGHZ_CHANNEL -#define IEEE802154_DEFAULT_SUBGHZ_CHANNEL (5U) +#ifndef CONFIG_IEEE802154_DEFAULT_SUBGHZ_CHANNEL +#define CONFIG_IEEE802154_DEFAULT_SUBGHZ_CHANNEL (5U) #endif /** * @brief IEEE802.15.4 default channel */ -#ifndef IEEE802154_DEFAULT_CHANNEL -#define IEEE802154_DEFAULT_CHANNEL (26U) +#ifndef CONFIG_IEEE802154_DEFAULT_CHANNEL +#define CONFIG_IEEE802154_DEFAULT_CHANNEL (26U) #endif /** * @brief IEEE802.15.4 default sub-GHZ page */ -#ifndef IEEE802154_DEFAULT_SUBGHZ_PAGE -#define IEEE802154_DEFAULT_SUBGHZ_PAGE (2U) +#ifndef CONFIG_IEEE802154_DEFAULT_SUBGHZ_PAGE +#define CONFIG_IEEE802154_DEFAULT_SUBGHZ_PAGE (2U) #endif /** * @brief IEEE802.15.4 default PANID */ -#ifndef IEEE802154_DEFAULT_PANID -#define IEEE802154_DEFAULT_PANID (0x0023U) +#ifndef CONFIG_IEEE802154_DEFAULT_PANID +#define CONFIG_IEEE802154_DEFAULT_PANID (0x0023U) #endif /** @@ -159,8 +159,8 @@ extern const uint8_t ieee802154_addr_bcast[IEEE802154_ADDR_BCAST_LEN]; /** * @brief IEEE802.15.4 default TX power (in dBm) */ -#ifndef IEEE802154_DEFAULT_TXPOWER -#define IEEE802154_DEFAULT_TXPOWER (0) +#ifndef CONFIG_IEEE802154_DEFAULT_TXPOWER +#define CONFIG_IEEE802154_DEFAULT_TXPOWER (0) #endif /** @} */