Skip to content

Commit a7cfb22

Browse files
Jimmy Assarssonmarckleinebudde
authored andcommitted
can: kvaser_usb: leaf: Add structs for Tx ACK and clock overflow commands
For usbcan devices (M16C), add struct usbcan_cmd_tx_acknowledge for Tx ACK commands and struct usbcan_cmd_clk_overflow_event for clock overflow event commands. Signed-off-by: Jimmy Assarsson <[email protected]> Reviewed-by: Vincent Mailhol <[email protected]> Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 8a52e5a commit a7cfb22

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,13 @@ struct leaf_cmd_tx_acknowledge {
242242
u8 padding[2];
243243
} __packed;
244244

245+
struct usbcan_cmd_tx_acknowledge {
246+
u8 channel;
247+
u8 tid;
248+
__le16 time;
249+
u8 padding[2];
250+
} __packed;
251+
245252
struct leaf_cmd_can_error_event {
246253
u8 tid;
247254
u8 flags;
@@ -288,6 +295,12 @@ struct usbcan_cmd_error_event {
288295
__le16 padding;
289296
} __packed;
290297

298+
struct usbcan_cmd_clk_overflow_event {
299+
u8 tid;
300+
u8 padding;
301+
__le32 time;
302+
} __packed;
303+
291304
struct kvaser_cmd_ctrl_mode {
292305
u8 tid;
293306
u8 channel;
@@ -363,6 +376,8 @@ struct kvaser_cmd {
363376
struct usbcan_cmd_chip_state_event chip_state_event;
364377
struct usbcan_cmd_can_error_event can_error_event;
365378
struct usbcan_cmd_error_event error_event;
379+
struct usbcan_cmd_tx_acknowledge tx_ack;
380+
struct usbcan_cmd_clk_overflow_event clk_overflow_event;
366381
} __packed usbcan;
367382

368383
struct kvaser_cmd_tx_can tx_can;
@@ -396,15 +411,15 @@ static const u8 kvaser_usb_leaf_cmd_sizes_usbcan[] = {
396411
[CMD_START_CHIP_REPLY] = kvaser_fsize(u.simple),
397412
[CMD_STOP_CHIP_REPLY] = kvaser_fsize(u.simple),
398413
[CMD_GET_CARD_INFO_REPLY] = kvaser_fsize(u.cardinfo),
399-
[CMD_TX_ACKNOWLEDGE] = kvaser_fsize(u.tx_acknowledge_header),
414+
[CMD_TX_ACKNOWLEDGE] = kvaser_fsize(u.usbcan.tx_ack),
400415
[CMD_GET_SOFTWARE_INFO_REPLY] = kvaser_fsize(u.usbcan.softinfo),
401416
[CMD_RX_STD_MESSAGE] = kvaser_fsize(u.usbcan.rx_can),
402417
[CMD_RX_EXT_MESSAGE] = kvaser_fsize(u.usbcan.rx_can),
403418
[CMD_CHIP_STATE_EVENT] = kvaser_fsize(u.usbcan.chip_state_event),
404419
[CMD_CAN_ERROR_EVENT] = kvaser_fsize(u.usbcan.can_error_event),
405420
[CMD_ERROR_EVENT] = kvaser_fsize(u.usbcan.error_event),
406421
/* ignored events: */
407-
[CMD_USBCAN_CLOCK_OVERFLOW_EVENT] = CMD_SIZE_ANY,
422+
[CMD_USBCAN_CLOCK_OVERFLOW_EVENT] = kvaser_fsize(u.usbcan.clk_overflow_event),
408423
};
409424

410425
/* Summary of a kvaser error event, for a unified Leaf/Usbcan error

0 commit comments

Comments
 (0)