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 patches) 

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
pull/134/head
Marc Kleine-Budde 2019-04-04 10:17:27 +02:00
parent 83667e822c
commit 06d3beb08c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/can.h
View File

@ -77,7 +77,7 @@ typedef __u32 canid_t;
/* /*
* Controller Area Network Error Message Frame Mask structure * Controller Area Network Error Message Frame Mask structure
* *
* bit 0-28 : error class mask (see include/linux/can/error.h) * bit 0-28 : error class mask (see include/uapi/linux/can/error.h)
* bit 29-31 : set to zero * bit 29-31 : set to zero
*/ */
typedef __u32 can_err_mask_t; typedef __u32 can_err_mask_t;
@ -181,10 +181,7 @@ struct sockaddr_can {
int can_ifindex; int can_ifindex;
union { union {
/* transport protocol class address information (e.g. ISOTP) */ /* transport protocol class address information (e.g. ISOTP) */
struct { struct { canid_t rx_id, tx_id; } tp;
canid_t rx_id;
canid_t tx_id;
} tp;
/* J1939 address information */ /* J1939 address information */
struct { struct {

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

@ -16,9 +16,14 @@
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/can.h> #include <linux/can.h>
#define J1939_IDLE_ADDR 0xfe #define J1939_IDLE_ADDR 0xfe
#define J1939_NO_ADDR 0xff #define J1939_MAX_UNICAST_ADDR 0xfd
#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_ADDRESS_CLAIMED 0x0ee00
#define J1939_PGN_PDU1_MAX 0x3ff00
#define J1939_PGN_MAX 0x3ffff
#define J1939_NO_PGN 0x40000 #define J1939_NO_PGN 0x40000
/* J1939 Parameter Group Number /* J1939 Parameter Group Number