From e68855b91a7b9065a4234a5e80220f4d95a95a1a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 17 Jan 2025 18:36:04 +0000 Subject: [PATCH] Update Zephyr MSDK Hal based on MSDK PR: https://github.com/analogdevicesinc/msdk/pull/1320 --- MAX/Include/wrap_max32_can.h | 12 ++++++------ MAX/msdk_sha | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MAX/Include/wrap_max32_can.h b/MAX/Include/wrap_max32_can.h index 9f8d9924..d91e0c64 100644 --- a/MAX/Include/wrap_max32_can.h +++ b/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 } diff --git a/MAX/msdk_sha b/MAX/msdk_sha index a15e6f2c..b2797b20 100644 --- a/MAX/msdk_sha +++ b/MAX/msdk_sha @@ -1 +1 @@ -f7516d8bcf033d68336b8a5425723e4b9615a390 +4f0d3d320b29c455153ea16dc34a08d87ddd85a8