From 4931792700ad00c56e7636e9b6591661790efaf3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 21 Jun 2017 06:56:34 -0600 Subject: [PATCH] Make naming of NTXDESC consistent. I don't know where it should be MAC or IEEE, gut I changed the one that affects the fewest files. --- wireless/ieee802154/mac802154.c | 4 ++-- wireless/ieee802154/mac802154_internal.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c index 70e44b68f5..012139204f 100644 --- a/wireless/ieee802154/mac802154.c +++ b/wireless/ieee802154/mac802154.c @@ -126,12 +126,12 @@ static void mac802154_resetqueues(FAR struct ieee802154_privmac_s *priv) /* Initialize the tx descriptor allocation pool */ sq_init(&priv->txdesc_queue); - for (i = 0; i < CONFIG_MAC802154_NTXDESC; i++) + for (i = 0; i < CONFIG_IEEE802154_NTXDESC; i++) { sq_addlast((FAR sq_entry_t *)&priv->txdesc_pool[i], &priv->txdesc_queue); } - sem_init(&priv->txdesc_sem, 0, CONFIG_MAC802154_NTXDESC); + sem_init(&priv->txdesc_sem, 0, CONFIG_IEEE802154_NTXDESC); /* Initialize the notifcation allocation pool */ diff --git a/wireless/ieee802154/mac802154_internal.h b/wireless/ieee802154/mac802154_internal.h index 1ebfa0e15a..d9df64d851 100644 --- a/wireless/ieee802154/mac802154_internal.h +++ b/wireless/ieee802154/mac802154_internal.h @@ -177,17 +177,17 @@ # define CONFIG_MAC802154_NNOTIF 6 #endif -#if !defined(CONFIG_MAC802154_NTXDESC) || CONFIG_MAC802154_NTXDESC <= 0 -# undef CONFIG_MAC802154_NTXDESC -# define CONFIG_MAC802154_NTXDESC 3 +#if !defined(CONFIG_IEEE802154_NTXDESC) || CONFIG_IEEE802154_NTXDESC <= 0 +# undef CONFIG_IEEE802154_NTXDESC +# define CONFIG_IEEE802154_NTXDESC 3 #endif -#if CONFIG_MAC802154_NTXDESC > CONFIG_MAC802154_NNOTIF -#error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_MAC802154_NTXDESC +#if CONFIG_IEEE802154_NTXDESC > CONFIG_MAC802154_NNOTIF +# error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_IEEE802154_NTXDESC #endif #if !defined(CONFIG_IEEE802154_DEFAULT_EADDR) -#define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF +# define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF #endif /****************************************************************************