Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renaming in hope of eliminating a conflict with a pending PR.

Browse Source
This commit is contained in:
Gregory Nutt
2017-06-21 10:08:25 -06:00
parent a53be51733
commit 0d290904af
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/Kconfig
+2 -2
View File
@@ -47,7 +47,7 @@ config MAC802154_NNOTIF
---help--- ---help---
This value must be larger than CONFIG_IEEE802154_NTDESC. This value must be larger than CONFIG_IEEE802154_NTDESC.
config IEEE802154_NTXDESC config MAC802154_NTXDESC
int "Number or TX descriptors" int "Number or TX descriptors"
default 3 default 3
---help--- ---help---
@@ -56,7 +56,7 @@ config IEEE802154_NTXDESC
When used with 6LoWPAN, the descriptor allocator runs on a work When used with 6LoWPAN, the descriptor allocator runs on a work
and must avoid blocking if possible. Each frame will be provided in and must avoid blocking if possible. Each frame will be provided in
an IOB and each TX frame will need a TX descriptor. So the safe an IOB and each TX frame will need a TX descriptor. So the safe
thing to do is set CONFIG_IEEE802154_NTXDESC to CONFIG_IOB_NBUFFERS. thing to do is set CONFIG_MAC802154_NTXDESC to CONFIG_IOB_NBUFFERS.
Then there should be the maximum pre-allocated buffers for each Then there should be the maximum pre-allocated buffers for each
possible TX frame. possible TX frame.
wireless/ieee802154/mac802154.c
+2 -2
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_IEEE802154_NTXDESC; i++) for (i = 0; i < CONFIG_MAC802154_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_IEEE802154_NTXDESC); sem_init(&priv->txdesc_sem, 0, CONFIG_MAC802154_NTXDESC);
/* Initialize the notifcation allocation pool */ /* Initialize the notifcation allocation pool */
wireless/ieee802154/mac802154_internal.h
+6 -6
View File
@@ -177,13 +177,13 @@
# define CONFIG_MAC802154_NNOTIF 6 # define CONFIG_MAC802154_NNOTIF 6
#endif #endif
#if !defined(CONFIG_IEEE802154_NTXDESC) || CONFIG_IEEE802154_NTXDESC <= 0 #if !defined(CONFIG_MAC802154_NTXDESC) || CONFIG_MAC802154_NTXDESC <= 0
# undef CONFIG_IEEE802154_NTXDESC # undef CONFIG_MAC802154_NTXDESC
# define CONFIG_IEEE802154_NTXDESC 3 # define CONFIG_MAC802154_NTXDESC 3
#endif #endif
#if CONFIG_IEEE802154_NTXDESC > CONFIG_MAC802154_NNOTIF #if CONFIG_MAC802154_NTXDESC > CONFIG_MAC802154_NNOTIF
# error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_IEEE802154_NTXDESC # error CONFIG_MAC802154_NNOTIF must be greater than CONFIG_MAC802154_NTXDESC
#endif #endif
#if !defined(CONFIG_IEEE802154_DEFAULT_EADDR) #if !defined(CONFIG_IEEE802154_DEFAULT_EADDR)
@@ -258,7 +258,7 @@ struct ieee802154_privmac_s
struct mac802154_notif_s notif_pool[CONFIG_MAC802154_NNOTIF]; struct mac802154_notif_s notif_pool[CONFIG_MAC802154_NNOTIF];
sem_t notif_sem; sem_t notif_sem;
struct ieee802154_txdesc_s txdesc_pool[CONFIG_IEEE802154_NTXDESC]; struct ieee802154_txdesc_s txdesc_pool[CONFIG_MAC802154_NTXDESC];
sem_t txdesc_sem; sem_t txdesc_sem;
sq_queue_t txdesc_queue; sq_queue_t txdesc_queue;
sq_queue_t txdone_queue; sq_queue_t txdone_queue;