michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: remove CAN_BUS_UNKNOWN CAN controller state

Browse source 
The CAN_BUS_UNKNOWN CAN controller state is only used to indicate that
the current CAN controller state could not be read.

Remove it and change the signature of the can_get_state() API function
to return an integer indicating success or failure.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-01-19 10:21:01 +01:00 • committed by Carles Cufí
commit 2aed5a1237
15 changed files with 155 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/can/can_mcan.c
View file

@ -451,7 +451,7 @@ static void can_mcan_state_change_handler(const struct can_mcan_config *cfg,
const can_state_change_callback_t cb = data->state_change_cb;
void *cb_data = data->state_change_cb_data;
state = can_mcan_get_state(cfg, &err_cnt);
(void)can_mcan_get_state(cfg, &state, &err_cnt);
if (cb != NULL) {
cb(state, err_cnt, cb_data);
@ -642,30 +642,32 @@ void can_mcan_line_1_isr(const struct can_mcan_config *cfg,
CAN_MCAN_IR_RF0L | CAN_MCAN_IR_RF1L));
}
enum can_state can_mcan_get_state(const struct can_mcan_config *cfg,
struct can_bus_err_cnt *err_cnt)
int can_mcan_get_state(const struct can_mcan_config *cfg, enum can_state *state,
struct can_bus_err_cnt *err_cnt)
{
struct can_mcan_reg *can = cfg->can;
err_cnt->rx_err_cnt = (can->ecr & CAN_MCAN_ECR_TEC_MSK) <<
CAN_MCAN_ECR_TEC_POS;
err_cnt->tx_err_cnt = (can->ecr & CAN_MCAN_ECR_REC_MSK) <<
CAN_MCAN_ECR_REC_POS;
if (can->psr & CAN_MCAN_PSR_BO) {
return CAN_BUS_OFF;
if (state != NULL) {
if (can->psr & CAN_MCAN_PSR_BO) {
*state = CAN_BUS_OFF;
} else if (can->psr & CAN_MCAN_PSR_EP) {
*state = CAN_ERROR_PASSIVE;
} else if (can->psr & CAN_MCAN_PSR_EW) {
*state = CAN_ERROR_WARNING;
} else {
*state = CAN_ERROR_ACTIVE;
}
}
if (can->psr & CAN_MCAN_PSR_EP) {
return CAN_ERROR_PASSIVE;
if (err_cnt != NULL) {
err_cnt->rx_err_cnt = (can->ecr & CAN_MCAN_ECR_TEC_MSK) <<
CAN_MCAN_ECR_TEC_POS;
err_cnt->tx_err_cnt = (can->ecr & CAN_MCAN_ECR_REC_MSK) <<
CAN_MCAN_ECR_REC_POS;
}
if (can->psr & CAN_MCAN_PSR_EW) {
return CAN_ERROR_WARNING;
}
return CAN_ERROR_ACTIVE;
return 0;
}
#ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY