Marc Kleine-Budde says: ==================== pull-request: can-next 2015-05-06 this is a pull request of a seven patches for net-next/master. Andreas Gröger contributes two patches for the janz-ican3 driver. In the first patch, the documentation for already existing sysfs entries is added, the second patch adds support for another module/firmware variant. A patch by Shawn Landden makes the padding in the struct can_frame explicit. The next 4 patches target the flexcan driver, the first one is by David Jander adding some documentation, the reaming three by me add more documentation and two small code cleanups. ====================
Showing the changes to include/uapi (1 of 7 files). Show all
Unified · Split
| @@ -95,11 +95,17 @@ typedef __u32 can_err_mask_t; · 94 unmodified lines | |||
| 95 | * @can_dlc: frame payload length in byte (0 .. 8) aka data length code | 95 | * @can_dlc: frame payload length in byte (0 .. 8) aka data length code |
| 96 | * N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1 | 96 | * N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1 |
| 97 | * mapping of the 'data length code' to the real payload length | 97 | * mapping of the 'data length code' to the real payload length |
| 98 | * @__pad: padding | ||
| 99 | * @__res0: reserved / padding | ||
| 100 | * @__res1: reserved / padding | ||
| 98 | * @data: CAN frame payload (up to 8 byte) | 101 | * @data: CAN frame payload (up to 8 byte) |
| 99 | */ | 102 | */ |
| 100 | struct can_frame { | 103 | struct can_frame { |
| 101 | canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ | 104 | canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ |
| 102 | __u8 can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */ | 105 | __u8 can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */ |
| 106 | __u8 __pad; /* padding */ | ||
| 107 | __u8 __res0; /* reserved / padding */ | ||
| 108 | __u8 __res1; /* reserved / padding */ | ||
| 103 | __u8 data[CAN_MAX_DLEN] __attribute__((aligned(8))); | 109 | __u8 data[CAN_MAX_DLEN] __attribute__((aligned(8))); |
| 104 | }; | 110 | }; |
| 105 | 111 | ||