You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2022/01/03 11:52:57 UTC
[incubator-nuttx] branch master updated (c7d3a67 -> 6185377)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from c7d3a67 drivers/sensors/as5048b: fix lower half init issue
new 649619b net/can/can_recvmsg.c: fix warning
new 43ddcd5 include/nuttx/can.h: include nuttx/config.h
new 6185377 net/devif/devif_cansend.c: fix assertion for max data len
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
include/nuttx/can.h | 8 +++++---
net/can/can_recvmsg.c | 3 +++
net/devif/devif_cansend.c | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
[incubator-nuttx] 01/03: net/can/can_recvmsg.c: fix warning
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 649619b8f81a9d06d0f889ca1448680fc2f678c5
Author: raiden00pl <ra...@railab.me>
AuthorDate: Thu Dec 30 09:53:38 2021 +0100
net/can/can_recvmsg.c: fix warning
---
net/can/can_recvmsg.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/can/can_recvmsg.c b/net/can/can_recvmsg.c
index 36bacae..540f19e 100644
--- a/net/can/can_recvmsg.c
+++ b/net/can/can_recvmsg.c
@@ -410,7 +410,10 @@ static uint16_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev,
FAR void *pvpriv, uint16_t flags)
{
struct can_recvfrom_s *pstate = (struct can_recvfrom_s *)pvpriv;
+#if defined(CONFIG_NET_CANPROTO_OPTIONS) || defined(CONFIG_NET_CAN_CANFD) || \
+ defined(CONFIG_NET_TIMESTAMP)
struct can_conn_s *conn = (struct can_conn_s *)pstate->pr_sock->s_conn;
+#endif
/* 'priv' might be null in some race conditions (?) */
[incubator-nuttx] 03/03: net/devif/devif_cansend.c: fix assertion for max data len
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6185377eece2cca8b867035507ab105cfbeadabb
Author: raiden00pl <ra...@railab.me>
AuthorDate: Mon Jan 3 11:45:42 2022 +0100
net/devif/devif_cansend.c: fix assertion for max data len
---
net/devif/devif_cansend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/devif/devif_cansend.c b/net/devif/devif_cansend.c
index 60325a5..b82956c 100644
--- a/net/devif/devif_cansend.c
+++ b/net/devif/devif_cansend.c
@@ -83,7 +83,7 @@
void devif_can_send(FAR struct net_driver_s *dev, FAR const void *buf,
unsigned int len)
{
- DEBUGASSERT(dev && len > 0 && len < NETDEV_PKTSIZE(dev));
+ DEBUGASSERT(dev && len > 0 && len <= NETDEV_PKTSIZE(dev));
/* Copy the data into the device packet buffer */
[incubator-nuttx] 02/03: include/nuttx/can.h: include nuttx/config.h
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 43ddcd52778e700454ccefeb37ea93e2c94a2322
Author: raiden00pl <ra...@railab.me>
AuthorDate: Thu Dec 30 09:55:15 2021 +0100
include/nuttx/can.h: include nuttx/config.h
---
include/nuttx/can.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/nuttx/can.h b/include/nuttx/can.h
index 5e63e5c..98640fc 100644
--- a/include/nuttx/can.h
+++ b/include/nuttx/can.h
@@ -18,13 +18,15 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_CAN_CAN_H
-#define __INCLUDE_NUTTX_CAN_CAN_H
+#ifndef __INCLUDE_NUTTX_CAN_H
+#define __INCLUDE_NUTTX_CAN_H
/****************************************************************************
* Included Files
****************************************************************************/
+#include <nuttx/config.h>
+
#ifdef CONFIG_CAN_TXREADY
# include <nuttx/wqueue.h>
#endif
@@ -307,4 +309,4 @@ extern "C"
#endif
#endif /* CONFIG_CAN */
-#endif /* __INCLUDE_NUTTX_CAN_CAN_H */
+#endif /* __INCLUDE_NUTTX_CAN_H */