From 087b4da88fd2a66e635bdb6430940f2ab795065c Mon Sep 17 00:00:00 2001 From: Alin Jerpelea Date: Thu, 10 Jun 2021 07:21:35 +0200 Subject: [PATCH] wireless: ieee802154: libmac: nxstyle fixes Fixes for nxstyle errors reported by the tool. Signed-off-by: Alin Jerpelea --- .../ieee802154/libmac/ieee802154_assocreq.c | 3 ++- .../ieee802154/libmac/ieee802154_assocresp.c | 3 ++- .../libmac/ieee802154_disassocreq.c | 11 +++++--- .../ieee802154/libmac/ieee802154_getreq.c | 3 ++- .../ieee802154/libmac/ieee802154_gtsreq.c | 3 ++- .../ieee802154/libmac/ieee802154_orphanresp.c | 3 ++- .../ieee802154/libmac/ieee802154_pollreq.c | 3 ++- .../ieee802154/libmac/ieee802154_resetreq.c | 3 ++- .../ieee802154/libmac/ieee802154_rxenabreq.c | 9 ++++--- .../ieee802154/libmac/ieee802154_scanreq.c | 3 ++- .../ieee802154/libmac/ieee802154_setreq.c | 3 ++- .../ieee802154/libmac/ieee802154_startreq.c | 3 ++- .../ieee802154/libmac/ieee802154_syncreq.c | 3 ++- .../ieee802154/libmac/sixlowpan_disassocreq.c | 3 ++- wireless/ieee802154/libmac/sixlowpan_getreq.c | 25 +++++++++++++------ .../ieee802154/libmac/sixlowpan_rxenabreq.c | 3 ++- wireless/ieee802154/libmac/sixlowpan_setreq.c | 15 +++++++---- 17 files changed, 66 insertions(+), 33 deletions(-) diff --git a/wireless/ieee802154/libmac/ieee802154_assocreq.c b/wireless/ieee802154/libmac/ieee802154_assocreq.c index c9f98d20e..8db5e677b 100644 --- a/wireless/ieee802154/libmac/ieee802154_assocreq.c +++ b/wireless/ieee802154/libmac/ieee802154_assocreq.c @@ -42,7 +42,8 @@ int ieee802154_assoc_req(int fd, FAR struct ieee802154_assoc_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_ASSOC_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_ASSOC_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_assocresp.c b/wireless/ieee802154/libmac/ieee802154_assocresp.c index 0c5390d1d..4c38de076 100644 --- a/wireless/ieee802154/libmac/ieee802154_assocresp.c +++ b/wireless/ieee802154/libmac/ieee802154_assocresp.c @@ -43,7 +43,8 @@ int ieee802154_assoc_resp(int fd, FAR struct ieee802154_assoc_resp_s *resp) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_ASSOC_RESPONSE, (unsigned long)((uintptr_t)resp)); + ret = ioctl(fd, MAC802154IOC_MLME_ASSOC_RESPONSE, + (unsigned long)((uintptr_t)resp)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_disassocreq.c b/wireless/ieee802154/libmac/ieee802154_disassocreq.c index a586870f8..81cd90b18 100644 --- a/wireless/ieee802154/libmac/ieee802154_disassocreq.c +++ b/wireless/ieee802154/libmac/ieee802154_disassocreq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/wireless/ieee802154/libmac/ieee802154_assocreq.c + * apps/wireless/ieee802154/libmac/ieee802154_disassocreq.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -38,15 +38,18 @@ * Public Functions ****************************************************************************/ -int ieee802154_disassoc_req(int fd, FAR struct ieee802154_disassoc_req_s *req) +int ieee802154_disassoc_req(int fd, + FAR struct ieee802154_disassoc_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_DISASSOC_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_DISASSOC_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; - fprintf(stderr, "MAC802154IOC_MLME_DISASSOC_REQUEST failed: %d\n", ret); + fprintf(stderr, + "MAC802154IOC_MLME_DISASSOC_REQUEST failed: %d\n", ret); } return ret; diff --git a/wireless/ieee802154/libmac/ieee802154_getreq.c b/wireless/ieee802154/libmac/ieee802154_getreq.c index 2d3b50b13..9d2bd211f 100644 --- a/wireless/ieee802154/libmac/ieee802154_getreq.c +++ b/wireless/ieee802154/libmac/ieee802154_getreq.c @@ -42,7 +42,8 @@ int ieee802154_get_req(int fd, FAR struct ieee802154_get_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_GET_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_GET_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_gtsreq.c b/wireless/ieee802154/libmac/ieee802154_gtsreq.c index cae22954c..51bfdccea 100644 --- a/wireless/ieee802154/libmac/ieee802154_gtsreq.c +++ b/wireless/ieee802154/libmac/ieee802154_gtsreq.c @@ -42,7 +42,8 @@ int ieee802154_gts_req(int fd, FAR struct ieee802154_gts_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_GTS_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_GTS_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_orphanresp.c b/wireless/ieee802154/libmac/ieee802154_orphanresp.c index d5ea9c193..af63cc9ac 100644 --- a/wireless/ieee802154/libmac/ieee802154_orphanresp.c +++ b/wireless/ieee802154/libmac/ieee802154_orphanresp.c @@ -44,7 +44,8 @@ int ieee802154_orphan_resp(int fd, FAR struct ieee802154_orphan_resp_s *resp) union ieee802154_macarg_u arg; int ret; - ret = ioctl(fd, MAC802154IOC_MLME_ORPHAN_RESPONSE, (unsigned long)((uintptr_t)&arg)); + ret = ioctl(fd, MAC802154IOC_MLME_ORPHAN_RESPONSE, + (unsigned long)((uintptr_t)&arg)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_pollreq.c b/wireless/ieee802154/libmac/ieee802154_pollreq.c index 033f7953b..4a5107442 100644 --- a/wireless/ieee802154/libmac/ieee802154_pollreq.c +++ b/wireless/ieee802154/libmac/ieee802154_pollreq.c @@ -42,7 +42,8 @@ int ieee802154_poll_req(int fd, FAR struct ieee802154_poll_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_POLL_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_POLL_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_resetreq.c b/wireless/ieee802154/libmac/ieee802154_resetreq.c index 1a5f809e0..20175af99 100644 --- a/wireless/ieee802154/libmac/ieee802154_resetreq.c +++ b/wireless/ieee802154/libmac/ieee802154_resetreq.c @@ -45,7 +45,8 @@ int ieee802154_reset_req(int fd, bool resetattr) req.resetattr = resetattr; - ret = ioctl(fd, MAC802154IOC_MLME_RESET_REQUEST, (unsigned long)((uintptr_t)&req)); + ret = ioctl(fd, MAC802154IOC_MLME_RESET_REQUEST, + (unsigned long)((uintptr_t)&req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_rxenabreq.c b/wireless/ieee802154/libmac/ieee802154_rxenabreq.c index 9d94b216a..f83739cf4 100644 --- a/wireless/ieee802154/libmac/ieee802154_rxenabreq.c +++ b/wireless/ieee802154/libmac/ieee802154_rxenabreq.c @@ -38,15 +38,18 @@ * Public Functions ****************************************************************************/ -int ieee802154_rxenable_req(int fd, FAR struct ieee802154_rxenable_req_s *req) +int ieee802154_rxenable_req(int fd, + FAR struct ieee802154_rxenable_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_RXENABLE_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_RXENABLE_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; - fprintf(stderr, "MAC802154IOC_MLME_RXENABLE_REQUEST failed: %d\n", ret); + fprintf(stderr, + "MAC802154IOC_MLME_RXENABLE_REQUEST failed: %d\n", ret); } return ret; diff --git a/wireless/ieee802154/libmac/ieee802154_scanreq.c b/wireless/ieee802154/libmac/ieee802154_scanreq.c index 438a70c03..0744c9eae 100644 --- a/wireless/ieee802154/libmac/ieee802154_scanreq.c +++ b/wireless/ieee802154/libmac/ieee802154_scanreq.c @@ -42,7 +42,8 @@ int ieee802154_scan_req(int fd, FAR struct ieee802154_scan_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_SCAN_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_SCAN_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_setreq.c b/wireless/ieee802154/libmac/ieee802154_setreq.c index 23c8a134e..feaf4c773 100644 --- a/wireless/ieee802154/libmac/ieee802154_setreq.c +++ b/wireless/ieee802154/libmac/ieee802154_setreq.c @@ -42,7 +42,8 @@ int ieee802154_set_req(int fd, FAR struct ieee802154_set_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_SET_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_SET_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_startreq.c b/wireless/ieee802154/libmac/ieee802154_startreq.c index f70911658..67ae849b4 100644 --- a/wireless/ieee802154/libmac/ieee802154_startreq.c +++ b/wireless/ieee802154/libmac/ieee802154_startreq.c @@ -42,7 +42,8 @@ int ieee802154_start_req(int fd, FAR struct ieee802154_start_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_START_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_START_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/ieee802154_syncreq.c b/wireless/ieee802154/libmac/ieee802154_syncreq.c index 7bdabb273..18efd0bee 100644 --- a/wireless/ieee802154/libmac/ieee802154_syncreq.c +++ b/wireless/ieee802154/libmac/ieee802154_syncreq.c @@ -42,7 +42,8 @@ int ieee802154_sync_req(int fd, FAR struct ieee802154_sync_req_s *req) { int ret; - ret = ioctl(fd, MAC802154IOC_MLME_SYNC_REQUEST, (unsigned long)((uintptr_t)req)); + ret = ioctl(fd, MAC802154IOC_MLME_SYNC_REQUEST, + (unsigned long)((uintptr_t)req)); if (ret < 0) { ret = -errno; diff --git a/wireless/ieee802154/libmac/sixlowpan_disassocreq.c b/wireless/ieee802154/libmac/sixlowpan_disassocreq.c index 64ac83602..c52406d4f 100644 --- a/wireless/ieee802154/libmac/sixlowpan_disassocreq.c +++ b/wireless/ieee802154/libmac/sixlowpan_disassocreq.c @@ -53,7 +53,8 @@ int sixlowpan_desassoc_req(int sock, FAR const char *ifname, if (ret < 0) { ret = -errno; - fprintf(stderr, "MAC802154IOC_MLME_DISASSOC_REQUEST failed: %d\n", ret); + fprintf(stderr, + "MAC802154IOC_MLME_DISASSOC_REQUEST failed: %d\n", ret); } return ret; diff --git a/wireless/ieee802154/libmac/sixlowpan_getreq.c b/wireless/ieee802154/libmac/sixlowpan_getreq.c index d125beffa..071e72b8d 100644 --- a/wireless/ieee802154/libmac/sixlowpan_getreq.c +++ b/wireless/ieee802154/libmac/sixlowpan_getreq.c @@ -66,7 +66,9 @@ int sixlowpan_get_req(int sock, FAR const char *ifname, return ret; } -/* Wrappers around get_req to make it even easier to get common attributes */ +/* Wrappers around get_req to make it even easier to get common + * attributes + */ int sixlowpan_getchan(int sock, FAR const char *ifname, FAR uint8_t *chan) { @@ -120,7 +122,8 @@ int sixlowpan_getpanid(int sock, FAR const char *ifname, FAR uint8_t *panid) return ret; } -int sixlowpan_getcoordeaddr(int sock, FAR const char *ifname, FAR uint8_t *eaddr) +int sixlowpan_getcoordeaddr(int sock, + FAR const char *ifname, FAR uint8_t *eaddr) { struct ieee802154_get_req_s req; int ret; @@ -133,7 +136,8 @@ int sixlowpan_getcoordeaddr(int sock, FAR const char *ifname, FAR uint8_t *eaddr return ret; } -int sixlowpan_getcoordsaddr(int sock, FAR const char *ifname, FAR uint8_t *saddr) +int sixlowpan_getcoordsaddr(int sock, + FAR const char *ifname, FAR uint8_t *saddr) { struct ieee802154_get_req_s req; int ret; @@ -146,7 +150,8 @@ int sixlowpan_getcoordsaddr(int sock, FAR const char *ifname, FAR uint8_t *saddr return ret; } -int sixlowpan_getrxonidle(int sock, FAR const char *ifname, FAR bool *rxonidle) +int sixlowpan_getrxonidle(int sock, + FAR const char *ifname, FAR bool *rxonidle) { struct ieee802154_get_req_s req; int ret; @@ -173,7 +178,8 @@ int sixlowpan_getdevmode(int sock, FAR const char *ifname, return ret; } -int sixlowpan_getpromisc(int sock, FAR const char *ifname, FAR bool *promisc) +int sixlowpan_getpromisc(int sock, + FAR const char *ifname, FAR bool *promisc) { struct ieee802154_get_req_s req; int ret; @@ -186,7 +192,8 @@ int sixlowpan_getpromisc(int sock, FAR const char *ifname, FAR bool *promisc) return ret; } -int sixlowpan_gettxpwr(int sock, FAR const char *ifname, FAR int32_t *txpwr) +int sixlowpan_gettxpwr(int sock, + FAR const char *ifname, FAR int32_t *txpwr) { struct ieee802154_get_req_s req; int ret; @@ -199,7 +206,8 @@ int sixlowpan_gettxpwr(int sock, FAR const char *ifname, FAR int32_t *txpwr) return ret; } -int sixlowpan_getmaxretries(int sock, FAR const char *ifname, FAR uint8_t *retries) +int sixlowpan_getmaxretries(int sock, + FAR const char *ifname, FAR uint8_t *retries) { struct ieee802154_get_req_s req; int ret; @@ -212,7 +220,8 @@ int sixlowpan_getmaxretries(int sock, FAR const char *ifname, FAR uint8_t *retri return ret; } -int sixlowpan_getfcslen(int sock, FAR const char *ifname, FAR uint8_t *fcslen) +int sixlowpan_getfcslen(int sock, + FAR const char *ifname, FAR uint8_t *fcslen) { struct ieee802154_get_req_s req; int ret; diff --git a/wireless/ieee802154/libmac/sixlowpan_rxenabreq.c b/wireless/ieee802154/libmac/sixlowpan_rxenabreq.c index a99104c54..8af278644 100644 --- a/wireless/ieee802154/libmac/sixlowpan_rxenabreq.c +++ b/wireless/ieee802154/libmac/sixlowpan_rxenabreq.c @@ -53,7 +53,8 @@ int sixlowpan_rxenable_req(int sock, FAR const char *ifname, if (ret < 0) { ret = -errno; - fprintf(stderr, "MAC802154IOC_MLME_RXENABLE_REQUEST failed: %d\n", ret); + fprintf(stderr, + "MAC802154IOC_MLME_RXENABLE_REQUEST failed: %d\n", ret); } return ret; diff --git a/wireless/ieee802154/libmac/sixlowpan_setreq.c b/wireless/ieee802154/libmac/sixlowpan_setreq.c index c00a6e487..ab67f2c97 100644 --- a/wireless/ieee802154/libmac/sixlowpan_setreq.c +++ b/wireless/ieee802154/libmac/sixlowpan_setreq.c @@ -71,7 +71,8 @@ int sixlowpan_setchan(int sock, FAR const char *ifname, uint8_t chan) return sixlowpan_set_req(sock, ifname, &req); } -int sixlowpan_seteaddr(int sock, FAR const char *ifname, FAR const uint8_t *eaddr) +int sixlowpan_seteaddr(int sock, + FAR const char *ifname, FAR const uint8_t *eaddr) { struct ieee802154_set_req_s req; @@ -81,7 +82,8 @@ int sixlowpan_seteaddr(int sock, FAR const char *ifname, FAR const uint8_t *eadd return sixlowpan_set_req(sock, ifname, &req); } -int sixlowpan_setsaddr(int sock, FAR const char *ifname, FAR const uint8_t *saddr) +int sixlowpan_setsaddr(int sock, + FAR const char *ifname, FAR const uint8_t *saddr) { struct ieee802154_set_req_s req; @@ -91,7 +93,8 @@ int sixlowpan_setsaddr(int sock, FAR const char *ifname, FAR const uint8_t *sadd return sixlowpan_set_req(sock, ifname, &req); } -int sixlowpan_setpanid(int sock, FAR const char *ifname, FAR const uint8_t *panid) +int sixlowpan_setpanid(int sock, + FAR const char *ifname, FAR const uint8_t *panid) { struct ieee802154_set_req_s req; @@ -121,7 +124,8 @@ int sixlowpan_setpromisc(int sock, FAR const char *ifname, bool promisc) return sixlowpan_set_req(sock, ifname, &req); } -int sixlowpan_setassocpermit(int sock, FAR const char *ifname, bool assocpermit) +int sixlowpan_setassocpermit(int sock, + FAR const char *ifname, bool assocpermit) { struct ieee802154_set_req_s req; @@ -141,7 +145,8 @@ int sixlowpan_settxpwr(int sock, FAR const char *ifname, int32_t txpwr) return sixlowpan_set_req(sock, ifname, &req); } -int sixlowpan_setmaxretries(int sock, FAR const char *ifname, uint8_t retries) +int sixlowpan_setmaxretries(int sock, + FAR const char *ifname, uint8_t retries) { struct ieee802154_set_req_s req;