From 45a32a116bc57f0a543947eefc72e91e31906b51 Mon Sep 17 00:00:00 2001 From: Anthony Merlino Date: Mon, 19 Jun 2017 15:59:21 -0400 Subject: [PATCH] wireless/ieee802154: Minor naming change to align better with coding guidelines --- wireless/ieee802154/mac802154.c | 14 +++++++------- wireless/ieee802154/mac802154_assoc.c | 4 ++-- wireless/ieee802154/mac802154_internal.h | 13 +++++++------ wireless/ieee802154/mac802154_poll.c | 8 ++++---- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c index 70e44b68f5..b161c57f1e 100644 --- a/wireless/ieee802154/mac802154.c +++ b/wireless/ieee802154/mac802154.c @@ -235,7 +235,7 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv, } /**************************************************************************** - * Name: mac802154_create_datareq + * Name: mac802154_createdatareq * * Description: * 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, - FAR struct ieee802154_addr_s *coordaddr, - enum ieee802154_addrmode_e srcmode, - FAR struct ieee802154_txdesc_s *txdesc) +void mac802154_createdatareq(FAR struct ieee802154_privmac_s *priv, + FAR struct ieee802154_addr_s *coordaddr, + enum ieee802154_addrmode_e srcmode, + FAR struct ieee802154_txdesc_s *txdesc) { FAR struct iob_s *iob; @@ -947,8 +947,8 @@ static void mac802154_rxframe_worker(FAR void *arg) * operation. * * mac802154_txdesc_alloc(priv, &respdec, false); - * mac802154_create_datareq(priv, &req->coordaddr, - * IEEE802154_ADDRMODE_EXTENDED, respdesc); + * mac802154_createdatareq(priv, &req->coordaddr, + * IEEE802154_ADDRMODE_EXTENDED, respdesc); * sq_addlast((FAR sq_entry_t *)respdesc, &priv->csma_queue); */ } diff --git a/wireless/ieee802154/mac802154_assoc.c b/wireless/ieee802154/mac802154_assoc.c index fd31623d20..494f6d519c 100644 --- a/wireless/ieee802154/mac802154_assoc.c +++ b/wireless/ieee802154/mac802154_assoc.c @@ -492,8 +492,8 @@ void mac802154_txdone_assocreq(FAR struct ieee802154_privmac_s *priv, mac802154_txdesc_alloc(priv, &respdesc, false); - mac802154_create_datareq(priv, &priv->coordaddr, - IEEE802154_ADDRMODE_EXTENDED, respdesc); + mac802154_createdatareq(priv, &priv->coordaddr, + IEEE802154_ADDRMODE_EXTENDED, respdesc); priv->curr_cmd = IEEE802154_CMD_DATA_REQ; diff --git a/wireless/ieee802154/mac802154_internal.h b/wireless/ieee802154/mac802154_internal.h index 1ebfa0e15a..095cc18abb 100644 --- a/wireless/ieee802154/mac802154_internal.h +++ b/wireless/ieee802154/mac802154_internal.h @@ -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, - FAR struct ieee802154_txdesc_s **txdesc, - bool allow_interrupt); + FAR struct ieee802154_txdesc_s **txdesc, + bool allow_interrupt); int mac802154_timerstart(FAR struct ieee802154_privmac_s *priv, 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, FAR struct ieee802154_txdesc_s *txdesc); -void mac802154_create_datareq(FAR struct ieee802154_privmac_s *priv, - FAR struct ieee802154_addr_s *coordaddr, - enum ieee802154_addrmode_e srcmode, - FAR struct ieee802154_txdesc_s *txdesc); +void mac802154_createdatareq(FAR struct ieee802154_privmac_s *priv, + FAR struct ieee802154_addr_s *coordaddr, + enum ieee802154_addrmode_e srcmode, + FAR struct ieee802154_txdesc_s *txdesc); + #endif /* __WIRELESS_IEEE802154__MAC802154_INTERNAL_H */ diff --git a/wireless/ieee802154/mac802154_poll.c b/wireless/ieee802154/mac802154_poll.c index f82ba91f3d..12a0f26726 100644 --- a/wireless/ieee802154/mac802154_poll.c +++ b/wireless/ieee802154/mac802154_poll.c @@ -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)) { - mac802154_create_datareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_EXTENDED, - txdesc); + mac802154_createdatareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_EXTENDED, + txdesc); } else { - mac802154_create_datareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_SHORT, - txdesc); + mac802154_createdatareq(priv, &req->coordaddr, IEEE802154_ADDRMODE_SHORT, + txdesc); } /* Save a copy of the destination addressing infromation into the tx descriptor.