michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: add struct device argument to callback functions

Browse source 
Include a pointer to the CAN controller device for the CAN
transmit, receive, and state change callback functions.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-03-17 22:06:51 +01:00 • committed by Anas Nashif
commit 67ba9900f0
16 changed files with 137 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/can/can_mcan.c
View file

@ -288,9 +288,11 @@ int can_mcan_init(const struct device *dev, const struct can_mcan_config *cfg,
#endif
int ret;
data->dev = dev;
k_mutex_init(&data->inst_mutex);
k_mutex_init(&data->tx_mtx);
k_sem_init(&data->tx_sem, NUM_TX_BUF_ELEMENTS, NUM_TX_BUF_ELEMENTS);
for (int i = 0; i < ARRAY_SIZE(data->tx_fin_sem); ++i) {
k_sem_init(&data->tx_fin_sem[i], 0, 1);
}
@ -502,7 +504,7 @@ static void can_mcan_state_change_handler(const struct can_mcan_config *cfg,
(void)can_mcan_get_state(cfg, &state, &err_cnt);
if (cb != NULL) {
cb(state, err_cnt, cb_data);
cb(data->dev, state, err_cnt, cb_data);
}
}
@ -530,7 +532,7 @@ static void can_mcan_tc_event_handler(struct can_mcan_reg *can,
if (tx_cb == NULL) {
k_sem_give(&data->tx_fin_sem[tx_idx]);
} else {
tx_cb(0, data->tx_fin_cb_arg[tx_idx]);
tx_cb(data->dev, 0, data->tx_fin_cb_arg[tx_idx]);
}
}
}
@ -643,7 +645,7 @@ static void can_mcan_get_message(struct can_mcan_data *data,
}
if (cb) {
cb(&frame, cb_arg);
cb(data->dev, &frame, cb_arg);
} else {
LOG_DBG("cb missing");
}