sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include: import header files from linux-5.0 (including new j1939 filter struct) 

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
pull/137/head
Oleksij Rempel 2019-04-09 09:35:40 +02:00
parent afb88e9019
commit 38fa644069
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/linux/can/j1939.h
View File

@ -16,12 +16,13 @@
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/can.h> #include <linux/can.h>
#define J1939_IDLE_ADDR 0xfe
#define J1939_MAX_UNICAST_ADDR 0xfd #define J1939_MAX_UNICAST_ADDR 0xfd
#define J1939_IDLE_ADDR 0xfe
#define J1939_NO_ADDR 0xff /* == broadcast or no addr */ #define J1939_NO_ADDR 0xff /* == broadcast or no addr */
#define J1939_NO_NAME 0 #define J1939_NO_NAME 0
#define J1939_PGN_REQUEST 0x0ea00 #define J1939_PGN_REQUEST 0x0ea00 /* Request PG */
#define J1939_PGN_ADDRESS_CLAIMED 0x0ee00 #define J1939_PGN_ADDRESS_CLAIMED 0x0ee00 /* Address Claimed */
#define J1939_PGN_ADDRESS_COMMANDED 0x0fed8 /* Commanded Address */
#define J1939_PGN_PDU1_MAX 0x3ff00 #define J1939_PGN_PDU1_MAX 0x3ff00
#define J1939_PGN_MAX 0x3ffff #define J1939_PGN_MAX 0x3ffff
#define J1939_NO_PGN 0x40000 #define J1939_NO_PGN 0x40000
@ -65,21 +66,33 @@ enum {
SO_J1939_PROMISC = 2, /* set/clr promiscuous mode */ SO_J1939_PROMISC = 2, /* set/clr promiscuous mode */
SO_J1939_RECV_OWN = 3, SO_J1939_RECV_OWN = 3,
SO_J1939_SEND_PRIO = 4, SO_J1939_SEND_PRIO = 4,
SO_J1939_ERRQUEUE = 5,
}; };
enum { enum {
SCM_J1939_DEST_ADDR = 1, SCM_J1939_DEST_ADDR = 1,
SCM_J1939_DEST_NAME = 2, SCM_J1939_DEST_NAME = 2,
SCM_J1939_PRIO = 3, SCM_J1939_PRIO = 3,
SCM_J1939_ERRQUEUE = 4,
};
enum {
J1939_NLA_PAD,
J1939_NLA_BYTES_ACKED,
};
enum {
J1939_EE_INFO_NONE,
J1939_EE_INFO_TX_ABORT,
}; };
struct j1939_filter { struct j1939_filter {
name_t name; name_t name;
name_t name_mask; name_t name_mask;
__u8 addr;
__u8 addr_mask;
pgn_t pgn; pgn_t pgn;
pgn_t pgn_mask; pgn_t pgn_mask;
__u8 addr;
__u8 addr_mask;
}; };
#define J1939_FILTER_MAX 512 /* maximum number of j1939_filter set via setsockopt() */ #define J1939_FILTER_MAX 512 /* maximum number of j1939_filter set via setsockopt() */