RT-Thread/rt-thread-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can驱动优化，支持发送失败后取消发送

Browse Source
This commit is contained in:
jonas
2024-07-24 15:10:31 +08:00
parent 780291d5b0
commit 1173711d0c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/drivers/can/can.c
View File

@ -154,6 +154,7 @@ rt_inline int _can_int_tx(struct rt_can_device *can, const struct rt_can_msg *da
no = ((rt_uint32_t)tx_tosnd - (rt_uint32_t)tx_fifo->buffer) / sizeof(struct rt_can_sndbxinx_list); no = ((rt_uint32_t)tx_tosnd - (rt_uint32_t)tx_fifo->buffer) / sizeof(struct rt_can_sndbxinx_list);
tx_tosnd->result = RT_CAN_SND_RESULT_WAIT; tx_tosnd->result = RT_CAN_SND_RESULT_WAIT;
rt_completion_init(&(tx_tosnd->completion));
if (can->ops->sendmsg(can, data, no) != RT_EOK) if (can->ops->sendmsg(can, data, no) != RT_EOK)
{ {
/* send failed. */ /* send failed. */
@ -192,6 +193,8 @@ rt_inline int _can_int_tx(struct rt_can_device *can, const struct rt_can_msg *da
err_ret: err_ret:
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
can->status.dropedsndpkg++; can->status.dropedsndpkg++;
//TODO:发送失败，取消发送状态
can->ops->control(can, RT_CAN_CMD_CANCEL, (void *)no);
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
break; break;
} }

1
components/drivers/include/drivers/can.h
View File

@ -182,6 +182,7 @@ struct rt_can_ops;
#define RT_CAN_CMD_SET_CANFD 0x1A #define RT_CAN_CMD_SET_CANFD 0x1A
#define RT_CAN_CMD_SET_BAUD_FD 0x1B #define RT_CAN_CMD_SET_BAUD_FD 0x1B
#define RT_CAN_CMD_SET_BITTIMING 0x1C #define RT_CAN_CMD_SET_BITTIMING 0x1C
#define RT_CAN_CMD_CANCEL 0x1D
#define RT_DEVICE_CAN_INT_ERR 0x1000 #define RT_DEVICE_CAN_INT_ERR 0x1000