Skip to content

Commit cb2aa42

Browse files
raiden00plraiden00pl
committed
net: fix nxstyle errors
fix nxstyle errors for net Signed-off-by: raiden00pl <raiden00@railab.me> Assisted-by: Claude Code
1 parent 5aa1896 commit cb2aa42

106 files changed

Lines changed: 1481 additions & 1313 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎net/arp/arp_acd.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static void arp_acd_arrange_announce(FAR struct net_driver_s *dev)
8282

8383
int ret = work_queue(LPWORK, &dev->d_acd.work, arp_acd_try_announce,
8484
(FAR void *)dev, DSEC2TICK(dev->d_acd.ttw));
85+
8586
if (ret != OK)
8687
{
8788
nerr("ERROR ret %d \n", ret);

‎net/arp/arp_table.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ static void arp_get_arpreq(FAR struct arpreq *output,
262262
static void arp_unreach_work(FAR void *param)
263263
{
264264
FAR struct arp_entry_s *tabptr = (FAR struct arp_entry_s *)param;
265+
265266
iob_free_queue(&tabptr->at_queue);
266267
}
267268
#endif
@@ -491,6 +492,7 @@ int arp_find(in_addr_t ipaddr, FAR uint8_t *ethaddr,
491492
sizeof(tabptr->at_ethaddr)) == 0)
492493
{
493494
clock_t elapsed;
495+
494496
elapsed = clock_systime_ticks() - tabptr->at_time;
495497
if (elapsed <= ARP_INPROGRESS_TICK)
496498
{

‎net/bluetooth/bluetooth_sendmsg.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ static ssize_t bluetooth_sendto(FAR struct socket *psock,
324324
else if (psock->s_proto == BTPROTO_HCI)
325325
{
326326
struct bluetooth_findbyidx_s match;
327+
327328
match.bf_tgt = conn->bc_ldev;
328329
match.bf_cur = 0;
329330
match.bf_radio = NULL;
@@ -362,12 +363,14 @@ static ssize_t bluetooth_sendto(FAR struct socket *psock,
362363
if (psock->s_proto == BTPROTO_L2CAP)
363364
{
364365
FAR struct sockaddr_l2 *destaddr = (FAR struct sockaddr_l2 *)to;
366+
365367
memcpy(&state.is_destaddr, &destaddr->l2_bdaddr,
366368
sizeof(bt_addr_t));
367369
}
368370
else if (psock->s_proto == BTPROTO_HCI)
369371
{
370372
FAR struct sockaddr_hci *destaddr = (FAR struct sockaddr_hci *)to;
373+
371374
state.is_channel = destaddr->hci_channel;
372375
}
373376
else

‎net/bluetooth/bluetooth_sockif.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ static int bluetooth_sockif_alloc(FAR struct socket *psock)
114114
*/
115115

116116
FAR struct bluetooth_conn_s *conn = bluetooth_conn_alloc();
117+
117118
if (conn == NULL)
118119
{
119120
/* Failed to reserve a connection structure */
@@ -321,6 +322,7 @@ static int bluetooth_bind(FAR struct socket *psock,
321322
case BTPROTO_L2CAP:
322323
{
323324
FAR const struct sockaddr_l2 *iaddr;
325+
324326
if (addrlen < sizeof(struct sockaddr_l2))
325327
{
326328
nerr("ERROR: Invalid address length: %zu < %zu\n",
@@ -335,6 +337,7 @@ static int bluetooth_bind(FAR struct socket *psock,
335337
case BTPROTO_HCI:
336338
{
337339
FAR const struct sockaddr_hci *hciaddr;
340+
338341
if (addrlen < sizeof(struct sockaddr_hci))
339342
{
340343
nerr("ERROR: Invalid address length: %zu < %zu\n",

‎net/can/can_callback.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,28 @@ uint32_t can_callback(FAR struct net_driver_s *dev,
126126
if (conn)
127127
{
128128
#ifdef CONFIG_NET_TIMESTAMP
129-
/* TIMESTAMP sockopt is activated,
130-
* create timestamp and copy to iob
131-
*/
129+
/* TIMESTAMP sockopt is activated,
130+
* create timestamp and copy to iob
131+
*/
132+
133+
if (_SO_GETOPT(conn->sconn.s_options, SO_TIMESTAMP) &&
134+
(dev->d_iob != NULL))
135+
{
136+
struct timeval tv;
137+
FAR struct timespec *ts = (FAR struct timespec *)&tv;
138+
int len;
132139

133-
if (_SO_GETOPT(conn->sconn.s_options, SO_TIMESTAMP) &&
134-
(dev->d_iob != NULL))
140+
clock_systime_timespec(ts);
141+
tv.tv_usec = ts->tv_nsec / 1000;
142+
143+
len = iob_trycopyin(dev->d_iob, (FAR uint8_t *)&tv,
144+
sizeof(struct timeval),
145+
-CONFIG_NET_LL_GUARDSIZE, false);
146+
if (len == sizeof(struct timeval))
135147
{
136-
struct timeval tv;
137-
FAR struct timespec *ts = (FAR struct timespec *)&tv;
138-
int len;
139-
140-
clock_systime_timespec(ts);
141-
tv.tv_usec = ts->tv_nsec / 1000;
142-
143-
len = iob_trycopyin(dev->d_iob, (FAR uint8_t *)&tv,
144-
sizeof(struct timeval),
145-
-CONFIG_NET_LL_GUARDSIZE, false);
146-
if (len == sizeof(struct timeval))
147-
{
148-
dev->d_len += len;
149-
}
148+
dev->d_len += len;
150149
}
150+
}
151151
#endif
152152

153153
conn_lock(&conn->sconn);

‎net/can/can_conn.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ FAR struct can_conn_s *can_active(FAR struct net_driver_s *dev,
288288
{
289289
#ifdef CONFIG_NET_CANPROTO_OPTIONS
290290
canid_t can_id;
291+
291292
memcpy(&can_id, NETLLBUF, sizeof(canid_t));
292293
#endif
293294

‎net/can/can_getsockopt.c‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
136136
else
137137
{
138138
FAR can_err_mask_t *mask = (FAR can_err_mask_t *)value;
139+
139140
*mask = conn->err_mask;
140141
*value_len = sizeof(can_err_mask_t);
141142
}
@@ -157,17 +158,17 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
157158
if (*value_len < sizeof(int))
158159
{
159160
return -EINVAL;
160-
}
161+
}
161162

162163
/* Sample the current options. This is atomic operation and so
163164
* should not require any special steps for thread safety. We
164165
* this outside of the macro because you can never be sure what
165166
* a macro will do.
166167
*/
167168

168-
*(FAR int *)value = _SO_GETOPT(conn->sconn.s_options, option);
169-
*value_len = sizeof(int);
170-
break;
169+
*(FAR int *)value = _SO_GETOPT(conn->sconn.s_options, option);
170+
*value_len = sizeof(int);
171+
break;
171172

172173
#if CONFIG_NET_RECV_BUFSIZE > 0
173174
case SO_RCVBUF:
@@ -188,13 +189,13 @@ int can_getsockopt(FAR struct socket *psock, int level, int option,
188189
#if CONFIG_NET_SEND_BUFSIZE > 0
189190
case SO_SNDBUF:
190191
/* Verify that option is the size of an 'int'. Should also check
191-
* that 'value' is properly aligned for an 'int'
192-
*/
192+
* that 'value' is properly aligned for an 'int'
193+
*/
193194

194195
if (*value_len < sizeof(int))
195196
{
196197
return -EINVAL;
197-
}
198+
}
198199

199200
*(FAR int *)value = conn->sndbufs;
200201
break;

‎net/can/can_input.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ int can_input(FAR struct net_driver_s *dev)
311311
if (ret < 0)
312312
{
313313
#ifdef CONFIG_NET_STATISTICS
314-
g_netstats.can.drop++;
314+
g_netstats.can.drop++;
315315
#endif
316316
}
317317

‎net/can/can_sendmsg.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev,
112112

113113
int ret = devif_send(dev, pstate->snd_buffer,
114114
pstate->snd_buflen + pstate->pr_msglen, 0);
115+
115116
dev->d_len = dev->d_sndlen - pstate->pr_msglen;
116117
if (ret <= 0)
117118
{
@@ -237,6 +238,7 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR const struct msghdr *msg,
237238
if (msg->msg_controllen > sizeof(struct cmsghdr))
238239
{
239240
FAR struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
241+
240242
if (_SO_GETOPT(conn->sconn.s_options, CAN_RAW_TX_DEADLINE) &&
241243
cmsg->cmsg_level == SOL_CAN_RAW &&
242244
cmsg->cmsg_type == CAN_RAW_TX_DEADLINE &&

‎net/can/can_sockif.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ static int can_setup(FAR struct socket *psock)
208208
*/
209209

210210
FAR struct can_conn_s *conn = can_alloc();
211+
211212
if (conn == NULL)
212213
{
213214
/* Failed to reserve a connection structure */
@@ -327,6 +328,7 @@ static int can_bind(FAR struct socket *psock,
327328
{
328329
FAR struct sockaddr_can *canaddr;
329330
FAR struct can_conn_s *conn;
331+
330332
DEBUGASSERT(addr != NULL &&
331333
addrlen >= sizeof(struct sockaddr_can));
332334

@@ -341,6 +343,7 @@ static int can_bind(FAR struct socket *psock,
341343
conn->dev = netdev_findbyindex(canaddr->can_ifindex);
342344
#else
343345
char netdev_name[5] = "can0";
346+
344347
netdev_name[3] += canaddr->can_ifindex;
345348
conn->dev = netdev_findbyname((const char *)&netdev_name);
346349
#endif

0 commit comments

Comments
 (0)