You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/09/16 06:18:06 UTC
[nuttx] 13/20: net/can: Add FAR specifier and fix nxstyle issues
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5bee23da07102bee7e1ae129b94652c91e55fad2
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Fri Sep 15 22:05:19 2023 +0300
net/can: Add FAR specifier and fix nxstyle issues
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
net/can/can_sendmsg.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c
index bddfa734b2..31acea779f 100644
--- a/net/can/can_sendmsg.c
+++ b/net/can/can_sendmsg.c
@@ -119,7 +119,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
if (pstate->pr_msglen > 0) /* concat cmsg data after packet */
{
memcpy(dev->d_buf + pstate->snd_buflen, pstate->pr_msgbuf,
- pstate->pr_msglen);
+ pstate->pr_msglen);
dev->d_sndlen = pstate->snd_buflen + pstate->pr_msglen;
}
}
@@ -202,8 +202,8 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
#if defined(CONFIG_NET_CANPROTO_OPTIONS) && defined(CONFIG_NET_CAN_CANFD)
if (conn->fd_frames)
{
- if (msg->msg_iov->iov_len != CANFD_MTU
- && msg->msg_iov->iov_len != CAN_MTU)
+ if (msg->msg_iov->iov_len != CANFD_MTU &&
+ msg->msg_iov->iov_len != CAN_MTU)
{
return -EINVAL;
}
@@ -233,10 +233,11 @@ ssize_t can_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
#ifdef CONFIG_NET_CAN_RAW_TX_DEADLINE
if (msg->msg_controllen > sizeof(struct cmsghdr))
{
- struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
- if (conn->tx_deadline && cmsg->cmsg_level == SOL_CAN_RAW
- && cmsg->cmsg_type == CAN_RAW_TX_DEADLINE
- && cmsg->cmsg_len == sizeof(struct timeval))
+ FAR struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);
+ if (conn->tx_deadline &&
+ cmsg->cmsg_level == SOL_CAN_RAW &&
+ cmsg->cmsg_type == CAN_RAW_TX_DEADLINE &&
+ cmsg->cmsg_len == sizeof(struct timeval))
{
state.pr_msgbuf = CMSG_DATA(cmsg); /* Buffer to cmsg data */
state.pr_msglen = cmsg->cmsg_len; /* len of cmsg data */