stm32/can: Clarify can_clearfilter() arguments.

The function arguments mean totally different things for Classic vs FDCAN
hardware, but the argument name wasn't particularly clear for either.

This commit shouldn't really change the binary firmware at all.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>

Author: projectgus

ports/stm32/can.c

@@ -152,7 +152,7 @@ void can_enable_rx_interrupts(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, bool e
         ((enable_msg_received ? CAN_IT_FMP1 : 0) | CAN_IT_FF1 | CAN_IT_FOV1)));
 }
 
-void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t bank) {
+void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t can2_start_bank) {
     CAN_FilterConfTypeDef filter;
 
     filter.FilterIdHigh = 0;
@@ -164,7 +164,7 @@ void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t bank)
     filter.FilterMode = CAN_FILTERMODE_IDMASK;
     filter.FilterScale = CAN_FILTERSCALE_16BIT;
     filter.FilterActivation = DISABLE;
-    filter.BankNumber = bank;
+    filter.BankNumber = can2_start_bank;
 
     HAL_CAN_ConfigFilter(can, &filter);
 }

ports/stm32/can.h

@@ -90,7 +90,6 @@ typedef enum {
 bool can_init(CAN_HandleTypeDef *can, int can_id, uint32_t mode, uint32_t prescaler, uint32_t sjw, uint32_t bs1, uint32_t bs2, bool auto_restart);
 void can_deinit(CAN_HandleTypeDef *can);
 
-void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t bank);
 int can_receive(CAN_HandleTypeDef *can, can_rx_fifo_t fifo, CanRxMsgTypeDef *msg, uint8_t *data, uint32_t timeout_ms);
 HAL_StatusTypeDef can_transmit(CAN_HandleTypeDef *hcan, CanTxMsgTypeDef *txmsg, uint8_t *data, uint32_t Timeout);
 
@@ -111,12 +110,16 @@ static inline unsigned can_rx_pending(CAN_HandleTypeDef *can, can_rx_fifo_t fifo
     return HAL_FDCAN_GetRxFifoFillLevel(can, fifo == CAN_RX_FIFO0 ? FDCAN_RX_FIFO0 : FDCAN_RX_FIFO1);
 }
 
+void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, bool is_extid);
+
 #else
 
 static inline unsigned can_rx_pending(CAN_HandleTypeDef *can, can_rx_fifo_t fifo) {
     return __HAL_CAN_MSG_PENDING(can, fifo == CAN_RX_FIFO0 ? CAN_FIFO0 : CAN_FIFO1);
 }
 
+void can_clearfilter(CAN_HandleTypeDef *can, uint32_t filter_num, uint8_t can2_start_bank);
+
 #endif // MICROPY_HW_ENABLE_FDCAN
 
 #endif // MICROPY_HW_ENABLE_CAN

ports/stm32/fdcan.c

@@ -248,15 +248,12 @@ void can_deinit(FDCAN_HandleTypeDef *can) {
     }
 }
 
-void can_clearfilter(FDCAN_HandleTypeDef *can, uint32_t f, uint8_t extid) {
-    FDCAN_FilterTypeDef filter = {0};
-    if (extid == 1) {
-        filter.IdType = FDCAN_EXTENDED_ID;
-    } else {
-        filter.IdType = FDCAN_STANDARD_ID;
-    }
-    filter.FilterIndex = f;
-    filter.FilterConfig = FDCAN_FILTER_DISABLE;
+void can_clearfilter(FDCAN_HandleTypeDef *can, uint32_t f, bool is_extid) {
+    FDCAN_FilterTypeDef filter = {
+        .IdType = is_extid ? FDCAN_EXTENDED_ID : FDCAN_STANDARD_ID,
+        .FilterIndex = f,
+        .FilterConfig = FDCAN_FILTER_DISABLE,
+    };
     HAL_FDCAN_ConfigFilter(can, &filter);
 }