NUVOTON: CAN: Fix filter mask

ccli8 · ccli8 · commit 63bdb26915eb · 2024-04-18T11:04:15.000+08:00
NOTE: This fix only targets CAN (M453/M487), not CAN-FD (M467).
NOTE: NUC472 CAN doesn't support filter.
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/can_api.c b/targets/TARGET_NUVOTON/TARGET_M451/can_api.c
@@ -294,7 +294,7 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t
     {
       numask = (mask << 18);
     }
-    numask = (numask | CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk);
+    numask = (numask | ((CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk) << 16));
     return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);
 }
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M480/can_api.c b/targets/TARGET_NUVOTON/TARGET_M480/can_api.c
@@ -341,7 +341,7 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t
     {
       numask = (mask << 18);
     }
-    numask = (numask | CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk);
+    numask = (numask | ((CAN_IF_MASK2_MDIR_Msk | CAN_IF_MASK2_MXTD_Msk) << 16));
     return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t`
`294`	`294`	`{`
`295`	`295`	`numask = (mask << 18);`
`296`	`296`	`}`
`297`		`- numask = (numask \| CAN_IF_MASK2_MDIR_Msk \| CAN_IF_MASK2_MXTD_Msk);`
	`297`	`+ numask = (numask \| ((CAN_IF_MASK2_MDIR_Msk \| CAN_IF_MASK2_MXTD_Msk) << 16));`
`298`	`298`	`return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);`
`299`	`299`	`}`
`300`	`300`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t`
`341`	`341`	`{`
`342`	`342`	`numask = (mask << 18);`
`343`	`343`	`}`
`344`		`- numask = (numask \| CAN_IF_MASK2_MDIR_Msk \| CAN_IF_MASK2_MXTD_Msk);`
	`344`	`+ numask = (numask \| ((CAN_IF_MASK2_MDIR_Msk \| CAN_IF_MASK2_MXTD_Msk) << 16));`
`345`	`345`	`return CAN_SetRxMsgAndMsk((CAN_T *)NU_MODBASE(obj->can), handle, (uint32_t)format, id, numask);`
`346`	`346`	`}`
`347`	`347`