Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mbed-os-5.15] Nuvoton M480/M451 CAN API support mask feature #15026

Merged
merged 2 commits into from
Sep 9, 2021
Merged

[mbed-os-5.15] Nuvoton M480/M451 CAN API support mask feature #15026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3198bab
NuMaker M480 & M451 support CAN mask
cyliangtw Aug 24, 2021
75dd2c2
Follow Mbed OS coding style of if statement
cyliangtw Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion targets/TARGET_NUVOTON/TARGET_M451/can_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,18 @@ int can_mode(can_t *obj, CanMode mode)

int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t handle)
{
return CAN_SetRxMsg((CAN_T *)NU_MODBASE(obj->can), handle , (uint32_t)format, id);
uint32_t numask = mask;

if (numask == 0x0000) {
return CAN_SetRxMsg((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id);
}

if (format == CANStandard) {
numask = (mask << 18);
}

numask = (numask | CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk);
return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);
}


Expand Down
14 changes: 12 additions & 2 deletions targets/TARGET_NUVOTON/TARGET_M480/can_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,19 @@ int can_mode(can_t *obj, CanMode mode)

int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t handle)
{
return CAN_SetRxMsg((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id);
}
uint32_t numask = mask;

if (numask == 0x0000) {
return CAN_SetRxMsg((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id);
}

if (format == CANStandard) {
numask = (mask << 18);
}

numask = (numask | CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk);
return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);
}

void can_reset(can_t *obj)
{
Expand Down