This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 61ed1a3a0ed80a5c367a45c7518dc2f38668380a Author: raiden00pl <[email protected]> AuthorDate: Thu Oct 22 12:54:27 2026 +0200 wireless/ieee802154: fix nxstyle errors Fix the nxstyle errors in the MAC files changed by the next commits. Assisted-by: Claude Code Signed-off-by: raiden00pl <[email protected]> --- wireless/ieee802154/mac802154.c | 1 + wireless/ieee802154/mac802154_device.c | 12 ++++++------ wireless/ieee802154/mac802154_ioctl.c | 6 +++--- wireless/ieee802154/mac802154_netdev.c | 6 +++--- wireless/ieee802154/mac802154_scan.c | 1 + 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c index b335a6bd51f..901653c35cf 100644 --- a/wireless/ieee802154/mac802154.c +++ b/wireless/ieee802154/mac802154.c @@ -2051,6 +2051,7 @@ static void mac802154_rxbeaconframe(FAR struct ieee802154_privmac_s *priv, else if (priv->curr_op == MAC802154_OP_NONE) { int sval; + DEBUGASSERT(nxsem_get_value(&priv->opsem, &sval) == 0 && sval == 1); nxsem_wait_uninterruptible(&priv->opsem); diff --git a/wireless/ieee802154/mac802154_device.c b/wireless/ieee802154/mac802154_device.c index 33e34dbf2f2..f53c27adafb 100644 --- a/wireless/ieee802154/mac802154_device.c +++ b/wireless/ieee802154/mac802154_device.c @@ -650,12 +650,12 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd, * and pop an event off the queue */ - ret = nxmutex_lock(&dev->md_lock); - if (ret < 0) - { - wlerr("ERROR: nxsem_wait failed: %d\n", ret); - return ret; - } + ret = nxmutex_lock(&dev->md_lock); + if (ret < 0) + { + wlerr("ERROR: nxsem_wait failed: %d\n", ret); + return ret; + } } } break; diff --git a/wireless/ieee802154/mac802154_ioctl.c b/wireless/ieee802154/mac802154_ioctl.c index 9024f2bc8cf..0f8dfbcd795 100644 --- a/wireless/ieee802154/mac802154_ioctl.c +++ b/wireless/ieee802154/mac802154_ioctl.c @@ -141,9 +141,9 @@ int mac802154_ioctl(MACHANDLE mac, int cmd, unsigned long arg) } break; default: - wlerr("ERROR: Unrecognized cmd: %d\n", cmd); - ret = -ENOTTY; - break; + wlerr("ERROR: Unrecognized cmd: %d\n", cmd); + ret = -ENOTTY; + break; } } diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c index 83c46a93933..55ea9d9e25f 100644 --- a/wireless/ieee802154/mac802154_netdev.c +++ b/wireless/ieee802154/mac802154_netdev.c @@ -1032,9 +1032,9 @@ static int macnet_ioctl(FAR struct net_driver_s *dev, int cmd, */ else - { - ret = mac802154_ioctl(priv->md_mac, cmd, arg); - } + { + ret = mac802154_ioctl(priv->md_mac, cmd, arg); + } nxmutex_unlock(&priv->md_lock); return ret; diff --git a/wireless/ieee802154/mac802154_scan.c b/wireless/ieee802154/mac802154_scan.c index 80f1c7ce7d3..541449f6eed 100644 --- a/wireless/ieee802154/mac802154_scan.c +++ b/wireless/ieee802154/mac802154_scan.c @@ -325,6 +325,7 @@ static void mac802154_scantimeout(FAR void *arg) { FAR struct ieee802154_privmac_s *priv = (FAR struct ieee802154_privmac_s *)arg; + DEBUGASSERT(priv->curr_op == MAC802154_OP_SCAN); nxmutex_lock(&priv->lock);
