From 01a8c64e39e2498779b6a82bf21c969da2fc0cd1 Mon Sep 17 00:00:00 2001 From: Akshai M Date: Fri, 17 Apr 2020 23:27:01 +0530 Subject: [PATCH] drivers/cc110x : Add CONFIG_ Add Add CONFIG_ Prefix for CC110X_DEFAULT_CHANNEL --- drivers/cc110x/cc110x_netdev.c | 2 +- drivers/include/cc110x.h | 4 ++-- makefiles/default-radio-settings.inc.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cc110x/cc110x_netdev.c b/drivers/cc110x/cc110x_netdev.c index 981ef7888e..b42716482b 100644 --- a/drivers/cc110x/cc110x_netdev.c +++ b/drivers/cc110x/cc110x_netdev.c @@ -348,7 +348,7 @@ static int cc110x_init(netdev_t *netdev) * cc110x_full_calibration */ retval = cc110x_apply_config(dev, dev->params.config, dev->params.channels, - CC110X_DEFAULT_CHANNEL); + CONFIG_CC110X_DEFAULT_CHANNEL); if (retval) { gpio_irq_disable(dev->params.gdo0); gpio_irq_disable(dev->params.gdo2); diff --git a/drivers/include/cc110x.h b/drivers/include/cc110x.h index 7317a2adf8..4c3856d91d 100644 --- a/drivers/include/cc110x.h +++ b/drivers/include/cc110x.h @@ -248,8 +248,8 @@ extern "C" { /** * @brief The default channel to set up after initializing the device */ -#ifndef CC110X_DEFAULT_CHANNEL -#define CC110X_DEFAULT_CHANNEL (0U) +#ifndef CONFIG_CC110X_DEFAULT_CHANNEL +#define CONFIG_CC110X_DEFAULT_CHANNEL (0U) #endif /** @} */ diff --git a/makefiles/default-radio-settings.inc.mk b/makefiles/default-radio-settings.inc.mk index a09eb6d55e..1839b5d37b 100644 --- a/makefiles/default-radio-settings.inc.mk +++ b/makefiles/default-radio-settings.inc.mk @@ -2,7 +2,7 @@ ifndef CONFIG_KCONFIG_MODULE_IEEE802154 ifneq (,$(DEFAULT_CHANNEL)) ifneq (,$(filter cc110x,$(USEMODULE))) # radio is cc110x sub-GHz - CFLAGS += -DCC110X_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) + CFLAGS += -DCONFIG_CC110X_DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) endif ifneq (,$(filter at86rf212b,$(USEMODULE))) # radio is IEEE 802.15.4 sub-GHz