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

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

Browse Source
This commit is contained in:
Anthony Merlino
2017-06-19 15:59:21 -04:00
parent cca0013674
commit 45a32a116b
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154.c
+7 -7
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,10 +247,10 @@ 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)
{ {
FAR struct iob_s *iob; FAR struct iob_s *iob;
@@ -947,8 +947,8 @@ 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
+2 -2
View File
@@ -492,8 +492,8 @@ 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
+7 -6
View File
@@ -481,8 +481,8 @@ static inline int mac802154_timercancel(FAR struct ieee802154_privmac_s *priv)
int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv, int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
FAR struct ieee802154_txdesc_s **txdesc, FAR struct ieee802154_txdesc_s **txdesc,
bool allow_interrupt); bool allow_interrupt);
int mac802154_timerstart(FAR struct ieee802154_privmac_s *priv, int mac802154_timerstart(FAR struct ieee802154_privmac_s *priv,
uint32_t numsymbols, mac802154_worker_t); uint32_t numsymbols, mac802154_worker_t);
@@ -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
+4 -4
View File
@@ -133,13 +133,13 @@ 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);
} }
/* Save a copy of the destination addressing infromation into the tx descriptor. /* Save a copy of the destination addressing infromation into the tx descriptor.