luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arch/sim/sim_canchar.c: fix compilation when CAN FD is disabled

Browse source 
Fix case for CAN character driver in simulator when CANFD is disabled
and ch_edl field is not present in CAN header.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
This commit is contained in:
p-szafonimateusz 2025-05-23 11:39:43 +02:00 • committed by Xiang Xiao
parent 9c4593e183
commit 7cb09d96e3
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
arch/sim/src/sim/sim_canchar.c
View file

@ -182,32 +182,8 @@ static int sim_can_send(struct can_dev_s *dev, struct can_msg_s *msg)
struct sim_canchar_s *priv = dev->cd_priv;
int ret;
if (!msg->cm_hdr.ch_edl)
{
struct can_frame frame;
frame.can_id = msg->cm_hdr.ch_id;
frame.can_dlc = msg->cm_hdr.ch_dlc;
if (msg->cm_hdr.ch_rtr)
{
frame.can_id |= CAN_RTR_FLAG;
}
#ifdef CONFIG_CAN_EXTID
/* Extended frame */
if (msg->cm_hdr.ch_extid)
{
frame.can_id |= CAN_EFF_FLAG;
}
#endif
memcpy(frame.data, msg->cm_data, frame.can_dlc);
ret = host_can_send(&priv->host, &frame, sizeof(struct can_frame));
}
else
#ifdef CONFIG_CAN_FD
if (msg->cm_hdr.ch_edl)
{
struct canfd_frame frame;
@ -243,6 +219,32 @@ static int sim_can_send(struct can_dev_s *dev, struct can_msg_s *msg)
ret = host_can_send(&priv->host, &frame, sizeof(struct canfd_frame));
}
else
#endif
{
struct can_frame frame;
frame.can_id = msg->cm_hdr.ch_id;
frame.can_dlc = msg->cm_hdr.ch_dlc;
if (msg->cm_hdr.ch_rtr)
{
frame.can_id |= CAN_RTR_FLAG;
}
#ifdef CONFIG_CAN_EXTID
/* Extended frame */
if (msg->cm_hdr.ch_extid)
{
frame.can_id |= CAN_EFF_FLAG;
}
#endif
memcpy(frame.data, msg->cm_data, frame.can_dlc);
ret = host_can_send(&priv->host, &frame, sizeof(struct can_frame));
}
if (ret > 0)
{