Skip to content

Commit

Permalink
Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1320
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Jan 17, 2025
1 parent b91a6c8 commit e68855b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions MAX/Include/wrap_max32_can.h
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
2 changes: 1 addition & 1 deletion MAX/msdk_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f7516d8bcf033d68336b8a5425723e4b9615a390
4f0d3d320b29c455153ea16dc34a08d87ddd85a8

0 comments on commit e68855b

Please sign in to comment.