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

ieee802154: Minor renaming to align better with coding style standard

Browse Source
This commit is contained in:
Anthony Merlino 2017-06-22 00:48:02 -04:00
parent ee74a76eca
commit 8831d6e1d4
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wireless/ieee802154/mac802154.c
View File

@ -1096,7 +1096,7 @@ static void mac802154_rx_dataframe(FAR struct ieee802154_privmac_s *priv,
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC */
@ -1514,7 +1514,7 @@ MACHANDLE mac802154_create(FAR struct ieee802154_radio_s *radiodev)
/* Allow exclusive access to the dedicated command transaction */
sem_init(&mac->op_sem, 0, 1);
sem_init(&mac->opsem, 0, 1);
/* Setup watchdog for extraction timeout */

14
wireless/ieee802154/mac802154_assoc.c
View File

@ -100,7 +100,7 @@ int mac802154_req_associate(MACHANDLE mac,
* needs access to the MAC in order to unlock it.
*/
ret = mac802154_takesem(&priv->op_sem, true);
ret = mac802154_takesem(&priv->opsem, true);
if (ret < 0)
{
return ret;
@ -114,7 +114,7 @@ int mac802154_req_associate(MACHANDLE mac,
ret = mac802154_takesem(&priv->exclsem, true);
if (ret < 0)
{
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
return ret;
}
@ -170,7 +170,7 @@ int mac802154_req_associate(MACHANDLE mac,
{
iob_free(iob);
mac802154_givesem(&priv->exclsem);
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
return ret;
}
@ -441,7 +441,7 @@ void mac802154_txdone_assocreq(FAR struct ieee802154_privmac_s *priv,
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC, call the callback, get exclusive access again */
@ -573,7 +573,7 @@ void mac802154_txdone_datareq_assoc(FAR struct ieee802154_privmac_s *priv,
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC, call the callback, get exclusive access again */
@ -763,7 +763,7 @@ void mac802154_rx_assocresp(FAR struct ieee802154_privmac_s *priv,
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Notify the next highest layer of the association status */
@ -806,7 +806,7 @@ static void mac802154_timeout_assoc(FAR struct ieee802154_privmac_s *priv)
/* We are no longer performing the association operation */
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC */

2
wireless/ieee802154/mac802154_internal.h
View File

@ -244,7 +244,7 @@ struct ieee802154_privmac_s
* condition where you need to have more than one command frame simultaneously
*/
sem_t op_sem; /* Exclusive operations */
sem_t opsem; /* Exclusive operations */
enum mac802154_operation_e curr_op; /* The current overall operation */
enum ieee802154_cmdid_e curr_cmd; /* Type of the current cmd */
FAR struct ieee802154_txdesc_s *cmd_desc; /* TX descriptor for current cmd */

10
wireless/ieee802154/mac802154_poll.c
View File

@ -98,7 +98,7 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
* needs access to the MAC in order to unlock it.
*/
ret = mac802154_takesem(&priv->op_sem, true);
ret = mac802154_takesem(&priv->opsem, true);
if (ret < 0)
{
return ret;
@ -109,7 +109,7 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
ret = mac802154_takesem(&priv->exclsem, true);
if (ret < 0)
{
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
return ret;
}
@ -122,7 +122,7 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
if (ret < 0)
{
mac802154_givesem(&priv->exclsem);
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
return ret;
}
@ -219,7 +219,7 @@ void mac802154_txdone_datareq_poll(FAR struct ieee802154_privmac_s *priv,
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC, call the callback, get exclusive access again */
@ -280,7 +280,7 @@ void mac802154_timeout_poll(FAR struct ieee802154_privmac_s *priv)
/* We are no longer performing the association operation */
priv->curr_op = MAC802154_OP_NONE;
priv->cmd_desc = NULL;
mac802154_givesem(&priv->op_sem);
mac802154_givesem(&priv->opsem);
/* Release the MAC */