michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: move can_set_bitrate() to can_common.c

Browse source 
Move the can_set_bitrate() function to can_common.c as it is getting
quite long for a static inline function.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-03-10 10:10:31 +01:00 • committed by Maureen Helm
commit 58ff3f08dd
2 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/can/can_common.c
View file

@ -176,3 +176,49 @@ int can_calc_prescaler(const struct device *dev, struct can_timing *timing,
return core_clock % (ts * timing->prescaler); return core_clock % (ts * timing->prescaler);
} }
int can_set_bitrate(const struct device *dev, uint32_t bitrate, uint32_t bitrate_data)
{
struct can_timing timing;
#ifdef CONFIG_CAN_FD_MODE
struct can_timing timing_data;
#endif
uint32_t max_bitrate;
int ret;
ret = can_get_max_bitrate(dev, &max_bitrate);
if (ret == -ENOSYS) {
/* Maximum bitrate unknown */
max_bitrate = 0;
} else if (ret < 0) {
return ret;
}
if ((max_bitrate > 0) && (bitrate > max_bitrate)) {
return -ENOTSUP;
}
ret = can_calc_timing(dev, &timing, bitrate, 875);
if (ret < 0) {
return -EINVAL;
}
timing.sjw = CAN_SJW_NO_CHANGE;
#ifdef CONFIG_CAN_FD_MODE
if ((max_bitrate > 0) && (bitrate_data > max_bitrate)) {
return -ENOTSUP;
}
ret = can_calc_timing_data(dev, &timing_data, bitrate_data, 875);
if (ret < 0) {
return -EINVAL;
}
timing_data.sjw = CAN_SJW_NO_CHANGE;
return can_set_timing(dev, &timing, &timing_data);
#else /* CONFIG_CAN_FD_MODE */
return can_set_timing(dev, &timing, NULL);
#endif /* !CONFIG_CAN_FD_MODE */
}

48
include/drivers/can.h
View file

@ -791,53 +791,7 @@ static inline int z_impl_can_set_mode(const struct device *dev, enum can_mode mo
* @retval -EINVAL bitrate cannot be met. * @retval -EINVAL bitrate cannot be met.
* @retval -EIO General input/output error, failed to set bitrate. * @retval -EIO General input/output error, failed to set bitrate.
*/ */
static inline int can_set_bitrate(const struct device *dev, int can_set_bitrate(const struct device *dev, uint32_t bitrate, uint32_t bitrate_data);
uint32_t bitrate,
uint32_t bitrate_data)
{
struct can_timing timing;
#ifdef CONFIG_CAN_FD_MODE
struct can_timing timing_data;
#endif
uint32_t max_bitrate;
int ret;
ret = can_get_max_bitrate(dev, &max_bitrate);
if (ret == -ENOSYS) {
/* Maximum bitrate unknown */
max_bitrate = 0;
} else if (ret < 0) {
return ret;
}
if ((max_bitrate > 0) && (bitrate > max_bitrate)) {
return -ENOTSUP;
}
ret = can_calc_timing(dev, &timing, bitrate, 875);
if (ret < 0) {
return -EINVAL;
}
timing.sjw = CAN_SJW_NO_CHANGE;
#ifdef CONFIG_CAN_FD_MODE
if ((max_bitrate > 0) && (bitrate_data > max_bitrate)) {
return -ENOTSUP;
}
ret = can_calc_timing_data(dev, &timing_data, bitrate_data, 875);
if (ret < 0) {
return -EINVAL;
}
timing_data.sjw = CAN_SJW_NO_CHANGE;
return can_set_timing(dev, &timing, &timing_data);
#else /* CONFIG_CAN_FD_MODE */
return can_set_timing(dev, &timing, NULL);
#endif /* !CONFIG_CAN_FD_MODE */
}
/** @} */ /** @} */