Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Other): Fix Wrap_MXC_CAN_Init signature #1320

Merged
merged 1 commit into from
Jan 17, 2025
+6 −6
Merged

fix(Other): Fix Wrap_MXC_CAN_Init signature #1320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Libraries/zephyr/MAX/Include/wrap_max32_can.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand All @@ -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
}
Expand Down
Loading