Skip to content

can: Merge netpacket/can.h into nuttx/can.h #2518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkarashchenko merged 1 commit into from
Aug 26, 2024
Merged

can: Merge netpacket/can.h into nuttx/can.h #2518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion canutils/candump/candump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
#include <net/if.h>

#include <nuttx/can.h>
#include <netpacket/can.h>

#include "terminal.h"
#include "lib.h"
Expand Down
1 change: 0 additions & 1 deletion canutils/cansend/cansend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
#include <sys/socket.h>

#include <nuttx/can.h>
#include <netpacket/can.h>

#include "lib.h"

Expand Down
2 changes: 0 additions & 2 deletions canutils/lely-canopen/0001-NuttX-port.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ index 4fc133dd..b059c849 100644

+#ifdef __NuttX__
+#include <nuttx/can.h>
+#include <netpacket/can.h>
+#endif
+
int
Expand Down Expand Up @@ -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
+
Expand Down
1 change: 0 additions & 1 deletion canutils/libcanutils/lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion canutils/slcan/slcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include <net/if.h>
#include <termios.h>
#include <nuttx/can.h>
#include <netpacket/can.h>

#include "slcan.h"

Expand Down
1 change: 0 additions & 1 deletion examples/opencyphal/canard_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <poll.h>

#include <nuttx/can.h>
#include <netpacket/can.h>

#include "socketcan.h"

Expand Down
1 change: 0 additions & 1 deletion examples/opencyphal/socketcan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <sys/socket.h>

#include <nuttx/can.h>
#include <netpacket/can.h>

#include <canard.h>

Expand Down