Skip to content

Commit

Permalink
Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1305
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Dec 19, 2024
1 parent 17499af commit c343ed9
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 1 deletion.
56 changes: 56 additions & 0 deletions MAX/Include/wrap_max32_can.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/******************************************************************************
*
* Copyright (C) 2024 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
******************************************************************************/

#ifndef LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_CAN_H_
#define LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_CAN_H_

/***** Includes *****/
#include <can.h>

#ifdef __cplusplus
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)
{
/* The only API difference between the MAX32662 and MAX32690 relevant to
* implementing the max32 CAN driver in Zephyr is that the former requires a
* GPIO mapping parameter, which is not used anyway (MSDK_NO_GPIO_CLK_INIT).
*/

/* MAX32662 related mapping */
#if defined(CONFIG_SOC_MAX32662)
/* 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);

/* MAX32690 related mapping */
#elif defined(CONFIG_SOC_MAX32690)
MXC_CAN_Init(can_idx, cfg, unit_cb, obj_cb);

#endif // part number
}

#ifdef __cplusplus
}
#endif

#endif // LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_CAN_H_
10 changes: 10 additions & 0 deletions MAX/Include/wrap_max32_dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ static inline int Wrap_MXC_DMA_AcquireChannel(mxc_dma_regs_t *dma)
#endif
}

static inline int Wrap_MXC_DMA_GetChannelIndex(mxc_dma_regs_t *dma, uint8_t ch)
{
#if defined(CONFIG_SOC_MAX32657)
(void)dma;
return ch;
#else
return (ch + MXC_DMA_GET_IDX(dma) * (MXC_DMA_CHANNELS / MXC_DMA_INSTANCES));
#endif
}

static inline void Wrap_MXC_DMA_Handler(mxc_dma_regs_t *dma)
{
#if defined(CONFIG_SOC_MAX32657) || defined(CONFIG_SOC_MAX32665) || defined(CONFIG_SOC_MAX32666)
Expand Down
59 changes: 59 additions & 0 deletions MAX/Include/wrap_max32_usb.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/******************************************************************************
*
* Copyright (C) 2024 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
******************************************************************************/

#ifndef LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_USB_H_
#define LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_USB_H_

/***** Includes *****/
#include <usb.h>
#include <usb_event.h>
#include <mcr_regs.h>

#ifdef __cplusplus
extern "C" {
#endif

/*
* MAX32665, MAX32666 related mapping
*/
#if defined(CONFIG_SOC_MAX32665) || (CONFIG_SOC_MAX32666)

static inline int Wrap_MXC_USB_Init(maxusb_cfg_options_t *options)
{
return MXC_USB_Init(options);
}

/*
* MAX32690 related mapping
*/
#elif defined(CONFIG_SOC_MAX32690)

static inline int Wrap_MXC_USB_Init(maxusb_cfg_options_t *options)
{
MXC_MCR->ldoctrl |= MXC_F_MCR_LDOCTRL_0P9EN;

return MXC_USB_Init(options);
}

#endif // part number

#ifdef __cplusplus
}
#endif

#endif // LIBRARIES_ZEPHYR_MAX_INCLUDE_WRAP_MAX32_USB_H_
2 changes: 1 addition & 1 deletion MAX/msdk_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b1e26c4a3111763c9663691ed7455739665da5e3
506501c5caba0fd4d331c65449545fb5e17de089

0 comments on commit c343ed9

Please sign in to comment.