From 21347d30a37dbda78f1a802d4c7927534a2a6956 Mon Sep 17 00:00:00 2001 From: Ioan Dragomir Date: Thu, 9 Jan 2025 15:59:12 +0200 Subject: [PATCH] fix(Other): Fix Wrap_MXC_CAN_Init signature The previous implementation declared Wrap_MXC_CAN_Init as void and discarded the return value of the underlying MXC_CAN_Init calls. This is incompatible with the can_max32 driver which does eror checking and expects an int return value. While this is a "breaking" change, no code depends on this wrapper, because its signature is invalid. Signed-off-by: Ioan Dragomir --- Libraries/zephyr/MAX/Include/wrap_max32_can.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Libraries/zephyr/MAX/Include/wrap_max32_can.h b/Libraries/zephyr/MAX/Include/wrap_max32_can.h index 9f8d992478a..d91e0c64a1c 100644 --- a/Libraries/zephyr/MAX/Include/wrap_max32_can.h +++ b/Libraries/zephyr/MAX/Include/wrap_max32_can.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 2024 Analog Devices, Inc. + * Copyright (C) 2024-2025 Analog Devices, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ extern "C" { #endif -static inline void Wrap_MXC_CAN_Init(uint32_t can_idx, mxc_can_obj_cfg_t cfg, - mxc_can_unit_event_cb_t unit_cb, - mxc_can_object_event_cb_t obj_cb) +static inline int Wrap_MXC_CAN_Init(uint32_t can_idx, mxc_can_obj_cfg_t cfg, + mxc_can_unit_event_cb_t unit_cb, + mxc_can_object_event_cb_t obj_cb) { /* The only API difference between the MAX32662 and MAX32690 relevant to * implementing the max32 CAN driver in Zephyr is that the former requires a @@ -40,11 +40,11 @@ static inline void Wrap_MXC_CAN_Init(uint32_t can_idx, mxc_can_obj_cfg_t cfg, /* A value of -1 is invalid, will configure no GPIOs, but still pass through * to MXC_CAN_RevA_Init, even in case MSDK_NO_GPIO_CLK_INIT wasn't set. */ - MXC_CAN_Init(can_idx, cfg, unit_cb, obj_cb, -1); + return MXC_CAN_Init(can_idx, cfg, unit_cb, obj_cb, -1); /* MAX32690 related mapping */ #elif defined(CONFIG_SOC_MAX32690) - MXC_CAN_Init(can_idx, cfg, unit_cb, obj_cb); + return MXC_CAN_Init(can_idx, cfg, unit_cb, obj_cb); #endif // part number }