sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gregory Nutt 2017-06-21 06:56:34 -06:00
parent cca0013674
commit 4931792700
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wireless/ieee802154/mac802154.c
View File

@ -126,12 +126,12 @@ static void mac802154_resetqueues(FAR struct ieee802154_privmac_s *priv)
/* Initialize the tx descriptor allocation pool */ /* Initialize the tx descriptor allocation pool */
sq_init(&priv->txdesc_queue); 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); 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 */ /* Initialize the notifcation allocation pool */

12
wireless/ieee802154/mac802154_internal.h
View File

@ -177,17 +177,17 @@
# define CONFIG_MAC802154_NNOTIF 6 # define CONFIG_MAC802154_NNOTIF 6
#endif #endif
#if !defined(CONFIG_MAC802154_NTXDESC) || CONFIG_MAC802154_NTXDESC <= 0 #if !defined(CONFIG_IEEE802154_NTXDESC) || CONFIG_IEEE802154_NTXDESC <= 0
# undef CONFIG_MAC802154_NTXDESC # undef CONFIG_IEEE802154_NTXDESC
# define CONFIG_MAC802154_NTXDESC 3 # define CONFIG_IEEE802154_NTXDESC 3
#endif #endif
#if CONFIG_MAC802154_NTXDESC > CONFIG_MAC802154_NNOTIF #if CONFIG_IEEE802154_NTXDESC > CONFIG_MAC802154_NNOTIF
#error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_MAC802154_NTXDESC # error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_IEEE802154_NTXDESC
#endif #endif
#if !defined(CONFIG_IEEE802154_DEFAULT_EADDR) #if !defined(CONFIG_IEEE802154_DEFAULT_EADDR)
#define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF # define CONFIG_IEEE802154_DEFAULT_EADDR 0xFFFFFFFFFFFFFFFF
#endif #endif
/**************************************************************************** /****************************************************************************