Skip to content

Commit e35e5c8

Browse files
aentingerfacchinm
authored andcommitted
Fix pin configuration logic within CAN driver.
Former-commit-id: d008b9b
1 parent 6b5455a commit e35e5c8

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

libraries/CAN/src/R7FA6M5_CAN.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,20 +232,17 @@ std::tuple<bool, int> R7FA6M5_CAN::cfg_pins(int const max_index, int const can_t
232232
}
233233

234234
/* Getting configuration from table. */
235-
const uint16_t * cfg = nullptr;
236-
cfg = g_pin_cfg[can_tx_pin].list;
237-
uint16_t cfg_can_tx = getPinCfg(cfg, PIN_CFG_REQ_CAN_TX, /* prefer_sci = */ false);
238-
cfg = g_pin_cfg[can_rx_pin].list;
239-
uint16_t cfg_can_rx = getPinCfg(cfg, PIN_CFG_REQ_CAN_RX, /* prefer_sci = */ false);
235+
auto cfg_can_tx = getPinCfgs(can_tx_pin, PIN_CFG_REQ_CAN_TX);
236+
auto cfg_can_rx = getPinCfgs(can_rx_pin, PIN_CFG_REQ_CAN_RX);
240237

241238
/* Verify if configurations are good. */
242-
if (cfg_can_tx == 0 || cfg_can_rx == 0) {
239+
if (cfg_can_tx[0] == 0 || cfg_can_rx[0] == 0) {
243240
return std::make_tuple(false, channel);
244241
}
245242

246243
/* Verify if channel is the same for all pins. */
247-
uint32_t const ch_can_tx = GET_CHANNEL(cfg_can_tx);
248-
uint32_t const ch_can_rx = GET_CHANNEL(cfg_can_rx);
244+
uint32_t const ch_can_tx = GET_CHANNEL(cfg_can_tx[0]);
245+
uint32_t const ch_can_rx = GET_CHANNEL(cfg_can_rx[0]);
249246
if (ch_can_tx != ch_can_rx) {
250247
return std::make_tuple(false, channel);
251248
}

0 commit comments

Comments
 (0)