michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: hal_nxp: Move NXP USB file to modules folder

Browse source 
Move USB file to from modules/hal_nxp to zephyr/modules
folder

Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@nxp.com>
This commit is contained in:
Mahesh Mahadevan 2021-07-26 14:54:19 -05:00 • committed by Christopher Friedt
commit a69bd75bd8
4 changed files with 112 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/usb/device/usb_dc_mcux_ehci.c
View file

@ -72,8 +72,8 @@ __nocache K_HEAP_DEFINE(ep_buf_pool, 1024 * EP_BUF_NUMOF_BLOCKS);
K_HEAP_DEFINE(ep_buf_pool, 1024 * EP_BUF_NUMOF_BLOCKS);
#endif
static usb_ep_ctrl_data_t s_ep_ctrl[NUM_OF_EP_MAX];
static usb_device_struct_t dev_data;
static struct usb_ep_ctrl_data s_ep_ctrl[NUM_OF_EP_MAX];
static struct usb_device_struct dev_data;
#if ((defined(USB_DEVICE_CONFIG_EHCI)) && (USB_DEVICE_CONFIG_EHCI > 0U))
/* EHCI device driver interface */
@ -746,7 +746,7 @@ static void handle_transfer_msg(usb_device_callback_message_struct_t *cb_msg)
}
/* Notify the up layer the KHCI status changed. */
void USB_DeviceNotificationTrigger(void *handle, void *msg)
usb_status_t USB_DeviceNotificationTrigger(void *handle, void *msg)
{
uint8_t ep_abs_idx;
usb_device_callback_message_struct_t *cb_msg =
@ -771,13 +771,15 @@ void USB_DeviceNotificationTrigger(void *handle, void *msg)
if (ep_abs_idx >= NUM_OF_EP_MAX) {
LOG_ERR("Wrong endpoint index/address");
return;
return kStatus_USB_Error;
}
memcpy(&dev_data.eps[ep_abs_idx].transfer_message, cb_msg,
sizeof(usb_device_callback_message_struct_t));
handle_transfer_msg(&dev_data.eps[ep_abs_idx].transfer_message);
}
return kStatus_USB_Success;
}
static void usb_isr_handler(void)

1
modules/hal_nxp/CMakeLists.txt
View file

@ -5,3 +5,4 @@
#
add_subdirectory(${ZEPHYR_CURRENT_MODULE_DIR} hal_nxp)
add_subdirectory_ifdef(CONFIG_USB_DEVICE_DRIVER usb)

8
modules/hal_nxp/usb/CMakeLists.txt Normal file
View file

@ -0,0 +1,8 @@
#
# Copyright (c) 2021, NXP
#
# SPDX-License-Identifier: Apache-2.0
#
zephyr_library()
zephyr_include_directories(.)

97
modules/hal_nxp/usb/usb_dc_mcux.h Normal file
View file

@ -0,0 +1,97 @@
/*
* Copyright 2018 - 2021 NXP
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef __USB_DC_MCUX_H__
#define __USB_DC_MCUX_H__
#include <drivers/usb/usb_dc.h>
#include "usb_spec.h"
#include "usb.h"
#include "usb_device_dci.h"
#include "usb_device.h"
/******************************************************************************
* Definitions
*****************************************************************************/
/* EHCI instance count */
#ifdef CONFIG_USB_DC_NXP_EHCI
#define USB_DEVICE_CONFIG_EHCI (1U)
/* How many the DTD are supported. */
#define USB_DEVICE_CONFIG_EHCI_MAX_DTD (16U)
/* Whether device is self power. 1U supported, 0U not supported */
#define USB_DEVICE_CONFIG_SELF_POWER (1U)
#endif
/* Number of endpoints supported */
#define USB_DEVICE_CONFIG_ENDPOINTS (DT_INST_PROP(0, num_bidir_endpoints))
/* controller driver do the ZLP for controller transfer automatically or not */
#define USB_DEVICE_CONTROLLER_AUTO_CONTROL_TRANSFER_ZLP (0)
/* endpoint related macros */
#define EP0_MAX_PACKET_SIZE 64
#define EP0_OUT 0
#define EP0_IN 0x80
/* enter critical macros */
#define OSA_SR_ALLOC() int usbOsaCurrentSr
#define OSA_ENTER_CRITICAL() usbOsaCurrentSr = irq_lock()
#define OSA_EXIT_CRITICAL() irq_unlock(usbOsaCurrentSr)
/* NXP SDK USB controller driver configuration macros */
#define USB_BDT
#define USB_GLOBAL
#define USB_DATA_ALIGN_SIZE 4
#define USB_RAM_ADDRESS_ALIGNMENT(n) __aligned(n)
/* EHCI */
#if defined(CONFIG_NOCACHE_MEMORY)
#define USB_CONTROLLER_DATA __nocache
#else
#define USB_CONTROLLER_DATA
#endif
struct usb_ep_ctrl_data {
usb_device_callback_message_struct_t transfer_message;
struct k_mem_block block;
usb_dc_ep_callback callback;
uint16_t ep_mps;
uint8_t ep_type;
uint8_t ep_enabled : 1;
uint8_t ep_occupied : 1;
};
struct usb_device_struct {
#if ((defined(USB_DEVICE_CONFIG_REMOTE_WAKEUP)) && \
(USB_DEVICE_CONFIG_REMOTE_WAKEUP > 0U)) || \
(defined(FSL_FEATURE_SOC_USB_ANALOG_COUNT) && \
(FSL_FEATURE_SOC_USB_ANALOG_COUNT > 0U))
/* Current hw tick(ms)*/
volatile uint64_t hwTick;
#endif
/* Controller handle */
usb_device_controller_handle controllerHandle;
/* Controller interface handle */
const usb_device_controller_interface_struct_t *interface;
usb_dc_status_callback status_callback;
struct usb_ep_ctrl_data *eps;
bool attached;
/* Current device address */
uint8_t address;
/* Controller ID */
uint8_t controllerId;
/* Current device state */
uint8_t state;
#if ((defined(USB_DEVICE_CONFIG_REMOTE_WAKEUP)) && (USB_DEVICE_CONFIG_REMOTE_WAKEUP > 0U))
/* Remote wakeup is enabled or not */
uint8_t remotewakeup;
#endif
/* Is doing device reset or not */
uint8_t isResetting;
uint8_t setupDataStage;
};
#endif /* __USB_DC_MCUX_H__ */