stm32/usbd_conf: Changes files to unix line endings and apply styling.

This patch is only cosmetic and has no functional change.

2 files changed, 694 insertions, 740 deletions

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 4902da997..d4a09459b 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -1,692 +1,646 @@
-/*

- * This file is part of the MicroPython project, http://micropython.org/

- */

-

-/**

-  ******************************************************************************

-  * @file    USB_Device/CDC_Standalone/Src/usbd_conf.c

-  * @author  MCD Application Team

-  * @version V1.0.1

-  * @date    26-February-2014

-  * @brief   This file implements the USB Device library callbacks and MSP

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (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.st.com/software_license_agreement_liberty_v2

-  *

-  * 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.

-  *

-  ******************************************************************************

-  */

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_core.h"

-#include "py/obj.h"

-#include "py/mphal.h"

-#include "irq.h"

-#include "usb.h"

-

-/* Private typedef -----------------------------------------------------------*/

-/* Private define ------------------------------------------------------------*/

-/* Private macro -------------------------------------------------------------*/

-/* Private variables ---------------------------------------------------------*/

-#if MICROPY_HW_USB_FS

-PCD_HandleTypeDef pcd_fs_handle;

-#endif

-#if MICROPY_HW_USB_HS

-PCD_HandleTypeDef pcd_hs_handle;

-#endif

-/* Private function prototypes -----------------------------------------------*/

-/* Private functions ---------------------------------------------------------*/

-

-/*******************************************************************************

-                       PCD BSP Routines

-*******************************************************************************/

-/**

-  * @brief  Initializes the PCD MSP.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)

-{

-  if(hpcd->Instance == USB_OTG_FS)

-  {

-    #if defined(STM32H7)

-    const uint32_t otg_alt = GPIO_AF10_OTG1_FS;

-    #else

-    const uint32_t otg_alt = GPIO_AF10_OTG_FS;

-    #endif

-

-    mp_hal_pin_config(pin_A11, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);

-    mp_hal_pin_config_speed(pin_A11, GPIO_SPEED_FREQ_VERY_HIGH);

-    mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);

-    mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);

-    

-	/* Configure VBUS Pin */

-#if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)

-    // USB VBUS detect pin is always A9

-    mp_hal_pin_config(MICROPY_HW_USB_VBUS_DETECT_PIN, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);

-#endif

-	

-#if defined(MICROPY_HW_USB_OTG_ID_PIN)

-    // USB ID pin is always A10

-    mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, otg_alt);

-#endif

-

-    #if defined(STM32H7)

-    // Keep USB clock running during sleep or else __WFI() will disable the USB

-    __HAL_RCC_USB2_OTG_FS_CLK_SLEEP_ENABLE();

-    __HAL_RCC_USB2_OTG_FS_ULPI_CLK_SLEEP_DISABLE();

-    #endif

-

-    /* Enable USB FS Clocks */ 

-    __USB_OTG_FS_CLK_ENABLE();

-    

-#if defined(STM32L4)

-    /* Enable VDDUSB */

-    if(__HAL_RCC_PWR_IS_CLK_DISABLED())

-    {

-      __HAL_RCC_PWR_CLK_ENABLE();

-      HAL_PWREx_EnableVddUSB();

-      __HAL_RCC_PWR_CLK_DISABLE();

-    }

-    else

-    {

-      HAL_PWREx_EnableVddUSB();

-    }

-#endif

-

-    /* Set USBFS Interrupt priority */

-    NVIC_SetPriority(OTG_FS_IRQn, IRQ_PRI_OTG_FS);

-    

-    /* Enable USBFS Interrupt */

-    HAL_NVIC_EnableIRQ(OTG_FS_IRQn);

-  } 

-#if MICROPY_HW_USB_HS

-  else if(hpcd->Instance == USB_OTG_HS)

-  {

-#if MICROPY_HW_USB_HS_IN_FS

-

-    /* Configure USB FS GPIOs */

-    mp_hal_pin_config(pin_B14, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);

-    mp_hal_pin_config_speed(pin_B14, GPIO_SPEED_FREQ_VERY_HIGH);

-    mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);

-    mp_hal_pin_config_speed(pin_B15, GPIO_SPEED_FREQ_VERY_HIGH);

-

-#if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)

-    /* Configure VBUS Pin */

-    mp_hal_pin_config(MICROPY_HW_USB_VBUS_DETECT_PIN, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);

-#endif

-

-#if defined(MICROPY_HW_USB_OTG_ID_PIN)

-    /* Configure ID pin */

-    mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, GPIO_AF12_OTG_HS_FS);

-#endif

-    /*

-     * Enable calling WFI and correct

-     * function of the embedded USB_FS_IN_HS phy

-     */

-    __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_DISABLE();

-    __HAL_RCC_USB_OTG_HS_CLK_SLEEP_ENABLE();

-

-    /* Enable USB HS Clocks */

-

-    #if defined(STM32F723xx) || defined(STM32F733xx)

-    // Needs to remain awake during sleep or else __WFI() will disable the USB

-    __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_ENABLE();

-    __HAL_RCC_OTGPHYC_CLK_ENABLE();

-    __HAL_RCC_USB_OTG_HS_ULPI_CLK_ENABLE();

-    #endif

-

-    __HAL_RCC_USB_OTG_HS_CLK_ENABLE();

-

-#else // !MICROPY_HW_USB_HS_IN_FS

-    GPIO_InitTypeDef GPIO_InitStruct;

-

-    /* Configure USB HS GPIOs */

-    __HAL_RCC_GPIOA_CLK_ENABLE();

-    __HAL_RCC_GPIOB_CLK_ENABLE();

-    __HAL_RCC_GPIOC_CLK_ENABLE();

-    __HAL_RCC_GPIOH_CLK_ENABLE();

-    __HAL_RCC_GPIOI_CLK_ENABLE();

-    

-    /* CLK */

-    GPIO_InitStruct.Pin = GPIO_PIN_5;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); 

-    

-    /* D0 */

-    GPIO_InitStruct.Pin = GPIO_PIN_3;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); 

-    

-    /* D1 D2 D3 D4 D5 D6 D7 */

-    GPIO_InitStruct.Pin = GPIO_PIN_0  | GPIO_PIN_1  | GPIO_PIN_5 |\

-                          GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); 

-    

-    /* STP */    

-    GPIO_InitStruct.Pin = GPIO_PIN_0;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); 

-    

-    /* NXT */ 

-    GPIO_InitStruct.Pin = GPIO_PIN_4;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);   

-    

-    /* DIR */

-    GPIO_InitStruct.Pin = GPIO_PIN_11;

-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

-    GPIO_InitStruct.Pull = GPIO_NOPULL;

-    GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;

-    HAL_GPIO_Init(GPIOI, &GPIO_InitStruct);

-    

-    /* Enable USB HS Clocks */

-    __USB_OTG_HS_CLK_ENABLE();

-    __USB_OTG_HS_ULPI_CLK_ENABLE();

-#endif // !MICROPY_HW_USB_HS_IN_FS

-    

-    /* Set USBHS Interrupt to the lowest priority */

-    NVIC_SetPriority(OTG_HS_IRQn, IRQ_PRI_OTG_HS);

-    

-    /* Enable USBHS Interrupt */

-    HAL_NVIC_EnableIRQ(OTG_HS_IRQn);

-  }   

-#endif  // MICROPY_HW_USB_HS

-}

-/**

-  * @brief  DeInitializes the PCD MSP.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd)

-{

-  if(hpcd->Instance == USB_OTG_FS)

-  {  

-    /* Disable USB FS Clocks */ 

-    __USB_OTG_FS_CLK_DISABLE();

-    __SYSCFG_CLK_DISABLE(); 

-  }

-  #if MICROPY_HW_USB_HS

-  else if(hpcd->Instance == USB_OTG_HS)

-  {  

-    /* Disable USB FS Clocks */ 

-    __USB_OTG_HS_CLK_DISABLE();

-    __SYSCFG_CLK_DISABLE(); 

-  }  

-  #endif

-}

-

-/*******************************************************************************

-                       LL Driver Callbacks (PCD -> USB Device Library)

-*******************************************************************************/

-

-

-/**

-  * @brief  Setup stage callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_SetupStage(hpcd->pData, (uint8_t *)hpcd->Setup);

-}

-

-/**

-  * @brief  Data Out stage callback.

-  * @param  hpcd: PCD handle

-  * @param  epnum: Endpoint Number

-  * @retval None

-  */

-void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)

-{

-  USBD_LL_DataOutStage(hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);

-}

-

-/**

-  * @brief  Data In stage callback.

-  * @param  hpcd: PCD handle

-  * @param  epnum: Endpoint Number

-  * @retval None

-  */

-void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)

-{

-  USBD_LL_DataInStage(hpcd->pData, epnum, hpcd->IN_ep[epnum].xfer_buff);

-}

-

-/**

-  * @brief  SOF callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-/*

-This is now handled by the USB CDC interface.

-void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_SOF(hpcd->pData);

-}

-*/

-

-/**

-  * @brief  Reset callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_ResetCallback(PCD_HandleTypeDef *hpcd)

-{ 

-  USBD_SpeedTypeDef speed = USBD_SPEED_FULL;

-

-  /* Set USB Current Speed */

-  switch(hpcd->Init.speed)

-  {

-#if defined(PCD_SPEED_HIGH)

-  case PCD_SPEED_HIGH:

-    speed = USBD_SPEED_HIGH;

-    break;

-#endif

-    

-  case PCD_SPEED_FULL:

-    speed = USBD_SPEED_FULL;    

-    break;

-	

-	default:

-    speed = USBD_SPEED_FULL;    

-    break;

-  }

-  USBD_LL_SetSpeed(hpcd->pData, speed);  

-  

-  /* Reset Device */

-  USBD_LL_Reset(hpcd->pData);

-}

-

-/**

-  * @brief  Suspend callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_SuspendCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_Suspend(hpcd->pData);

-}

-

-/**

-  * @brief  Resume callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_ResumeCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_Resume(hpcd->pData);

-}

-

-/**

-  * @brief  ISOC Out Incomplete callback.

-  * @param  hpcd: PCD handle

-  * @param  epnum: Endpoint Number  

-  * @retval None

-  */

-void HAL_PCD_ISOOUTIncompleteCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)

-{

-  USBD_LL_IsoOUTIncomplete(hpcd->pData, epnum);

-}

-

-/**

-  * @brief  ISOC In Incomplete callback.

-  * @param  hpcd: PCD handle

-  * @param  epnum: Endpoint Number  

-  * @retval None

-  */

-void HAL_PCD_ISOINIncompleteCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)

-{

-  USBD_LL_IsoINIncomplete(hpcd->pData, epnum);

-}

-

-/**

-  * @brief  Connect callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_ConnectCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_DevConnected(hpcd->pData);

-}

-

-/**

-  * @brief  Disconnect callback.

-  * @param  hpcd: PCD handle

-  * @retval None

-  */

-void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd)

-{

-  USBD_LL_DevDisconnected(hpcd->pData);

-}

-

-/*******************************************************************************

-                       LL Driver Interface (USB Device Library --> PCD)

-*******************************************************************************/

-/**

-  * @brief  Initializes the Low Level portion of the Device driver.  

-  * @param  pdev: Device handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_LL_Init (USBD_HandleTypeDef *pdev, int high_speed)

-{ 

-#if MICROPY_HW_USB_FS

-if (pdev->id ==  USB_PHY_FS_ID)

-{

-  /*Set LL Driver parameters */

-  pcd_fs_handle.Instance = USB_OTG_FS;

-  pcd_fs_handle.Init.dev_endpoints = 4;

-  pcd_fs_handle.Init.use_dedicated_ep1 = 0;

-  pcd_fs_handle.Init.ep0_mps = 0x40;

-  pcd_fs_handle.Init.dma_enable = 0;

-  pcd_fs_handle.Init.low_power_enable = 0;

-  pcd_fs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;

-  pcd_fs_handle.Init.Sof_enable = 1;

-  pcd_fs_handle.Init.speed = PCD_SPEED_FULL;

-#if defined(STM32L4)

-  pcd_fs_handle.Init.lpm_enable = DISABLE;

-  pcd_fs_handle.Init.battery_charging_enable = DISABLE;

-#endif

-#if !defined(MICROPY_HW_USB_VBUS_DETECT_PIN)

-  pcd_fs_handle.Init.vbus_sensing_enable = 0; // No VBUS Sensing on USB0

-#else

-  pcd_fs_handle.Init.vbus_sensing_enable = 1;

-#endif

-  /* Link The driver to the stack */

-  pcd_fs_handle.pData = pdev;

-  pdev->pData = &pcd_fs_handle;

-  /*Initialize LL Driver */

-  HAL_PCD_Init(&pcd_fs_handle);

-

-  HAL_PCD_SetRxFiFo(&pcd_fs_handle, 0x80);

-  HAL_PCD_SetTxFiFo(&pcd_fs_handle, 0, 0x20);

-  HAL_PCD_SetTxFiFo(&pcd_fs_handle, 1, 0x40);

-  HAL_PCD_SetTxFiFo(&pcd_fs_handle, 2, 0x20);

-  HAL_PCD_SetTxFiFo(&pcd_fs_handle, 3, 0x40);

-}

-#endif

-#if MICROPY_HW_USB_HS

-if (pdev->id == USB_PHY_HS_ID)

-{

-#if MICROPY_HW_USB_HS_IN_FS

-  /*Set LL Driver parameters */

-  pcd_hs_handle.Instance = USB_OTG_HS;

-  pcd_hs_handle.Init.dev_endpoints = 4;

-  pcd_hs_handle.Init.use_dedicated_ep1 = 0;

-  pcd_hs_handle.Init.ep0_mps = 0x40;

-  pcd_hs_handle.Init.dma_enable = 0;

-  pcd_hs_handle.Init.low_power_enable = 0;

-  #if defined(STM32F723xx) || defined(STM32F733xx)

-  pcd_hs_handle.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;

-  #else

-  pcd_hs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;

-  #endif

-  pcd_hs_handle.Init.Sof_enable = 1;

-  if (high_speed) {

-      pcd_hs_handle.Init.speed = PCD_SPEED_HIGH;

-  } else {

-      pcd_hs_handle.Init.speed = PCD_SPEED_HIGH_IN_FULL;

-  }

-#if !defined(MICROPY_HW_USB_VBUS_DETECT_PIN)

-  pcd_hs_handle.Init.vbus_sensing_enable = 0; // No VBUS Sensing on USB0

-#else

-  pcd_hs_handle.Init.vbus_sensing_enable = 1;

-#endif

-  pcd_hs_handle.Init.use_external_vbus = 0;

-  /* Link The driver to the stack */

-  pcd_hs_handle.pData = pdev;

-  pdev->pData = &pcd_hs_handle;

-  /*Initialize LL Driver */

-  HAL_PCD_Init(&pcd_hs_handle);

-

-  HAL_PCD_SetRxFiFo(&pcd_hs_handle, 0x200);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 0, 0x20);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 1, 0x100);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 2, 0x20);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 3, 0xc0);

-#else // !MICROPY_HW_USB_HS_IN_FS

-  /*Set LL Driver parameters */

-  pcd_hs_handle.Instance = USB_OTG_HS;

-  pcd_hs_handle.Init.dev_endpoints = 6;

-  pcd_hs_handle.Init.use_dedicated_ep1 = 0;

-  pcd_hs_handle.Init.ep0_mps = 0x40;

-  

-  /* Be aware that enabling USB-DMA mode will result in data being sent only by

-     multiple of 4 packet sizes. This is due to the fact that USB-DMA does

-     not allow sending data from non word-aligned addresses.

-     For this specific application, it is advised to not enable this option

-     unless required. */

-  pcd_hs_handle.Init.dma_enable = 0;

-  

-  pcd_hs_handle.Init.low_power_enable = 0;

-  pcd_hs_handle.Init.phy_itface = PCD_PHY_ULPI;

-  pcd_hs_handle.Init.Sof_enable = 1;

-  pcd_hs_handle.Init.speed = PCD_SPEED_HIGH;

-  pcd_hs_handle.Init.vbus_sensing_enable = 1;

-  /* Link The driver to the stack */

-  pcd_hs_handle.pData = pdev;

-  pdev->pData = &pcd_hs_handle;

-  /*Initialize LL Driver */

-  HAL_PCD_Init(&pcd_hs_handle);

-  

-  HAL_PCD_SetRxFiFo(&pcd_hs_handle, 0x200);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 0, 0x80);

-  HAL_PCD_SetTxFiFo(&pcd_hs_handle, 1, 0x174);

-

-#endif  // !MICROPY_HW_USB_HS_IN_FS

-}

-#endif  // MICROPY_HW_USB_HS

-  return USBD_OK;

-}

-

-/**

-  * @brief  De-Initializes the Low Level portion of the Device driver. 

-  * @param  pdev: Device handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)

-{

-  HAL_PCD_DeInit(pdev->pData);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Starts the Low Level portion of the Device driver.    

-  * @param  pdev: Device handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)

-{

-  HAL_PCD_Start(pdev->pData);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Stops the Low Level portion of the Device driver.

-  * @param  pdev: Device handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)

-{

-  HAL_PCD_Stop(pdev->pData);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Opens an endpoint of the Low Level Driver. 

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number

-  * @param  ep_type: Endpoint Type

-  * @param  ep_mps: Endpoint Max Packet Size                 

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, 

-                                  uint8_t  ep_addr,                                      

-                                  uint8_t  ep_type,

-                                  uint16_t ep_mps)

-{

-  HAL_PCD_EP_Open(pdev->pData, ep_addr, ep_mps, ep_type);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Closes an endpoint of the Low Level Driver.  

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number      

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)   

-{

-  HAL_PCD_EP_Close(pdev->pData, ep_addr);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Flushes an endpoint of the Low Level Driver.

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number      

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)   

-{

-  HAL_PCD_EP_Flush(pdev->pData, ep_addr);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Sets a Stall condition on an endpoint of the Low Level Driver.

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number      

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)   

-{

-  HAL_PCD_EP_SetStall(pdev->pData, ep_addr);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Clears a Stall condition on an endpoint of the Low Level Driver.

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number      

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)   

-{

-  HAL_PCD_EP_ClrStall(pdev->pData, ep_addr);  

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Returns Stall condition.

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number      

-  * @retval Stall (1: yes, 0: No)

-  */

-uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)   

-{

-  PCD_HandleTypeDef *hpcd = pdev->pData; 

-  

-  if((ep_addr & 0x80) == 0x80)

-  {

-    return hpcd->IN_ep[ep_addr & 0x7F].is_stall; 

-  }

-  else

-  {

-    return hpcd->OUT_ep[ep_addr & 0x7F].is_stall; 

-  }

-}

-

-/**

-  * @brief  Assigns an USB address to the device

-  * @param  pdev: Device handle

-  * @param  dev_addr: USB address      

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr)   

-{

-  HAL_PCD_SetAddress(pdev->pData, dev_addr);

-  return USBD_OK; 

-}

-

-/**

-  * @brief  Transmits data over an endpoint 

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number

-  * @param  pbuf: Pointer to data to be sent    

-  * @param  size: Data size    

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, 

-                                    uint8_t  ep_addr,                                      

-                                    uint8_t  *pbuf,

-                                    uint16_t  size)

-{

-  HAL_PCD_EP_Transmit(pdev->pData, ep_addr, pbuf, size);

-  return USBD_OK;   

-}

-

-/**

-  * @brief  Prepares an endpoint for reception 

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number

-  * @param  pbuf:pointer to data to be received    

-  * @param  size: data size              

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev, 

-                                          uint8_t  ep_addr,                                      

-                                          uint8_t  *pbuf,

-                                          uint16_t  size)

-{

-  HAL_PCD_EP_Receive(pdev->pData, ep_addr, pbuf, size);

-  return USBD_OK;   

-}

-

-/**

-  * @brief  Returns the last transfered packet size.    

-  * @param  pdev: Device handle

-  * @param  ep_addr: Endpoint Number

-  * @retval Recived Data Size

-  */

-uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t  ep_addr)  

-{

-  return HAL_PCD_EP_GetRxCount(pdev->pData, ep_addr);

-}

-

-/**

-  * @brief  Delay routine for the USB Device Library      

-  * @param  Delay: Delay in ms

-  * @retval None

-  */

-void  USBD_LL_Delay(uint32_t Delay)

-{

-  HAL_Delay(Delay);  

-}

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ */
+
+/**
+  ******************************************************************************
+  * @file    USB_Device/CDC_Standalone/Src/usbd_conf.c
+  * @author  MCD Application Team
+  * @version V1.0.1
+  * @date    26-February-2014
+  * @brief   This file implements the USB Device library callbacks and MSP
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (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.st.com/software_license_agreement_liberty_v2
+  *
+  * 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.
+  *
+  ******************************************************************************
+  */
+
+#include "usbd_core.h"
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "irq.h"
+#include "usb.h"
+
+#if MICROPY_HW_USB_FS
+PCD_HandleTypeDef pcd_fs_handle;
+#endif
+#if MICROPY_HW_USB_HS
+PCD_HandleTypeDef pcd_hs_handle;
+#endif
+
+/*******************************************************************************
+                       PCD BSP Routines
+*******************************************************************************/
+
+/**
+  * @brief  Initializes the PCD MSP.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
+    if (hpcd->Instance == USB_OTG_FS) {
+        #if defined(STM32H7)
+        const uint32_t otg_alt = GPIO_AF10_OTG1_FS;
+        #else
+        const uint32_t otg_alt = GPIO_AF10_OTG_FS;
+        #endif
+
+        mp_hal_pin_config(pin_A11, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);
+        mp_hal_pin_config_speed(pin_A11, GPIO_SPEED_FREQ_VERY_HIGH);
+        mp_hal_pin_config(pin_A12, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, otg_alt);
+        mp_hal_pin_config_speed(pin_A12, GPIO_SPEED_FREQ_VERY_HIGH);
+
+        #if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
+        // USB VBUS detect pin is always A9
+        mp_hal_pin_config(MICROPY_HW_USB_VBUS_DETECT_PIN, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);
+        #endif
+
+        #if defined(MICROPY_HW_USB_OTG_ID_PIN)
+        // USB ID pin is always A10
+        mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, otg_alt);
+        #endif
+
+        #if defined(STM32H7)
+        // Keep USB clock running during sleep or else __WFI() will disable the USB
+        __HAL_RCC_USB2_OTG_FS_CLK_SLEEP_ENABLE();
+        __HAL_RCC_USB2_OTG_FS_ULPI_CLK_SLEEP_DISABLE();
+        #endif
+
+        // Enable USB FS Clocks
+        __USB_OTG_FS_CLK_ENABLE();
+
+        #if defined(STM32L4)
+        // Enable VDDUSB
+        if (__HAL_RCC_PWR_IS_CLK_DISABLED()) {
+            __HAL_RCC_PWR_CLK_ENABLE();
+            HAL_PWREx_EnableVddUSB();
+            __HAL_RCC_PWR_CLK_DISABLE();
+        } else {
+            HAL_PWREx_EnableVddUSB();
+        }
+        #endif
+
+        // Configure and enable USB FS interrupt
+        NVIC_SetPriority(OTG_FS_IRQn, IRQ_PRI_OTG_FS);
+        HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
+    }
+    #if MICROPY_HW_USB_HS
+    else if (hpcd->Instance == USB_OTG_HS) {
+        #if MICROPY_HW_USB_HS_IN_FS
+
+        // Configure USB FS GPIOs
+        mp_hal_pin_config(pin_B14, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);
+        mp_hal_pin_config_speed(pin_B14, GPIO_SPEED_FREQ_VERY_HIGH);
+        mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF12_OTG_HS_FS);
+        mp_hal_pin_config_speed(pin_B15, GPIO_SPEED_FREQ_VERY_HIGH);
+
+        #if defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
+        // Configure VBUS Pin
+        mp_hal_pin_config(MICROPY_HW_USB_VBUS_DETECT_PIN, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);
+        #endif
+
+        #if defined(MICROPY_HW_USB_OTG_ID_PIN)
+        // Configure ID pin
+        mp_hal_pin_config(MICROPY_HW_USB_OTG_ID_PIN, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_UP, GPIO_AF12_OTG_HS_FS);
+        #endif
+
+        // Enable calling WFI and correct function of the embedded USB_FS_IN_HS phy
+        __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_DISABLE();
+        __HAL_RCC_USB_OTG_HS_CLK_SLEEP_ENABLE();
+
+        // Enable USB HS Clocks
+
+        #if defined(STM32F723xx) || defined(STM32F733xx)
+        // Needs to remain awake during sleep or else __WFI() will disable the USB
+        __HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_ENABLE();
+        __HAL_RCC_OTGPHYC_CLK_ENABLE();
+        __HAL_RCC_USB_OTG_HS_ULPI_CLK_ENABLE();
+        #endif
+
+        __HAL_RCC_USB_OTG_HS_CLK_ENABLE();
+
+        #else // !MICROPY_HW_USB_HS_IN_FS
+
+        GPIO_InitTypeDef GPIO_InitStruct;
+
+        // Configure USB HS GPIOs
+        __HAL_RCC_GPIOA_CLK_ENABLE();
+        __HAL_RCC_GPIOB_CLK_ENABLE();
+        __HAL_RCC_GPIOC_CLK_ENABLE();
+        __HAL_RCC_GPIOH_CLK_ENABLE();
+        __HAL_RCC_GPIOI_CLK_ENABLE();
+
+        // CLK
+        GPIO_InitStruct.Pin = GPIO_PIN_5;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+        // D0
+        GPIO_InitStruct.Pin = GPIO_PIN_3;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+        // D1 D2 D3 D4 D5 D6 D7
+        GPIO_InitStruct.Pin = GPIO_PIN_0  | GPIO_PIN_1  | GPIO_PIN_5 |\
+            GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+        // STP
+        GPIO_InitStruct.Pin = GPIO_PIN_0;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+        // NXT
+        GPIO_InitStruct.Pin = GPIO_PIN_4;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
+
+        // DIR
+        GPIO_InitStruct.Pin = GPIO_PIN_11;
+        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull = GPIO_NOPULL;
+        GPIO_InitStruct.Alternate = GPIO_AF10_OTG_HS;
+        HAL_GPIO_Init(GPIOI, &GPIO_InitStruct);
+
+        // Enable USB HS Clocks
+        __USB_OTG_HS_CLK_ENABLE();
+        __USB_OTG_HS_ULPI_CLK_ENABLE();
+
+        #endif // !MICROPY_HW_USB_HS_IN_FS
+
+        // Configure and enable USB HS interrupt
+        NVIC_SetPriority(OTG_HS_IRQn, IRQ_PRI_OTG_HS);
+        HAL_NVIC_EnableIRQ(OTG_HS_IRQn);
+    }
+    #endif // MICROPY_HW_USB_HS
+}
+
+/**
+  * @brief  DeInitializes the PCD MSP.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
+    if (hpcd->Instance == USB_OTG_FS) {
+        /* Disable USB FS Clocks */
+        __USB_OTG_FS_CLK_DISABLE();
+        __SYSCFG_CLK_DISABLE();
+    }
+    #if MICROPY_HW_USB_HS
+    else if (hpcd->Instance == USB_OTG_HS) {
+        /* Disable USB FS Clocks */
+        __USB_OTG_HS_CLK_DISABLE();
+        __SYSCFG_CLK_DISABLE();
+    }
+    #endif
+}
+
+/*******************************************************************************
+                       LL Driver Callbacks (PCD -> USB Device Library)
+*******************************************************************************/
+
+/**
+  * @brief  Setup stage callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_LL_SetupStage(hpcd->pData, (uint8_t *)hpcd->Setup);
+}
+
+/**
+  * @brief  Data Out stage callback.
+  * @param  hpcd: PCD handle
+  * @param  epnum: Endpoint Number
+  * @retval None
+  */
+void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum) {
+    USBD_LL_DataOutStage(hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
+}
+
+/**
+  * @brief  Data In stage callback.
+  * @param  hpcd: PCD handle
+  * @param  epnum: Endpoint Number
+  * @retval None
+  */
+void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum) {
+    USBD_LL_DataInStage(hpcd->pData, epnum, hpcd->IN_ep[epnum].xfer_buff);
+}
+
+/**
+  * @brief  SOF callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+/*
+This is now handled by the USB CDC interface.
+void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_LL_SOF(hpcd->pData);
+}
+*/
+
+/**
+  * @brief  Reset callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_ResetCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_SpeedTypeDef speed = USBD_SPEED_FULL;
+
+    // Set USB Current Speed
+    switch (hpcd->Init.speed) {
+        #if defined(PCD_SPEED_HIGH)
+        case PCD_SPEED_HIGH:
+            speed = USBD_SPEED_HIGH;
+            break;
+        #endif
+
+        case PCD_SPEED_FULL:
+            speed = USBD_SPEED_FULL;
+            break;
+
+        default:
+            speed = USBD_SPEED_FULL;
+            break;
+    }
+    USBD_LL_SetSpeed(hpcd->pData, speed);
+
+    // Reset Device
+    USBD_LL_Reset(hpcd->pData);
+}
+
+/**
+  * @brief  Suspend callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_SuspendCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_LL_Suspend(hpcd->pData);
+}
+
+/**
+  * @brief  Resume callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_ResumeCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_LL_Resume(hpcd->pData);
+}
+
+/**
+  * @brief  ISOC Out Incomplete callback.
+  * @param  hpcd: PCD handle
+  * @param  epnum: Endpoint Number
+  * @retval None
+  */
+void HAL_PCD_ISOOUTIncompleteCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum) {
+    USBD_LL_IsoOUTIncomplete(hpcd->pData, epnum);
+}
+
+/**
+  * @brief  ISOC In Incomplete callback.
+  * @param  hpcd: PCD handle
+  * @param  epnum: Endpoint Number
+  * @retval None
+  */
+void HAL_PCD_ISOINIncompleteCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum) {
+    USBD_LL_IsoINIncomplete(hpcd->pData, epnum);
+}
+
+/**
+  * @brief  Connect callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_ConnectCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_LL_DevConnected(hpcd->pData);
+}
+
+/**
+  * @brief  Disconnect callback.
+  * @param  hpcd: PCD handle
+  * @retval None
+  */
+void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd) {
+    USBD_LL_DevDisconnected(hpcd->pData);
+}
+
+/*******************************************************************************
+                       LL Driver Interface (USB Device Library --> PCD)
+*******************************************************************************/
+
+/**
+  * @brief  Initializes the Low Level portion of the Device driver.
+  * @param  pdev: Device handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed) {
+    #if MICROPY_HW_USB_FS
+    if (pdev->id ==  USB_PHY_FS_ID) {
+        // Set LL Driver parameters
+        pcd_fs_handle.Instance = USB_OTG_FS;
+        pcd_fs_handle.Init.dev_endpoints = 4;
+        pcd_fs_handle.Init.use_dedicated_ep1 = 0;
+        pcd_fs_handle.Init.ep0_mps = 0x40;
+        pcd_fs_handle.Init.dma_enable = 0;
+        pcd_fs_handle.Init.low_power_enable = 0;
+        pcd_fs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;
+        pcd_fs_handle.Init.Sof_enable = 1;
+        pcd_fs_handle.Init.speed = PCD_SPEED_FULL;
+        #if defined(STM32L4)
+        pcd_fs_handle.Init.lpm_enable = DISABLE;
+        pcd_fs_handle.Init.battery_charging_enable = DISABLE;
+        #endif
+        #if !defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
+        pcd_fs_handle.Init.vbus_sensing_enable = 0; // No VBUS Sensing on USB0
+        #else
+        pcd_fs_handle.Init.vbus_sensing_enable = 1;
+        #endif
+
+        // Link The driver to the stack
+        pcd_fs_handle.pData = pdev;
+        pdev->pData = &pcd_fs_handle;
+
+        // Initialize LL Driver
+        HAL_PCD_Init(&pcd_fs_handle);
+
+        HAL_PCD_SetRxFiFo(&pcd_fs_handle, 0x80);
+        HAL_PCD_SetTxFiFo(&pcd_fs_handle, 0, 0x20);
+        HAL_PCD_SetTxFiFo(&pcd_fs_handle, 1, 0x40);
+        HAL_PCD_SetTxFiFo(&pcd_fs_handle, 2, 0x20);
+        HAL_PCD_SetTxFiFo(&pcd_fs_handle, 3, 0x40);
+    }
+    #endif
+    #if MICROPY_HW_USB_HS
+    if (pdev->id == USB_PHY_HS_ID) {
+        #if MICROPY_HW_USB_HS_IN_FS
+
+        // Set LL Driver parameters
+        pcd_hs_handle.Instance = USB_OTG_HS;
+        pcd_hs_handle.Init.dev_endpoints = 4;
+        pcd_hs_handle.Init.use_dedicated_ep1 = 0;
+        pcd_hs_handle.Init.ep0_mps = 0x40;
+        pcd_hs_handle.Init.dma_enable = 0;
+        pcd_hs_handle.Init.low_power_enable = 0;
+        #if defined(STM32F723xx) || defined(STM32F733xx)
+        pcd_hs_handle.Init.phy_itface = USB_OTG_HS_EMBEDDED_PHY;
+        #else
+        pcd_hs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;
+        #endif
+        pcd_hs_handle.Init.Sof_enable = 1;
+        if (high_speed) {
+            pcd_hs_handle.Init.speed = PCD_SPEED_HIGH;
+        } else {
+            pcd_hs_handle.Init.speed = PCD_SPEED_HIGH_IN_FULL;
+        }
+        #if !defined(MICROPY_HW_USB_VBUS_DETECT_PIN)
+        pcd_hs_handle.Init.vbus_sensing_enable = 0; // No VBUS Sensing on USB0
+        #else
+        pcd_hs_handle.Init.vbus_sensing_enable = 1;
+        #endif
+        pcd_hs_handle.Init.use_external_vbus = 0;
+
+        // Link The driver to the stack
+        pcd_hs_handle.pData = pdev;
+        pdev->pData = &pcd_hs_handle;
+
+        // Initialize LL Driver
+        HAL_PCD_Init(&pcd_hs_handle);
+
+        HAL_PCD_SetRxFiFo(&pcd_hs_handle, 0x200);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 0, 0x20);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 1, 0x100);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 2, 0x20);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 3, 0xc0);
+
+        #else // !MICROPY_HW_USB_HS_IN_FS
+
+        // Set LL Driver parameters
+        pcd_hs_handle.Instance = USB_OTG_HS;
+        pcd_hs_handle.Init.dev_endpoints = 6;
+        pcd_hs_handle.Init.use_dedicated_ep1 = 0;
+        pcd_hs_handle.Init.ep0_mps = 0x40;
+
+        /* Be aware that enabling USB-DMA mode will result in data being sent only by
+           multiple of 4 packet sizes. This is due to the fact that USB-DMA does
+           not allow sending data from non word-aligned addresses.
+           For this specific application, it is advised to not enable this option
+           unless required. */
+        pcd_hs_handle.Init.dma_enable = 0;
+
+        pcd_hs_handle.Init.low_power_enable = 0;
+        pcd_hs_handle.Init.phy_itface = PCD_PHY_ULPI;
+        pcd_hs_handle.Init.Sof_enable = 1;
+        pcd_hs_handle.Init.speed = PCD_SPEED_HIGH;
+        pcd_hs_handle.Init.vbus_sensing_enable = 1;
+
+        // Link The driver to the stack
+        pcd_hs_handle.pData = pdev;
+        pdev->pData = &pcd_hs_handle;
+
+        // Initialize LL Driver
+        HAL_PCD_Init(&pcd_hs_handle);
+
+        HAL_PCD_SetRxFiFo(&pcd_hs_handle, 0x200);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 0, 0x80);
+        HAL_PCD_SetTxFiFo(&pcd_hs_handle, 1, 0x174);
+
+        #endif // !MICROPY_HW_USB_HS_IN_FS
+    }
+    #endif  // MICROPY_HW_USB_HS
+
+    return USBD_OK;
+}
+
+/**
+  * @brief  De-Initializes the Low Level portion of the Device driver.
+  * @param  pdev: Device handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev) {
+    HAL_PCD_DeInit(pdev->pData);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Starts the Low Level portion of the Device driver.
+  * @param  pdev: Device handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev) {
+    HAL_PCD_Start(pdev->pData);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Stops the Low Level portion of the Device driver.
+  * @param  pdev: Device handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev) {
+    HAL_PCD_Stop(pdev->pData);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Opens an endpoint of the Low Level Driver.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @param  ep_type: Endpoint Type
+  * @param  ep_mps: Endpoint Max Packet Size
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev,
+    uint8_t ep_addr, uint8_t ep_type, uint16_t ep_mps) {
+    HAL_PCD_EP_Open(pdev->pData, ep_addr, ep_mps, ep_type);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Closes an endpoint of the Low Level Driver.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+    HAL_PCD_EP_Close(pdev->pData, ep_addr);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Flushes an endpoint of the Low Level Driver.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+    HAL_PCD_EP_Flush(pdev->pData, ep_addr);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Sets a Stall condition on an endpoint of the Low Level Driver.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+    HAL_PCD_EP_SetStall(pdev->pData, ep_addr);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Clears a Stall condition on an endpoint of the Low Level Driver.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+    HAL_PCD_EP_ClrStall(pdev->pData, ep_addr);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Returns Stall condition.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval Stall (1: yes, 0: No)
+  */
+uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+    PCD_HandleTypeDef *hpcd = pdev->pData;
+
+    if ((ep_addr & 0x80) == 0x80) {
+        return hpcd->IN_ep[ep_addr & 0x7F].is_stall;
+    } else {
+        return hpcd->OUT_ep[ep_addr & 0x7F].is_stall;
+    }
+}
+
+/**
+  * @brief  Assigns an USB address to the device
+  * @param  pdev: Device handle
+  * @param  dev_addr: USB address
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr) {
+    HAL_PCD_SetAddress(pdev->pData, dev_addr);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Transmits data over an endpoint
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @param  pbuf: Pointer to data to be sent
+  * @param  size: Data size
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev,
+    uint8_t ep_addr, uint8_t *pbuf, uint16_t size) {
+    HAL_PCD_EP_Transmit(pdev->pData, ep_addr, pbuf, size);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Prepares an endpoint for reception
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @param  pbuf:pointer to data to be received
+  * @param  size: data size
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
+    uint8_t ep_addr, uint8_t *pbuf, uint16_t size) {
+    HAL_PCD_EP_Receive(pdev->pData, ep_addr, pbuf, size);
+    return USBD_OK;
+}
+
+/**
+  * @brief  Returns the last transfered packet size.
+  * @param  pdev: Device handle
+  * @param  ep_addr: Endpoint Number
+  * @retval Recived Data Size
+  */
+uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t  ep_addr) {
+    return HAL_PCD_EP_GetRxCount(pdev->pData, ep_addr);
+}
+
+/**
+  * @brief  Delay routine for the USB Device Library
+  * @param  Delay: Delay in ms
+  * @retval None
+  */
+void USBD_LL_Delay(uint32_t Delay) {
+    HAL_Delay(Delay);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
index 657bba67e..e68cbd9a4 100644
--- a/ports/stm32/usbd_conf.h
+++ b/ports/stm32/usbd_conf.h
@@ -1,48 +1,48 @@
-/*

- * This file is part of the MicroPython project, http://micropython.org/

- */

-

-/**

-  ******************************************************************************

-  * @file    USB_Device/CDC_Standalone/Inc/usbd_conf.h

-  * @author  MCD Application Team

-  * @version V1.0.1

-  * @date    26-February-2014

-  * @brief   General low level driver configuration

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (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.st.com/software_license_agreement_liberty_v2

-  *

-  * 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 __USBD_CONF_H

-#define __USBD_CONF_H

-

-#include <stdint.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#define USBD_MAX_NUM_INTERFACES               1

-#define USBD_MAX_NUM_CONFIGURATION            1

-#define USBD_MAX_STR_DESC_SIZ                 0x100

-#define USBD_SELF_POWERED                     0

-#define USBD_DEBUG_LEVEL                      0

-

-#endif /* __USBD_CONF_H */

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ */
+
+/**
+  ******************************************************************************
+  * @file    USB_Device/CDC_Standalone/Inc/usbd_conf.h
+  * @author  MCD Application Team
+  * @version V1.0.1
+  * @date    26-February-2014
+  * @brief   General low level driver configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (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.st.com/software_license_agreement_liberty_v2
+  *
+  * 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 MICROPY_INCLUDED_STM32_USBD_CONF_H
+#define MICROPY_INCLUDED_STM32_USBD_CONF_H
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define USBD_MAX_NUM_INTERFACES               1
+#define USBD_MAX_NUM_CONFIGURATION            1
+#define USBD_MAX_STR_DESC_SIZ                 0x100
+#define USBD_SELF_POWERED                     0
+#define USBD_DEBUG_LEVEL                      0
+
+#endif // MICROPY_INCLUDED_STM32_USBD_CONF_H
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/