ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13401 from GewoonMaarten/GewoonMaarten-patch-1 

Added error checking to can_filter() for Classic CAN
pull/13415/head
Martin Kojtal 2020-08-11 08:42:52 +01:00 committed by GitHub
parent e127bb245e e6150ac722
commit 6b6512bf80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
targets/TARGET_STM/can_api.c
View File

@ -999,6 +999,8 @@ 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) int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t handle)
{ {
int success = 0;
// filter for CANAny format cannot be configured for STM32 // filter for CANAny format cannot be configured for STM32
if ((format == CANStandard) || (format == CANExtended)) { if ((format == CANStandard) || (format == CANExtended)) {
CAN_FilterConfTypeDef sFilterConfig; CAN_FilterConfTypeDef sFilterConfig;
@ -1022,10 +1024,13 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t
sFilterConfig.FilterActivation = ENABLE; sFilterConfig.FilterActivation = ENABLE;
sFilterConfig.BankNumber = 14 + handle; sFilterConfig.BankNumber = 14 + handle;
HAL_CAN_ConfigFilter(&obj->CanHandle, &sFilterConfig); if (HAL_CAN_ConfigFilter(&obj->CanHandle, &sFilterConfig) == HAL_OK)
{
success = 1;
}
} }
return 1; return success;
} }
static void can_irq(CANName name, int id) static void can_irq(CANName name, int id)