michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: expand return values reported by the CAN timing functions

Browse source 
Expand the error return values reported by the CAN timing calculation
functions to be able to distinguish between an an out of range
bitrate/sample point, an unsupported bitrate, and a resulting sample point
outside the guard limit.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-08-18 14:56:22 +02:00 • committed by Fabio Baltieri
commit 7e3814b262
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/can/can_common.c
View file

@ -125,10 +125,9 @@ static int can_calc_timing_int(uint32_t core_clock, struct can_timing *res,
LOG_DBG("SP error: %d 1/1000", sp_err_min);
}
return sp_err_min == UINT16_MAX ? -EINVAL : (int)sp_err_min;
return sp_err_min == UINT16_MAX ? -ENOTSUP : (int)sp_err_min;
}
int z_impl_can_calc_timing(const struct device *dev, struct can_timing *res,
uint32_t bitrate, uint16_t sample_pnt)
{
@ -235,11 +234,11 @@ int z_impl_can_set_bitrate(const struct device *dev, uint32_t bitrate)
sample_pnt = sample_point_for_bitrate(bitrate);
ret = can_calc_timing(dev, &timing, bitrate, sample_pnt);
if (ret < 0) {
return -EINVAL;
return ret;
}
if (ret > SAMPLE_POINT_MARGIN) {
return -EINVAL;
return -ERANGE;
}
timing.sjw = CAN_SJW_NO_CHANGE;
@ -270,11 +269,11 @@ int z_impl_can_set_bitrate_data(const struct device *dev, uint32_t bitrate_data)
sample_pnt = sample_point_for_bitrate(bitrate_data);
ret = can_calc_timing_data(dev, &timing_data, bitrate_data, sample_pnt);
if (ret < 0) {
return -EINVAL;
return ret;
}
if (ret > SAMPLE_POINT_MARGIN) {
return -EINVAL;
return -ERANGE;
}
timing_data.sjw = CAN_SJW_NO_CHANGE;