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

Merged in merlin17/nuttx/ieee802154 (pull request #415)

Browse Source 
wireless/ieee802154: Minor naming change to align better with coding guidelines

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2017-06-21 16:11:12 +00:00
committed by Gregory Nutt
parent 26cfafdbca 9b2df31adc
commit cf53c9767e
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/Kconfig
+11
View File
@@ -54,6 +54,17 @@ config MAC802154_NTXDESC
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.
config MAC802154_NNOTIF
int "Number or notification structures"
default 3
---help---
Configured number of notification strucures Default: 3
When various MAC management events occur, the MAC notifies the registered
receiver with an allocated notification structure indicating the event. The
events are primitives such as Association Indication etc.
config IEEE802154_IND_PREALLOC config IEEE802154_IND_PREALLOC
int "Number of pre-allocated meta-data structures" int "Number of pre-allocated meta-data structures"
default 20 default 20
wireless/ieee802154/mac802154.c
+3 -3
View File
@@ -235,7 +235,7 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
} }
/**************************************************************************** /****************************************************************************
* Name: mac802154_create_datareq * Name: mac802154_createdatareq
* *
* Description: * Description:
* Internal function used by various parts of the MAC layer. This function * Internal function used by various parts of the MAC layer. This function
@@ -247,7 +247,7 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
* *
****************************************************************************/ ****************************************************************************/
void mac802154_create_datareq(FAR struct ieee802154_privmac_s *priv, void mac802154_createdatareq(FAR struct ieee802154_privmac_s *priv,
FAR struct ieee802154_addr_s *coordaddr, FAR struct ieee802154_addr_s *coordaddr,
enum ieee802154_addrmode_e srcmode, enum ieee802154_addrmode_e srcmode,
FAR struct ieee802154_txdesc_s *txdesc) FAR struct ieee802154_txdesc_s *txdesc)
@@ -947,7 +947,7 @@ static void mac802154_rxframe_worker(FAR void *arg)
* operation. * operation.
* *
* mac802154_txdesc_alloc(priv, &respdec, false); * mac802154_txdesc_alloc(priv, &respdec, false);
* mac802154_create_datareq(priv, &req->coordaddr, * mac802154_createdatareq(priv, &req->coordaddr,
* IEEE802154_ADDRMODE_EXTENDED, respdesc); * IEEE802154_ADDRMODE_EXTENDED, respdesc);
* sq_addlast((FAR sq_entry_t *)respdesc, &priv->csma_queue); * sq_addlast((FAR sq_entry_t *)respdesc, &priv->csma_queue);
*/ */
wireless/ieee802154/mac802154_assoc.c
+1 -1
View File
@@ -492,7 +492,7 @@ void mac802154_txdone_assocreq(FAR struct ieee802154_privmac_s *priv,
mac802154_txdesc_alloc(priv, &respdesc, false); mac802154_txdesc_alloc(priv, &respdesc, false);
mac802154_create_datareq(priv, &priv->coordaddr, mac802154_createdatareq(priv, &priv->coordaddr,
IEEE802154_ADDRMODE_EXTENDED, respdesc); IEEE802154_ADDRMODE_EXTENDED, respdesc);
priv->curr_cmd = IEEE802154_CMD_DATA_REQ; priv->curr_cmd = IEEE802154_CMD_DATA_REQ;
wireless/ieee802154/mac802154_internal.h
+2 -1
View File
@@ -490,9 +490,10 @@ int mac802154_timerstart(FAR struct ieee802154_privmac_s *priv,
void mac802154_setupindirect(FAR struct ieee802154_privmac_s *priv, void mac802154_setupindirect(FAR struct ieee802154_privmac_s *priv,
FAR struct ieee802154_txdesc_s *txdesc); FAR struct ieee802154_txdesc_s *txdesc);
void mac802154_create_datareq(FAR struct ieee802154_privmac_s *priv, void mac802154_createdatareq(FAR struct ieee802154_privmac_s *priv,
FAR struct ieee802154_addr_s *coordaddr, FAR struct ieee802154_addr_s *coordaddr,
enum ieee802154_addrmode_e srcmode, enum ieee802154_addrmode_e srcmode,
FAR struct ieee802154_txdesc_s *txdesc); FAR struct ieee802154_txdesc_s *txdesc);
#endif /* __WIRELESS_IEEE802154__MAC802154_INTERNAL_H */ #endif /* __WIRELESS_IEEE802154__MAC802154_INTERNAL_H */
wireless/ieee802154/mac802154_poll.c
+2 -2
View File
@@ -133,12 +133,12 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
if (IEEE802154_SADDRCMP(priv->addr.saddr, &IEEE802154_SADDR_BCAST)) if (IEEE802154_SADDRCMP(priv->addr.saddr, &IEEE802154_SADDR_BCAST))
{ {
mac802154_create_datareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_EXTENDED, mac802154_createdatareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_EXTENDED,
txdesc); txdesc);
} }
else else
{ {
mac802154_create_datareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_SHORT, mac802154_createdatareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_SHORT,
txdesc); txdesc);
} }