This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 481d4b6e2 can: Merge netpacket/can.h into nuttx/can.h
481d4b6e2 is described below
commit 481d4b6e23cbecb271c0ac23400a700c362d4a0a
Author: gaohedong <gaohed...@xiaomi.com>
AuthorDate: Wed Aug 21 22:22:30 2024 +0800
can: Merge netpacket/can.h into nuttx/can.h
This patch is associated with 'https://github.com/apache/nuttx/pull/13048',
so it cannot be verified separately by CI. Please help to associate and review
it. Thank you!
Signed-off-by: gaohedong <gaohed...@xiaomi.com>
---
canutils/candump/candump.c | 1 -
canutils/cansend/cansend.c | 1 -
canutils/lely-canopen/0001-NuttX-port.patch | 2 --
canutils/libcanutils/lib.c | 1 -
canutils/slcan/slcan.c | 1 -
examples/opencyphal/canard_main.c | 1 -
examples/opencyphal/socketcan.h | 1 -
7 files changed, 8 deletions(-)
diff --git a/canutils/candump/candump.c b/canutils/candump/candump.c
index 66dabef73..66887fb61 100644
--- a/canutils/candump/candump.c
+++ b/canutils/candump/candump.c
@@ -62,7 +62,6 @@
#include <net/if.h>
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include "terminal.h"
#include "lib.h"
diff --git a/canutils/cansend/cansend.c b/canutils/cansend/cansend.c
index ade275066..f630addf7 100644
--- a/canutils/cansend/cansend.c
+++ b/canutils/cansend/cansend.c
@@ -77,7 +77,6 @@
#include <sys/socket.h>
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include "lib.h"
diff --git a/canutils/lely-canopen/0001-NuttX-port.patch
b/canutils/lely-canopen/0001-NuttX-port.patch
index ccbbebbac..8216053e8 100644
--- a/canutils/lely-canopen/0001-NuttX-port.patch
+++ b/canutils/lely-canopen/0001-NuttX-port.patch
@@ -55,7 +55,6 @@ index 4fc133dd..b059c849 100644
+#ifdef __NuttX__
+#include <nuttx/can.h>
-+#include <netpacket/can.h>
+#endif
+
int
@@ -99,7 +98,6 @@ index ca7e7d95..35d9a9f2 100644
+#ifdef __NuttX__
+#include <sys/ioctl.h>
+#include <nuttx/can.h>
-+#include <netpacket/can.h>
+#include <net/if.h>
+#endif
+
diff --git a/canutils/libcanutils/lib.c b/canutils/libcanutils/lib.c
index f84974a81..12580521a 100644
--- a/canutils/libcanutils/lib.c
+++ b/canutils/libcanutils/lib.c
@@ -49,7 +49,6 @@
#include <sys/param.h>
#include <sys/socket.h> /* for sa_family_t */
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include "lib.h"
diff --git a/canutils/slcan/slcan.c b/canutils/slcan/slcan.c
index 1944002ae..6190e2ea2 100644
--- a/canutils/slcan/slcan.c
+++ b/canutils/slcan/slcan.c
@@ -47,7 +47,6 @@
#include <net/if.h>
#include <termios.h>
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include "slcan.h"
diff --git a/examples/opencyphal/canard_main.c
b/examples/opencyphal/canard_main.c
index 91341ab71..4d0cce801 100644
--- a/examples/opencyphal/canard_main.c
+++ b/examples/opencyphal/canard_main.c
@@ -43,7 +43,6 @@
#include <poll.h>
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include "socketcan.h"
diff --git a/examples/opencyphal/socketcan.h b/examples/opencyphal/socketcan.h
index 12f836575..5df786c01 100644
--- a/examples/opencyphal/socketcan.h
+++ b/examples/opencyphal/socketcan.h
@@ -33,7 +33,6 @@
#include <sys/socket.h>
#include <nuttx/can.h>
-#include <netpacket/can.h>
#include <canard.h>
