rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIMXRT1062/LLD/USBHSv1: implement hal_usb_lld for MIMXRT1062

This commit is contained in:
Michael Stapelberg 2021-03-26 11:34:11 +01:00
parent 931020fc52
commit 9f939cec5a
4 changed files with 517 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/nxp-middleware-usb/device/usb_device_ehci.c
View File

@ -193,6 +193,7 @@ static void USB_DeviceEhciSetDefaultState(usb_device_ehci_state_struct_t *ehciSt
/* Enable USB Interrupt, USB Error Interrupt, Port Change detect Interrupt, USB-Reset Interrupt*/ /* Enable USB Interrupt, USB Error Interrupt, Port Change detect Interrupt, USB-Reset Interrupt*/
ehciState->registerBase->USBINTR = ehciState->registerBase->USBINTR =
(USBHS_USBINTR_UE_MASK | USBHS_USBINTR_UEE_MASK | USBHS_USBINTR_PCE_MASK | USBHS_USBINTR_URE_MASK (USBHS_USBINTR_UE_MASK | USBHS_USBINTR_UEE_MASK | USBHS_USBINTR_PCE_MASK | USBHS_USBINTR_URE_MASK
| USBHS_USBINTR_SRE_MASK
#if (defined(USB_DEVICE_CONFIG_LOW_POWER_MODE) && (USB_DEVICE_CONFIG_LOW_POWER_MODE > 0U)) #if (defined(USB_DEVICE_CONFIG_LOW_POWER_MODE) && (USB_DEVICE_CONFIG_LOW_POWER_MODE > 0U))
| USBHS_USBINTR_SLE_MASK | USBHS_USBINTR_SLE_MASK
#endif /* USB_DEVICE_CONFIG_LOW_POWER_MODE */ #endif /* USB_DEVICE_CONFIG_LOW_POWER_MODE */

20
os/hal/ports/MIMXRT1062/LLD/USBHSv1/driver.mk
View File

@ -1,9 +1,23 @@
HAL_USB_SRC = ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/USBHSv1/hal_usb_lld.c \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/device/usb_device_dci.c \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/device/usb_device_ehci.c \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/phy/usb_phy.c \
${CHIBIOS_CONTRIB}/ext/mcux-sdk/components/osa/fsl_os_abstraction_bm.c \
${CHIBIOS_CONTRIB}/ext/mcux-sdk/components/lists/fsl_component_generic_list.c
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),) ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),)
PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/USBHSv1/hal_usb_lld.c PLATFORMSRC_CONTRIB += ${HAL_USB_SRC}
endif endif
else else
PLATFORMSRC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/USBHSv1/hal_usb_lld.c PLATFORMSRC_CONTRIB += ${HAL_USB_SRC}
endif endif
PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/USBHSv1 PLATFORMINC_CONTRIB += ${CHIBIOS_CONTRIB}/os/hal/ports/MIMXRT1062/LLD/USBHSv1 \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/include \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/device \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/phy \
${CHIBIOS_CONTRIB}/ext/nxp-middleware-usb/output/npw/device_config/ehci \
${CHIBIOS_CONTRIB}/ext/mcux-sdk/components/osa \
${CHIBIOS_CONTRIB}/ext/mcux-sdk/components/lists

1006
os/hal/ports/MIMXRT1062/LLD/USBHSv1/hal_usb_lld.c
View File

File diff suppressed because it is too large Load Diff

74
os/hal/ports/MIMXRT1062/LLD/USBHSv1/hal_usb_lld.h
View File

@ -17,7 +17,7 @@
/** /**
* @file USBHSv1/hal_usb_lld.h * @file USBHSv1/hal_usb_lld.h
* @brief KINETIS USB subsystem low level driver header. * @brief MIMXRT1062 USB subsystem low level driver header.
* *
* @addtogroup USB * @addtogroup USB
* @{ * @{
@ -28,6 +28,12 @@
#if HAL_USE_USB || defined(__DOXYGEN__) #if HAL_USE_USB || defined(__DOXYGEN__)
#include "usb_device_config.h"
#include "usb.h"
#include "usb_device.h"
#include "usb_device_dci.h"
#include "usb_device_ehci.h"
/*===========================================================================*/ /*===========================================================================*/
/* Driver constants. */ /* Driver constants. */
/*===========================================================================*/ /*===========================================================================*/
@ -35,7 +41,7 @@
/** /**
* @brief Maximum endpoint address. * @brief Maximum endpoint address.
*/ */
#define USB_MAX_ENDPOINTS 15 #define USB_MAX_ENDPOINTS 7
/** /**
* @brief Status stage handling method. * @brief Status stage handling method.
@ -50,7 +56,7 @@
/** /**
* @brief This device requires the address change after the status packet. * @brief This device requires the address change after the status packet.
*/ */
#define USB_SET_ADDRESS_MODE USB_LATE_SET_ADDRESS #define USB_SET_ADDRESS_MODE USB_EARLY_SET_ADDRESS
/*===========================================================================*/ /*===========================================================================*/
/* Driver pre-compile time settings. */ /* Driver pre-compile time settings. */
@ -61,19 +67,23 @@
* @details If set to @p TRUE the support for USB1 is included. * @details If set to @p TRUE the support for USB1 is included.
* @note The default is @p TRUE. * @note The default is @p TRUE.
*/ */
#if !defined(KINETIS_USB_USE_USB0) || defined(__DOXYGEN__) #if !defined(MIMXRT1062_USB_USE_USB1) || defined(__DOXYGEN__)
#define KINETIS_USB_USE_USB0 FALSE #define MIMXRT1062_USB_USE_USB1 TRUE
#endif
#if !defined(MIMXRT1062_USB1_IS_USBOTG)
#define MIMXRT1062_USB1_IS_USBOTG TRUE
#endif #endif
/** /**
* @brief USB1 interrupt priority level setting. * @brief USB1 interrupt priority level setting.
*/ */
#if !defined(KINETIS_USB_USB0_IRQ_PRIORITY)|| defined(__DOXYGEN__) #if !defined(MIMXRT1062_USB_USB1_IRQ_PRIORITY)|| defined(__DOXYGEN__)
#define KINETIS_USB_USB0_IRQ_PRIORITY 5 #define MIMXRT1062_USB_USB1_IRQ_PRIORITY 3
#endif #endif
#if !defined(KINETIS_USB_ENDPOINTS) || defined(__DOXYGEN__) #if !defined(MIMXRT1062_USB_ENDPOINTS) || defined(__DOXYGEN__)
#define KINETIS_USB_ENDPOINTS USB_MAX_ENDPOINTS+1 #define MIMXRT1062_USB_ENDPOINTS (USB_MAX_ENDPOINTS+1)
#endif #endif
/** /**
@ -87,21 +97,21 @@
/* Derived constants and error checks. */ /* Derived constants and error checks. */
/*===========================================================================*/ /*===========================================================================*/
#if KINETIS_USB_USE_USB0 && !KINETIS_HAS_USB #if MIMXRT1062_USB_USE_USB1 && !MIMXRT1062_HAS_USB
#error "USB not present in the selected device" #error "USB not present in the selected device"
#endif #endif
#if !KINETIS_USB_USE_USB0 #if !MIMXRT1062_USB_USE_USB1
#error "USB driver activated but no USB peripheral assigned" #error "USB driver activated but no USB peripheral assigned"
#endif #endif
#if KINETIS_USB_USE_USB0 && \ #if MIMXRT1062_USB_USE_USB1 && \
!OSAL_IRQ_IS_VALID_PRIORITY(KINETIS_USB_USB0_IRQ_PRIORITY) !OSAL_IRQ_IS_VALID_PRIORITY(MIMXRT1062_USB_USB1_IRQ_PRIORITY)
#error "Invalid IRQ priority assigned to KINETIS_USB_USB0_IRQ_PRIORITY" #error "Invalid IRQ priority assigned to MIMXRT1062_USB_USB1_IRQ_PRIORITY"
#endif #endif
#if !defined(KINETIS_USB_IRQ_VECTOR) #if !defined(MIMXRT1062_USB_OTG1_IRQ_VECTOR)
#error "KINETIS_USB_IRQ_VECTOR not defined" #error "MIMXRT1062_USB_OTG1_IRQ_VECTOR not defined"
#endif #endif
#if (USB_HOST_WAKEUP_DURATION < 2) || (USB_HOST_WAKEUP_DURATION > 15) #if (USB_HOST_WAKEUP_DURATION < 2) || (USB_HOST_WAKEUP_DURATION > 15)
@ -134,11 +144,6 @@ typedef struct {
*/ */
thread_reference_t thread; thread_reference_t thread;
#endif #endif
/* End of the mandatory fields.*/
/* */
bool odd_even; /* ODD / EVEN */
/* */
bool data_bank; /* DATA0 / DATA1 */
} USBInEndpointState; } USBInEndpointState;
/** /**
@ -164,14 +169,6 @@ typedef struct {
thread_reference_t thread; thread_reference_t thread;
#endif #endif
/* End of the mandatory fields.*/ /* End of the mandatory fields.*/
/**
* @brief Number of packets to receive.
*/
uint16_t rxpkts;
/* */
bool odd_even; /* ODD / EVEN */
/* */
bool data_bank; /* DATA0 / DATA1 */
} USBOutEndpointState; } USBOutEndpointState;
/** /**
@ -363,7 +360,7 @@ struct USBDriver {
* *
* @notapi * @notapi
*/ */
#define usb_lld_get_frame_number(usbp) ((USB0->FRMNUMH<<8)|USB0->FRMNUML) #define usb_lld_get_frame_number(usbp) ((USB1->FRMNUMH<<8)|USB1->FRMNUML)
/** /**
* @brief Returns the exact size of a receive transaction. * @brief Returns the exact size of a receive transaction.
@ -388,7 +385,7 @@ struct USBDriver {
* @api * @api
*/ */
#if !defined(usb_lld_connect_bus) #if !defined(usb_lld_connect_bus)
#define usb_lld_connect_bus(usbp) (USB0->CONTROL |= USBx_CONTROL_DPPULLUPNONOTG) #define usb_lld_connect_bus(usbp) do { usb_device_struct_t *dev_handle = (usb_device_struct_t *)handle; (void)USB_DeviceEhciControl((usb_device_ehci_state_struct_t *)(dev_handle->controllerHandle), kUSB_DeviceControlRun, NULL); } while (0)
#endif #endif
/** /**
@ -397,32 +394,27 @@ struct USBDriver {
* @api * @api
*/ */
#if !defined(usb_lld_disconnect_bus) #if !defined(usb_lld_disconnect_bus)
/* Writing to USB0->CONTROL causes an unhandled exception when USB module is not clocked. */ #define usb_lld_disconnect_bus(usbp) do { usb_device_struct_t *dev_handle = (usb_device_struct_t *)handle; (void)USB_DeviceEhciControl((usb_device_ehci_state_struct_t *)(dev_handle->controllerHandle), kUSB_DeviceControlStop, NULL); } while (0)
#if KINETIS_USB0_IS_USBOTG
#define usb_lld_disconnect_bus(usbp) if(SIM->SCGC4 & SIM_SCGC4_USBOTG) {USB0->CONTROL &= ~USBx_CONTROL_DPPULLUPNONOTG;} else {}
#else /* KINETIS_USB0_IS_USBOTG */
#define usb_lld_disconnect_bus(usbp) if(SIM->SCGC4 & SIM_SCGC4_USBFS) {USB0->CONTROL &= ~USBx_CONTROL_DPPULLUPNONOTG;} else {}
#endif /* KINETIS_USB0_IS_USBOTG */
#endif #endif
/** /**
* @brief Start of host wake-up procedure. * @brief Start of host wake-up procedure.
* @todo Test and wire up, if supported.
* *
* @notapi * @notapi
*/ */
#define usb_lld_wakeup_host(usbp) \ #define usb_lld_wakeup_host(usbp) \
do{ \ do{ \
USB0->CTL |= USBx_CTL_RESUME; \
osalThreadSleepMilliseconds(USB_HOST_WAKEUP_DURATION); \
USB0->CTL &= ~USBx_CTL_RESUME; \
} while (false) } while (false)
/*===========================================================================*/ /*===========================================================================*/
/* External declarations. */ /* External declarations. */
/*===========================================================================*/ /*===========================================================================*/
#if KINETIS_USB_USE_USB0 && !defined(__DOXYGEN__) #if MIMXRT1062_USB_USE_USB1 && !defined(__DOXYGEN__)
extern USBDriver USBD1; extern USBDriver USBD1;
extern usb_device_handle handle;
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus