WebSVN – LedShow – Diff – /trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c

   ******************************************************************************
   * @file    stm32f1xx_ll_usb.c
   * @author  MCD Application Team
   * @brief   USB Low Layer HAL module driver.
+  *
   *          This file provides firmware functions to manage the following
   *          functionalities of the USB Peripheral Controller:
   *           + Initialization/de-initialization functions
   *           + I/O operation functions
   *           + Peripheral Control functions
   *           + Peripheral State functions
+  *
   @verbatim
   ==============================================================================
                     ##### How to use this driver #####
   ==============================================================================
     [..]
       (#) Fill parameters of Init structure in USB_OTG_CfgTypeDef structure.
       (#) Call USB_CoreInit() API to initialize the USB Core peripheral.
       (#) The upper HAL HCD/PCD driver will call the right routines for its internal processes.
   @endverbatim
   ******************************************************************************
   * @attention
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+  * <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
-  *
-  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
+  * All rights reserved.</center></h2>
+  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * This software component is licensed by ST under BSD 3-Clause license,
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * the "License"; You may not use this file except in compliance with the
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * License. You may obtain a copy of the License at:
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f1xx_hal.h"
-/** @addtogroup STM32F1xx_HAL_Driver
+/** @addtogroup STM32F1xx_LL_USB_DRIVER
-  * @{
-  */
-/** @defgroup USB_LL USB Low Layer
-  * @brief Low layer module for USB_FS and USB_OTG_FS drivers
   * @{
   */
 #if defined (HAL_PCD_MODULE_ENABLED) || defined (HAL_HCD_MODULE_ENABLED)
-#if defined(STM32F102x6) || defined(STM32F102xB) || \
+#if defined (USB) || defined (USB_OTG_FS)
-    defined(STM32F103x6) || defined(STM32F103xB) || \
+/* Private typedef -----------------------------------------------------------*/
-    defined(STM32F103xE) || defined(STM32F103xG) || \
+/* Private define ------------------------------------------------------------*/
-    defined(STM32F105xC) || defined(STM32F107xC)
-/* Private types -------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-/* Private constants ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
-/* Private macros ------------------------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 #if defined (USB_OTG_FS)
-/** @defgroup USB_LL_Private_Functions USB Low Layer Private Functions
-  * @{
-  */
 static HAL_StatusTypeDef USB_CoreReset(USB_OTG_GlobalTypeDef *USBx);
-/**
-  * @}
-  */
-#endif /* USB_OTG_FS */
 /* Exported functions --------------------------------------------------------*/
 /** @defgroup USB_LL_Exported_Functions USB Low Layer Exported Functions
   * @{
   */
-/** @defgroup USB_LL_Exported_Functions_Group1 Peripheral Control functions
+/** @defgroup USB_LL_Exported_Functions_Group1 Initialization/de-initialization functions
- *  @brief   management functions
+  *  @brief    Initialization and Configuration functions
- *
+  *
 @verbatim
  ===============================================================================
-                      ##### Peripheral Control functions #####
+                      ##### Initialization/de-initialization functions #####
  ===============================================================================
-    [..]
-    This subsection provides a set of functions allowing to control the PCD data
-    transfers.
 @endverbatim
   * @{
   */
-/*==============================================================================
-    USB OTG FS peripheral available on STM32F105xx and STM32F107xx devices
-==============================================================================*/
-#if defined (USB_OTG_FS)
 /**
   * @brief  Initializes the USB Core
-  * @param  USBx: USB Instance
+  * @param  USBx USB Instance
-  * @param  cfg : pointer to a USB_OTG_CfgTypeDef structure that contains
+  * @param  cfg pointer to a USB_OTG_CfgTypeDef structure that contains
   *         the configuration information for the specified USBx peripheral.
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_CoreInit(USB_OTG_GlobalTypeDef *USBx, USB_OTG_CfgTypeDef cfg)
+{
+  HAL_StatusTypeDef ret;
+  if (cfg.phy_itface == USB_OTG_ULPI_PHY)
+  {
+    USBx->GCCFG &= ~(USB_OTG_GCCFG_PWRDWN);
+    /* Init The ULPI Interface */
+    USBx->GUSBCFG &= ~(USB_OTG_GUSBCFG_TSDPS | USB_OTG_GUSBCFG_ULPIFSLS | USB_OTG_GUSBCFG_PHYSEL);
+    /* Select vbus source */
+    USBx->GUSBCFG &= ~(USB_OTG_GUSBCFG_ULPIEVBUSD | USB_OTG_GUSBCFG_ULPIEVBUSI);
+    if (cfg.use_external_vbus == 1U)
+    {
+      USBx->GUSBCFG |= USB_OTG_GUSBCFG_ULPIEVBUSD;
+    }
-  /* Prevent unused argument(s) compilation warning */
+    /* Reset after a PHY select  */
+    ret = USB_CoreReset(USBx);
+  }
+  else /* FS interface (embedded Phy) */
+  {
+    /* Select FS Embedded PHY */
+    USBx->GUSBCFG |= USB_OTG_GUSBCFG_PHYSEL;
+    /* Reset after a PHY select */
+    ret = USB_CoreReset(USBx);
+    /* Activate the USB Transceiver */
+    USBx->GCCFG |= USB_OTG_GCCFG_PWRDWN;
+  }
-  UNUSED(cfg);
+  return ret;
+}
+/**
+  * @brief  Set the USB turnaround time
+  * @param  USBx USB Instance
+  * @param  hclk: AHB clock frequency
+  * @retval USB turnaround time In PHY Clocks number
+  */
+HAL_StatusTypeDef USB_SetTurnaroundTime(USB_OTG_GlobalTypeDef *USBx,
+                                        uint32_t hclk, uint8_t speed)
+{
+  uint32_t UsbTrd;
+  /* The USBTRD is configured according to the tables below, depending on AHB frequency
+  used by application. In the low AHB frequency range it is used to stretch enough the USB response
+  time to IN tokens, the USB turnaround time, so to compensate for the longer AHB read access
+  latency to the Data FIFO */
+  if (speed == USBD_FS_SPEED)
+  {
+    if ((hclk >= 14200000U) && (hclk < 15000000U))
+    {
+      /* hclk Clock Range between 14.2-15 MHz */
+      UsbTrd = 0xFU;
+    }
+    else if ((hclk >= 15000000U) && (hclk < 16000000U))
+    {
+      /* hclk Clock Range between 15-16 MHz */
+      UsbTrd = 0xEU;
+    }
+    else if ((hclk >= 16000000U) && (hclk < 17200000U))
+    {
+      /* hclk Clock Range between 16-17.2 MHz */
+      UsbTrd = 0xDU;
+    }
+    else if ((hclk >= 17200000U) && (hclk < 18500000U))
+    {
+      /* hclk Clock Range between 17.2-18.5 MHz */
+      UsbTrd = 0xCU;
+    }
+    else if ((hclk >= 18500000U) && (hclk < 20000000U))
+    {
+      /* hclk Clock Range between 18.5-20 MHz */
+      UsbTrd = 0xBU;
+    }
+    else if ((hclk >= 20000000U) && (hclk < 21800000U))
+    {
+      /* hclk Clock Range between 20-21.8 MHz */
+      UsbTrd = 0xAU;
+    }
+    else if ((hclk >= 21800000U) && (hclk < 24000000U))
+    {
+      /* hclk Clock Range between 21.8-24 MHz */
+      UsbTrd = 0x9U;
+    }
+    else if ((hclk >= 24000000U) && (hclk < 27700000U))
+    {
+      /* hclk Clock Range between 24-27.7 MHz */
+      UsbTrd = 0x8U;
+    }
+    else if ((hclk >= 27700000U) && (hclk < 32000000U))
+    {
+      /* hclk Clock Range between 27.7-32 MHz */
+      UsbTrd = 0x7U;
+    }
+    else /* if(hclk >= 32000000) */
+    {
+      /* hclk Clock Range between 32-200 MHz */
+      UsbTrd = 0x6U;
+    }
+  }
+  else
+  {
+    UsbTrd = USBD_DEFAULT_TRDT_VALUE;
+  }
+  USBx->GUSBCFG &= ~USB_OTG_GUSBCFG_TRDT;
+  USBx->GUSBCFG |= (uint32_t)((UsbTrd << 10) & USB_OTG_GUSBCFG_TRDT);
-  /* Select FS Embedded PHY */
-  USBx->GUSBCFG |= USB_OTG_GUSBCFG_PHYSEL;
-  /* Reset after a PHY select and set Host mode */
-  USB_CoreReset(USBx);
-  /* Deactivate the power down*/
-  USBx->GCCFG = USB_OTG_GCCFG_PWRDWN;
   return HAL_OK;
+}
 /**
   * @brief  USB_EnableGlobalInt
   *         Enables the controller's Global Int in the AHB Config reg
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EnableGlobalInt(USB_OTG_GlobalTypeDef *USBx)
+{
   USBx->GAHBCFG |= USB_OTG_GAHBCFG_GINT;
+}
 /**
   * @brief  USB_DisableGlobalInt
   *         Disable the controller's Global Int in the AHB Config reg
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
-*/
+  */
 HAL_StatusTypeDef USB_DisableGlobalInt(USB_OTG_GlobalTypeDef *USBx)
+{
   USBx->GAHBCFG &= ~USB_OTG_GAHBCFG_GINT;
   return HAL_OK;
+}
 /**
-  * @brief  USB_SetCurrentMode : Set functional mode
+  * @brief  USB_SetCurrentMode Set functional mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  mode :  current core mode
+  * @param  mode  current core mode
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
-  *            @arg USB_DEVICE_MODE: Peripheral mode mode
+  *            @arg USB_DEVICE_MODE Peripheral mode
-  *            @arg USB_HOST_MODE: Host mode
+  *            @arg USB_HOST_MODE Host mode
-  *            @arg USB_DRD_MODE: Dual Role Device mode
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_SetCurrentMode(USB_OTG_GlobalTypeDef *USBx , USB_ModeTypeDef mode)
+HAL_StatusTypeDef USB_SetCurrentMode(USB_OTG_GlobalTypeDef *USBx, USB_ModeTypeDef mode)
+{
   USBx->GUSBCFG &= ~(USB_OTG_GUSBCFG_FHMOD | USB_OTG_GUSBCFG_FDMOD);
-  if ( mode == USB_HOST_MODE)
+  if (mode == USB_HOST_MODE)
+  {
     USBx->GUSBCFG |= USB_OTG_GUSBCFG_FHMOD;
+  }
   else if (mode == USB_DEVICE_MODE)
+  {
     USBx->GUSBCFG |= USB_OTG_GUSBCFG_FDMOD;
+  }
+  else
+  {
+    return HAL_ERROR;
+  }
-  HAL_Delay(50);
+  HAL_Delay(50U);
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevInit : Initializes the USB_OTG controller registers
+  * @brief  USB_DevInit Initializes the USB_OTG controller registers
   *         for device mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  cfg  : pointer to a USB_OTG_CfgTypeDef structure that contains
+  * @param  cfg   pointer to a USB_OTG_CfgTypeDef structure that contains
   *         the configuration information for the specified USBx peripheral.
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_DevInit (USB_OTG_GlobalTypeDef *USBx, USB_OTG_CfgTypeDef cfg)
+HAL_StatusTypeDef USB_DevInit(USB_OTG_GlobalTypeDef *USBx, USB_OTG_CfgTypeDef cfg)
+{
+  HAL_StatusTypeDef ret = HAL_OK;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  uint32_t index = 0;
+  uint32_t i;
-  for (index = 0; index < 15 ; index++)
+  for (i = 0U; i < 15U; i++)
+  {
-    USBx->DIEPTXF[index] = 0;
+    USBx->DIEPTXF[i] = 0U;
+  }
-  /*Activate VBUS Sensing B */
+  /* Enable HW VBUS sensing */
   USBx->GCCFG |= USB_OTG_GCCFG_VBUSBSEN;
   /* Restart the Phy Clock */
-  USBx_PCGCCTL = 0;
+  USBx_PCGCCTL = 0U;
   /* Device mode configuration */
   USBx_DEVICE->DCFG |= DCFG_FRAME_INTERVAL_80;
-  /* Set Full speed phy */
+  /* Set Core speed to Full speed mode */
-  USB_SetDevSpeed (USBx , USB_OTG_SPEED_FULL);
+  (void)USB_SetDevSpeed(USBx, USB_OTG_SPEED_FULL);
   /* Flush the FIFOs */
-  USB_FlushTxFifo(USBx , 0x10); /* all Tx FIFOs */
+  if (USB_FlushTxFifo(USBx, 0x10U) != HAL_OK) /* all Tx FIFOs */
+  {
+    ret = HAL_ERROR;
+  }
-  USB_FlushRxFifo(USBx);
+  if (USB_FlushRxFifo(USBx) != HAL_OK)
+  {
+    ret = HAL_ERROR;
+  }
   /* Clear all pending Device Interrupts */
-  USBx_DEVICE->DIEPMSK = 0;
+  USBx_DEVICE->DIEPMSK = 0U;
-  USBx_DEVICE->DOEPMSK = 0;
+  USBx_DEVICE->DOEPMSK = 0U;
-  USBx_DEVICE->DAINT = 0xFFFFFFFF;
-  USBx_DEVICE->DAINTMSK = 0;
+  USBx_DEVICE->DAINTMSK = 0U;
-  for (index = 0; index < cfg.dev_endpoints; index++)
+  for (i = 0U; i < cfg.dev_endpoints; i++)
+  {
-    if ((USBx_INEP(index)->DIEPCTL & USB_OTG_DIEPCTL_EPENA) == USB_OTG_DIEPCTL_EPENA)
+    if ((USBx_INEP(i)->DIEPCTL & USB_OTG_DIEPCTL_EPENA) == USB_OTG_DIEPCTL_EPENA)
+    {
+      if (i == 0U)
+      {
+        USBx_INEP(i)->DIEPCTL = USB_OTG_DIEPCTL_SNAK;
+      }
+      else
+      {
-      USBx_INEP(index)->DIEPCTL = (USB_OTG_DIEPCTL_EPDIS | USB_OTG_DIEPCTL_SNAK);
+        USBx_INEP(i)->DIEPCTL = USB_OTG_DIEPCTL_EPDIS | USB_OTG_DIEPCTL_SNAK;
+      }
+    }
     else
+    {
-      USBx_INEP(index)->DIEPCTL = 0;
+      USBx_INEP(i)->DIEPCTL = 0U;
+    }
-    USBx_INEP(index)->DIEPTSIZ = 0;
+    USBx_INEP(i)->DIEPTSIZ = 0U;
-    USBx_INEP(index)->DIEPINT  = 0xFF;
+    USBx_INEP(i)->DIEPINT  = 0xFB7FU;
+  }
-  for (index = 0; index < cfg.dev_endpoints; index++)
+  for (i = 0U; i < cfg.dev_endpoints; i++)
+  {
-    if ((USBx_OUTEP(index)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == USB_OTG_DOEPCTL_EPENA)
+    if ((USBx_OUTEP(i)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == USB_OTG_DOEPCTL_EPENA)
+    {
+      if (i == 0U)
+      {
+        USBx_OUTEP(i)->DOEPCTL = USB_OTG_DOEPCTL_SNAK;
+      }
+      else
+      {
-      USBx_OUTEP(index)->DOEPCTL = (USB_OTG_DOEPCTL_EPDIS | USB_OTG_DOEPCTL_SNAK);
+        USBx_OUTEP(i)->DOEPCTL = USB_OTG_DOEPCTL_EPDIS | USB_OTG_DOEPCTL_SNAK;
+      }
+    }
     else
+    {
-      USBx_OUTEP(index)->DOEPCTL = 0;
+      USBx_OUTEP(i)->DOEPCTL = 0U;
+    }
-    USBx_OUTEP(index)->DOEPTSIZ = 0;
+    USBx_OUTEP(i)->DOEPTSIZ = 0U;
-    USBx_OUTEP(index)->DOEPINT  = 0xFF;
+    USBx_OUTEP(i)->DOEPINT  = 0xFB7FU;
+  }
   USBx_DEVICE->DIEPMSK &= ~(USB_OTG_DIEPMSK_TXFURM);
   /* Disable all interrupts. */
-  USBx->GINTMSK = 0;
+  USBx->GINTMSK = 0U;
   /* Clear any pending interrupts */
-  USBx->GINTSTS = 0xBFFFFFFF;
+  USBx->GINTSTS = 0xBFFFFFFFU;
   /* Enable the common interrupts */
   USBx->GINTMSK |= USB_OTG_GINTMSK_RXFLVLM;
   /* Enable interrupts matching to the Device mode ONLY */
-  USBx->GINTMSK |= (USB_OTG_GINTMSK_USBSUSPM | USB_OTG_GINTMSK_USBRST |\
+  USBx->GINTMSK |= USB_OTG_GINTMSK_USBSUSPM | USB_OTG_GINTMSK_USBRST |
-                    USB_OTG_GINTMSK_ENUMDNEM | USB_OTG_GINTMSK_IEPINT |\
+                   USB_OTG_GINTMSK_ENUMDNEM | USB_OTG_GINTMSK_IEPINT |
-                    USB_OTG_GINTMSK_OEPINT   | USB_OTG_GINTMSK_IISOIXFRM|\
+                   USB_OTG_GINTMSK_OEPINT   | USB_OTG_GINTMSK_IISOIXFRM |
-                    USB_OTG_GINTMSK_PXFRM_IISOOXFRM | USB_OTG_GINTMSK_WUIM);
+                   USB_OTG_GINTMSK_PXFRM_IISOOXFRM | USB_OTG_GINTMSK_WUIM;
-  if(cfg.Sof_enable)
+  if (cfg.Sof_enable != 0U)
+  {
     USBx->GINTMSK |= USB_OTG_GINTMSK_SOFM;
+  }
-  if (cfg.vbus_sensing_enable == ENABLE)
+  if (cfg.vbus_sensing_enable == 1U)
+  {
     USBx->GINTMSK |= (USB_OTG_GINTMSK_SRQIM | USB_OTG_GINTMSK_OTGINT);
+  }
-  return HAL_OK;
+  return ret;
+}
 /**
   * @brief  USB_OTG_FlushTxFifo : Flush a Tx FIFO
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  num : FIFO number
+  * @param  num  FIFO number
   *         This parameter can be a value from 1 to 15
 means Flush all Tx FIFOs
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_FlushTxFifo (USB_OTG_GlobalTypeDef *USBx, uint32_t num )
+HAL_StatusTypeDef USB_FlushTxFifo(USB_OTG_GlobalTypeDef *USBx, uint32_t num)
+{
-  uint32_t count = 0;
+  uint32_t count = 0U;
-  USBx->GRSTCTL = (USB_OTG_GRSTCTL_TXFFLSH |(uint32_t)(num << 6));
+  USBx->GRSTCTL = (USB_OTG_GRSTCTL_TXFFLSH | (num << 6));
   do
+  {
-    if (++count > 200000)
+    if (++count > 200000U)
+    {
       return HAL_TIMEOUT;
+    }
-  }
-  while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_TXFFLSH) == USB_OTG_GRSTCTL_TXFFLSH);
+  } while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_TXFFLSH) == USB_OTG_GRSTCTL_TXFFLSH);
   return HAL_OK;
+}
 /**
   * @brief  USB_FlushRxFifo : Flush Rx FIFO
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_FlushRxFifo(USB_OTG_GlobalTypeDef *USBx)
+{
   uint32_t count = 0;
   USBx->GRSTCTL = USB_OTG_GRSTCTL_RXFFLSH;
   do
+  {
-    if (++count > 200000)
+    if (++count > 200000U)
+    {
       return HAL_TIMEOUT;
+    }
-  }
-  while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_RXFFLSH) == USB_OTG_GRSTCTL_RXFFLSH);
+  } while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_RXFFLSH) == USB_OTG_GRSTCTL_RXFFLSH);
   return HAL_OK;
+}
 /**
-  * @brief  USB_SetDevSpeed :Initializes the DevSpd field of DCFG register
+  * @brief  USB_SetDevSpeed  Initializes the DevSpd field of DCFG register
   *         depending the PHY type and the enumeration speed of the device.
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  speed : device speed
+  * @param  speed  device speed
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
   *            @arg USB_OTG_SPEED_FULL: Full speed mode
-  *            @arg USB_OTG_SPEED_LOW: Low speed mode
   * @retval  Hal status
   */
-HAL_StatusTypeDef USB_SetDevSpeed(USB_OTG_GlobalTypeDef *USBx , uint8_t speed)
+HAL_StatusTypeDef USB_SetDevSpeed(USB_OTG_GlobalTypeDef *USBx, uint8_t speed)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
   USBx_DEVICE->DCFG |= speed;
   return HAL_OK;
+}
 /**
-  * @brief  USB_GetDevSpeed :Return the  Dev Speed
+  * @brief  USB_GetDevSpeed  Return the Dev Speed
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @retval speed : device speed
+  * @retval speed  device speed
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
-  *            @arg USB_OTG_SPEED_FULL: Full speed mode
+  *            @arg PCD_SPEED_FULL: Full speed mode
-  *            @arg USB_OTG_SPEED_LOW: Low speed mode
   */
 uint8_t USB_GetDevSpeed(USB_OTG_GlobalTypeDef *USBx)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  uint8_t speed = 0;
+  uint8_t speed;
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t DevEnumSpeed = USBx_DEVICE->DSTS & USB_OTG_DSTS_ENUMSPD;
-  UNUSED(USBx);
-  if (((USBx_DEVICE->DSTS & USB_OTG_DSTS_ENUMSPD) == DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ)||
+  if ((DevEnumSpeed == DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ) ||
-      ((USBx_DEVICE->DSTS & USB_OTG_DSTS_ENUMSPD) == DSTS_ENUMSPD_FS_PHY_48MHZ))
+      (DevEnumSpeed == DSTS_ENUMSPD_FS_PHY_48MHZ))
+  {
-    speed = USB_OTG_SPEED_FULL;
+    speed = USBD_FS_SPEED;
+  }
-  else if((USBx_DEVICE->DSTS & USB_OTG_DSTS_ENUMSPD) == DSTS_ENUMSPD_LS_PHY_6MHZ)
+  else
+  {
-    speed = USB_OTG_SPEED_LOW;
+    speed = 0xFU;
+  }
   return speed;
+}
 /**
   * @brief  Activate and configure an endpoint
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_ActivateEndpoint(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t epnum = (uint32_t)ep->num;
-  if (ep->is_in)
+  if (ep->is_in == 1U)
+  {
+    USBx_DEVICE->DAINTMSK |= USB_OTG_DAINTMSK_IEPM & (uint32_t)(1UL << (ep->num & EP_ADDR_MSK));
-    /* Assign a Tx FIFO */
+    if ((USBx_INEP(epnum)->DIEPCTL & USB_OTG_DIEPCTL_USBAEP) == 0U)
+    {
-    ep->tx_fifo_num = ep->num;
+      USBx_INEP(epnum)->DIEPCTL |= (ep->maxpacket & USB_OTG_DIEPCTL_MPSIZ) |
+                                   ((uint32_t)ep->type << 18) | (epnum << 22) |
+                                   USB_OTG_DIEPCTL_SD0PID_SEVNFRM |
+                                   USB_OTG_DIEPCTL_USBAEP;
+    }
+  }
-  /* Set initial data PID. */
+  else
-  if (ep->type == EP_TYPE_BULK )
+  {
+    USBx_DEVICE->DAINTMSK |= USB_OTG_DAINTMSK_OEPM & ((uint32_t)(1UL << (ep->num & EP_ADDR_MSK)) << 16);
-    ep->data_pid_start = 0;
+    if (((USBx_OUTEP(epnum)->DOEPCTL) & USB_OTG_DOEPCTL_USBAEP) == 0U)
+    {
+      USBx_OUTEP(epnum)->DOEPCTL |= (ep->maxpacket & USB_OTG_DOEPCTL_MPSIZ) |
+                                    ((uint32_t)ep->type << 18) |
+                                    USB_OTG_DIEPCTL_SD0PID_SEVNFRM |
+                                    USB_OTG_DOEPCTL_USBAEP;
+    }
+  }
+  return HAL_OK;
+}
+/**
+  * @brief  Activate and configure a dedicated endpoint
+  * @param  USBx  Selected device
+  * @param  ep pointer to endpoint structure
-  if (ep->is_in == 1)
+  * @retval HAL status
-  {
+  */
-   USBx_DEVICE->DAINTMSK |= USB_OTG_DAINTMSK_IEPM & ((1 << (ep->num)));
+HAL_StatusTypeDef USB_ActivateDedicatedEndpoint(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t epnum = (uint32_t)ep->num;
+  /* Read DEPCTLn register */
+  if (ep->is_in == 1U)
+  {
-    if (((USBx_INEP(ep->num)->DIEPCTL) & USB_OTG_DIEPCTL_USBAEP) == 0)
+    if (((USBx_INEP(epnum)->DIEPCTL) & USB_OTG_DIEPCTL_USBAEP) == 0U)
+    {
-      USBx_INEP(ep->num)->DIEPCTL |= ((ep->maxpacket & USB_OTG_DIEPCTL_MPSIZ ) | (ep->type << 18 ) |\
+      USBx_INEP(epnum)->DIEPCTL |= (ep->maxpacket & USB_OTG_DIEPCTL_MPSIZ) |
+                                   ((uint32_t)ep->type << 18) | (epnum << 22) |
-        ((ep->num) << 22 ) | (USB_OTG_DIEPCTL_SD0PID_SEVNFRM) | (USB_OTG_DIEPCTL_USBAEP));
+                                   USB_OTG_DIEPCTL_SD0PID_SEVNFRM |
+                                   USB_OTG_DIEPCTL_USBAEP;
+    }
+    USBx_DEVICE->DEACHMSK |= USB_OTG_DAINTMSK_IEPM & (uint32_t)(1UL << (ep->num & EP_ADDR_MSK));
+  }
   else
+  {
-     USBx_DEVICE->DAINTMSK |= USB_OTG_DAINTMSK_OEPM & ((1 << (ep->num)) << 16);
-    if (((USBx_OUTEP(ep->num)->DOEPCTL) & USB_OTG_DOEPCTL_USBAEP) == 0)
+    if (((USBx_OUTEP(epnum)->DOEPCTL) & USB_OTG_DOEPCTL_USBAEP) == 0U)
+    {
-      USBx_OUTEP(ep->num)->DOEPCTL |= ((ep->maxpacket & USB_OTG_DOEPCTL_MPSIZ ) | (ep->type << 18 ) |\
+      USBx_OUTEP(epnum)->DOEPCTL |= (ep->maxpacket & USB_OTG_DOEPCTL_MPSIZ) |
+                                    ((uint32_t)ep->type << 18) | (epnum << 22) |
-       (USB_OTG_DIEPCTL_SD0PID_SEVNFRM)| (USB_OTG_DOEPCTL_USBAEP));
+                                    USB_OTG_DOEPCTL_USBAEP;
+    }
+    USBx_DEVICE->DEACHMSK |= USB_OTG_DAINTMSK_OEPM & ((uint32_t)(1UL << (ep->num & EP_ADDR_MSK)) << 16);
+  }
   return HAL_OK;
+}
 /**
   * @brief  De-activate and de-initialize an endpoint
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_DeactivateEndpoint(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t epnum = (uint32_t)ep->num;
   /* Read DEPCTLn register */
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
+    if ((USBx_INEP(epnum)->DIEPCTL & USB_OTG_DIEPCTL_EPENA) == USB_OTG_DIEPCTL_EPENA)
+    {
+      USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_SNAK;
+      USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_EPDIS;
+    }
-    USBx_DEVICE->DEACHMSK &= ~(USB_OTG_DAINTMSK_IEPM & ((1 << (ep->num))));
+    USBx_DEVICE->DEACHMSK &= ~(USB_OTG_DAINTMSK_IEPM & (uint32_t)(1UL << (ep->num & EP_ADDR_MSK)));
-    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_IEPM & ((1 << (ep->num))));
+    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_IEPM & (uint32_t)(1UL << (ep->num & EP_ADDR_MSK)));
-    USBx_INEP(ep->num)->DIEPCTL &= ~ USB_OTG_DIEPCTL_USBAEP;
+    USBx_INEP(epnum)->DIEPCTL &= ~(USB_OTG_DIEPCTL_USBAEP |
+                                   USB_OTG_DIEPCTL_MPSIZ |
+                                   USB_OTG_DIEPCTL_TXFNUM |
+                                   USB_OTG_DIEPCTL_SD0PID_SEVNFRM |
+                                   USB_OTG_DIEPCTL_EPTYP);
+  }
   else
+  {
+    if ((USBx_OUTEP(epnum)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == USB_OTG_DOEPCTL_EPENA)
+    {
+      USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_SNAK;
+      USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_EPDIS;
+    }
-    USBx_DEVICE->DEACHMSK &= ~(USB_OTG_DAINTMSK_OEPM & ((1 << (ep->num)) << 16));
+    USBx_DEVICE->DEACHMSK &= ~(USB_OTG_DAINTMSK_OEPM & ((uint32_t)(1UL << (ep->num & EP_ADDR_MSK)) << 16));
-    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_OEPM & ((1 << (ep->num)) << 16));
+    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_OEPM & ((uint32_t)(1UL << (ep->num & EP_ADDR_MSK)) << 16));
-    USBx_OUTEP(ep->num)->DOEPCTL &= ~USB_OTG_DOEPCTL_USBAEP;
+    USBx_OUTEP(epnum)->DOEPCTL &= ~(USB_OTG_DOEPCTL_USBAEP |
+                                    USB_OTG_DOEPCTL_MPSIZ |
+                                    USB_OTG_DOEPCTL_SD0PID_SEVNFRM |
+                                    USB_OTG_DOEPCTL_EPTYP);
+  }
+  return HAL_OK;
+}
+/**
+  * @brief  De-activate and de-initialize a dedicated endpoint
+  * @param  USBx  Selected device
+  * @param  ep pointer to endpoint structure
+  * @retval HAL status
+  */
+HAL_StatusTypeDef USB_DeactivateDedicatedEndpoint(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t epnum = (uint32_t)ep->num;
+  /* Read DEPCTLn register */
+  if (ep->is_in == 1U)
+  {
+    if ((USBx_INEP(epnum)->DIEPCTL & USB_OTG_DIEPCTL_EPENA) == USB_OTG_DIEPCTL_EPENA)
+    {
+      USBx_INEP(epnum)->DIEPCTL  |= USB_OTG_DIEPCTL_SNAK;
+      USBx_INEP(epnum)->DIEPCTL  |= USB_OTG_DIEPCTL_EPDIS;
+    }
+    USBx_INEP(epnum)->DIEPCTL &= ~ USB_OTG_DIEPCTL_USBAEP;
+    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_IEPM & (uint32_t)(1UL << (ep->num & EP_ADDR_MSK)));
+  }
+  else
+  {
+    if ((USBx_OUTEP(epnum)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == USB_OTG_DOEPCTL_EPENA)
+    {
+      USBx_OUTEP(epnum)->DOEPCTL  |= USB_OTG_DOEPCTL_SNAK;
+      USBx_OUTEP(epnum)->DOEPCTL  |= USB_OTG_DOEPCTL_EPDIS;
+    }
+    USBx_OUTEP(epnum)->DOEPCTL &= ~USB_OTG_DOEPCTL_USBAEP;
+    USBx_DEVICE->DAINTMSK &= ~(USB_OTG_DAINTMSK_OEPM & ((uint32_t)(1UL << (ep->num & EP_ADDR_MSK)) << 16));
+  }
   return HAL_OK;
+}
 /**
   * @brief  USB_EPStartXfer : setup and starts a transfer over an EP
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_EPStartXfer(USB_OTG_GlobalTypeDef *USBx , USB_OTG_EPTypeDef *ep)
+HAL_StatusTypeDef USB_EPStartXfer(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  uint16_t pktcnt = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t epnum = (uint32_t)ep->num;
-  UNUSED(USBx);
+  uint16_t pktcnt;
   /* IN endpoint */
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
     /* Zero Length Packet? */
-    if (ep->xfer_len == 0)
+    if (ep->xfer_len == 0U)
+    {
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1 << 19)) ;
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1U << 19));
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+    }
     else
+    {
       /* Program the transfer size and packet count
       * as follows: xfersize = N * maxpacket +
       * short_packet pktcnt = N + (short_packet
       * exist ? 1 : 0)
       */
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (((ep->xfer_len + ep->maxpacket -1)/ ep->maxpacket) << 19)) ;
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (((ep->xfer_len + ep->maxpacket - 1U) / ep->maxpacket) << 19));
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_XFRSIZ & ep->xfer_len);
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_XFRSIZ & ep->xfer_len);
       if (ep->type == EP_TYPE_ISOC)
+      {
-        USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_MULCNT);
+        USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_MULCNT);
-        USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_MULCNT & (1 << 29));
+        USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_MULCNT & (1U << 29));
+      }
+    }
+    /* EP enable, IN data in FIFO */
+    USBx_INEP(epnum)->DIEPCTL |= (USB_OTG_DIEPCTL_CNAK | USB_OTG_DIEPCTL_EPENA);
     if (ep->type != EP_TYPE_ISOC)
+    {
       /* Enable the Tx FIFO Empty Interrupt for this EP */
-      if (ep->xfer_len > 0)
+      if (ep->xfer_len > 0U)
+      {
-        USBx_DEVICE->DIEPEMPMSK |= 1 << ep->num;
+        USBx_DEVICE->DIEPEMPMSK |= 1UL << (ep->num & EP_ADDR_MSK);
+      }
+    }
+    else
-    if (ep->type == EP_TYPE_ISOC)
+    {
-      if ((USBx_DEVICE->DSTS & ( 1 << 8 )) == 0)
+      if ((USBx_DEVICE->DSTS & (1U << 8)) == 0U)
+      {
-        USBx_INEP(ep->num)->DIEPCTL |= USB_OTG_DIEPCTL_SODDFRM;
+        USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_SODDFRM;
+      }
       else
+      {
-        USBx_INEP(ep->num)->DIEPCTL |= USB_OTG_DIEPCTL_SD0PID_SEVNFRM;
+        USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_SD0PID_SEVNFRM;
+      }
-    }
-    /* EP enable, IN data in FIFO */
-    USBx_INEP(ep->num)->DIEPCTL |= (USB_OTG_DIEPCTL_CNAK | USB_OTG_DIEPCTL_EPENA);
-    if (ep->type == EP_TYPE_ISOC)
-    {
-      USB_WritePacket(USBx, ep->xfer_buff, ep->num, ep->xfer_len);
+      (void)USB_WritePacket(USBx, ep->xfer_buff, ep->num, (uint16_t)ep->xfer_len);
+    }
+  }
   else /* OUT endpoint */
+  {
     /* Program the transfer size and packet count as follows:
     * pktcnt = N
     * xfersize = N * maxpacket
     */
-    USBx_OUTEP(ep->num)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_XFRSIZ);
+    USBx_OUTEP(epnum)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_XFRSIZ);
-    USBx_OUTEP(ep->num)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_PKTCNT);
+    USBx_OUTEP(epnum)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_PKTCNT);
-    if (ep->xfer_len == 0)
+    if (ep->xfer_len == 0U)
+    {
-      USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_XFRSIZ & ep->maxpacket);
+      USBx_OUTEP(epnum)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_XFRSIZ & ep->maxpacket);
-      USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1 << 19));
+      USBx_OUTEP(epnum)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1U << 19));
+    }
     else
+    {
-      pktcnt = (ep->xfer_len + ep->maxpacket -1)/ ep->maxpacket;
+      pktcnt = (uint16_t)((ep->xfer_len + ep->maxpacket - 1U) / ep->maxpacket);
-      USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (pktcnt << 19));
+      USBx_OUTEP(epnum)->DOEPTSIZ |= USB_OTG_DOEPTSIZ_PKTCNT & ((uint32_t)pktcnt << 19);
-      USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_XFRSIZ & (ep->maxpacket * pktcnt));
+      USBx_OUTEP(epnum)->DOEPTSIZ |= USB_OTG_DOEPTSIZ_XFRSIZ & (ep->maxpacket * pktcnt);
+    }
     if (ep->type == EP_TYPE_ISOC)
+    {
-      if ((USBx_DEVICE->DSTS & ( 1 << 8 )) == 0)
+      if ((USBx_DEVICE->DSTS & (1U << 8)) == 0U)
+      {
-        USBx_OUTEP(ep->num)->DOEPCTL |= USB_OTG_DOEPCTL_SODDFRM;
+        USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_SODDFRM;
+      }
       else
+      {
-        USBx_OUTEP(ep->num)->DOEPCTL |= USB_OTG_DOEPCTL_SD0PID_SEVNFRM;
+        USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_SD0PID_SEVNFRM;
+      }
+    }
     /* EP enable */
-    USBx_OUTEP(ep->num)->DOEPCTL |= (USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+    USBx_OUTEP(epnum)->DOEPCTL |= (USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+  }
   return HAL_OK;
+}
 /**
   * @brief  USB_EP0StartXfer : setup and starts a transfer over the EP  0
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_EP0StartXfer(USB_OTG_GlobalTypeDef *USBx , USB_OTG_EPTypeDef *ep)
+HAL_StatusTypeDef USB_EP0StartXfer(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t epnum = (uint32_t)ep->num;
   /* IN endpoint */
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
     /* Zero Length Packet? */
-    if (ep->xfer_len == 0)
+    if (ep->xfer_len == 0U)
+    {
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1 << 19));
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1U << 19));
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+    }
     else
+    {
       /* Program the transfer size and packet count
       * as follows: xfersize = N * maxpacket +
       * short_packet pktcnt = N + (short_packet
       * exist ? 1 : 0)
       */
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_XFRSIZ);
-      USBx_INEP(ep->num)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
+      USBx_INEP(epnum)->DIEPTSIZ &= ~(USB_OTG_DIEPTSIZ_PKTCNT);
-      if(ep->xfer_len > ep->maxpacket)
+      if (ep->xfer_len > ep->maxpacket)
+      {
         ep->xfer_len = ep->maxpacket;
+      }
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1 << 19));
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_PKTCNT & (1U << 19));
-      USBx_INEP(ep->num)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_XFRSIZ & ep->xfer_len);
+      USBx_INEP(epnum)->DIEPTSIZ |= (USB_OTG_DIEPTSIZ_XFRSIZ & ep->xfer_len);
+    }
+    /* EP enable, IN data in FIFO */
+    USBx_INEP(epnum)->DIEPCTL |= (USB_OTG_DIEPCTL_CNAK | USB_OTG_DIEPCTL_EPENA);
     /* Enable the Tx FIFO Empty Interrupt for this EP */
-    if (ep->xfer_len > 0)
+    if (ep->xfer_len > 0U)
+    {
-      USBx_DEVICE->DIEPEMPMSK |= 1 << (ep->num);
+      USBx_DEVICE->DIEPEMPMSK |= 1UL << (ep->num & EP_ADDR_MSK);
+    }
-    /* EP enable, IN data in FIFO */
-    USBx_INEP(ep->num)->DIEPCTL |= (USB_OTG_DIEPCTL_CNAK | USB_OTG_DIEPCTL_EPENA);
+  }
   else /* OUT endpoint */
+  {
     /* Program the transfer size and packet count as follows:
     * pktcnt = N
     * xfersize = N * maxpacket
     */
-    USBx_OUTEP(ep->num)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_XFRSIZ);
+    USBx_OUTEP(epnum)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_XFRSIZ);
-    USBx_OUTEP(ep->num)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_PKTCNT);
+    USBx_OUTEP(epnum)->DOEPTSIZ &= ~(USB_OTG_DOEPTSIZ_PKTCNT);
-    if (ep->xfer_len > 0)
+    if (ep->xfer_len > 0U)
+    {
       ep->xfer_len = ep->maxpacket;
+    }
-    USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1 << 19));
+    USBx_OUTEP(epnum)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1U << 19));
-    USBx_OUTEP(ep->num)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_XFRSIZ & (ep->maxpacket));
+    USBx_OUTEP(epnum)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_XFRSIZ & (ep->maxpacket));
     /* EP enable */
-    USBx_OUTEP(ep->num)->DOEPCTL |= (USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+    USBx_OUTEP(epnum)->DOEPCTL |= (USB_OTG_DOEPCTL_CNAK | USB_OTG_DOEPCTL_EPENA);
+  }
   return HAL_OK;
+}
 /**
   * @brief  USB_WritePacket : Writes a packet into the Tx FIFO associated
   *         with the EP/channel
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  src :  pointer to source buffer
+  * @param  src   pointer to source buffer
-  * @param  ch_ep_num : endpoint or host channel number
+  * @param  ch_ep_num  endpoint or host channel number
-  * @param  len : Number of bytes to write
+  * @param  len  Number of bytes to write
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_WritePacket(USB_OTG_GlobalTypeDef *USBx, uint8_t *src, uint8_t ch_ep_num, uint16_t len)
+HAL_StatusTypeDef USB_WritePacket(USB_OTG_GlobalTypeDef *USBx, uint8_t *src,
+                                  uint8_t ch_ep_num, uint16_t len)
+{
-  uint32_t count32b = 0 , index = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t *pSrc = (uint32_t *)src;
-  UNUSED(USBx);
+  uint32_t count32b, i;
-  count32b =  (len + 3) / 4;
+  count32b = ((uint32_t)len + 3U) / 4U;
-  for (index = 0; index < count32b; index++, src += 4)
+  for (i = 0U; i < count32b; i++)
+  {
-    USBx_DFIFO(ch_ep_num) = *((__packed uint32_t *)src);
+    USBx_DFIFO((uint32_t)ch_ep_num) = __UNALIGNED_UINT32_READ(pSrc);
+    pSrc++;
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_ReadPacket : read a packet from the Tx FIFO associated
+  * @brief  USB_ReadPacket : read a packet from the RX FIFO
-  *         with the EP/channel
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  dest : destination pointer
+  * @param  dest  source pointer
-  * @param  len : Number of bytes to read
+  * @param  len  Number of bytes to read
   * @retval pointer to destination buffer
   */
 void *USB_ReadPacket(USB_OTG_GlobalTypeDef *USBx, uint8_t *dest, uint16_t len)
+{
-  uint32_t index = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  uint32_t count32b = (len + 3) / 4;
+  uint32_t *pDest = (uint32_t *)dest;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
+  uint32_t i;
+  uint32_t count32b = ((uint32_t)len + 3U) / 4U;
-  for ( index = 0; index < count32b; index++, dest += 4 )
+  for (i = 0U; i < count32b; i++)
+  {
-    *(__packed uint32_t *)dest = USBx_DFIFO(0);
+    __UNALIGNED_UINT32_WRITE(pDest, USBx_DFIFO(0U));
+    pDest++;
+  }
-  return ((void *)dest);
+  return ((void *)pDest);
+}
 /**
   * @brief  USB_EPSetStall : set a stall condition over an EP
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_EPSetStall(USB_OTG_GlobalTypeDef *USBx , USB_OTG_EPTypeDef *ep)
+HAL_StatusTypeDef USB_EPSetStall(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t epnum = (uint32_t)ep->num;
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
-    if (((USBx_INEP(ep->num)->DIEPCTL) & USB_OTG_DIEPCTL_EPENA) == 0)
+    if (((USBx_INEP(epnum)->DIEPCTL & USB_OTG_DIEPCTL_EPENA) == 0U) && (epnum != 0U))
+    {
-      USBx_INEP(ep->num)->DIEPCTL &= ~(USB_OTG_DIEPCTL_EPDIS);
+      USBx_INEP(epnum)->DIEPCTL &= ~(USB_OTG_DIEPCTL_EPDIS);
     }
-    USBx_INEP(ep->num)->DIEPCTL |= USB_OTG_DIEPCTL_STALL;
+    USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_STALL;
+  }
   else
+  {
-    if (((USBx_OUTEP(ep->num)->DOEPCTL) & USB_OTG_DOEPCTL_EPENA) == 0)
+    if (((USBx_OUTEP(epnum)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == 0U) && (epnum != 0U))
+    {
-      USBx_OUTEP(ep->num)->DOEPCTL &= ~(USB_OTG_DOEPCTL_EPDIS);
+      USBx_OUTEP(epnum)->DOEPCTL &= ~(USB_OTG_DOEPCTL_EPDIS);
     }
-    USBx_OUTEP(ep->num)->DOEPCTL |= USB_OTG_DOEPCTL_STALL;
+    USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_STALL;
+  }
   return HAL_OK;
+}
 /**
   * @brief  USB_EPClearStall : Clear a stall condition over an EP
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EPClearStall(USB_OTG_GlobalTypeDef *USBx, USB_OTG_EPTypeDef *ep)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t epnum = (uint32_t)ep->num;
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
-    USBx_INEP(ep->num)->DIEPCTL &= ~USB_OTG_DIEPCTL_STALL;
+    USBx_INEP(epnum)->DIEPCTL &= ~USB_OTG_DIEPCTL_STALL;
-    if (ep->type == EP_TYPE_INTR || ep->type == EP_TYPE_BULK)
+    if ((ep->type == EP_TYPE_INTR) || (ep->type == EP_TYPE_BULK))
+    {
-       USBx_INEP(ep->num)->DIEPCTL |= USB_OTG_DIEPCTL_SD0PID_SEVNFRM; /* DATA0 */
+      USBx_INEP(epnum)->DIEPCTL |= USB_OTG_DIEPCTL_SD0PID_SEVNFRM; /* DATA0 */
+    }
+  }
   else
+  {
-    USBx_OUTEP(ep->num)->DOEPCTL &= ~USB_OTG_DOEPCTL_STALL;
+    USBx_OUTEP(epnum)->DOEPCTL &= ~USB_OTG_DOEPCTL_STALL;
-    if (ep->type == EP_TYPE_INTR || ep->type == EP_TYPE_BULK)
+    if ((ep->type == EP_TYPE_INTR) || (ep->type == EP_TYPE_BULK))
+    {
-      USBx_OUTEP(ep->num)->DOEPCTL |= USB_OTG_DOEPCTL_SD0PID_SEVNFRM; /* DATA0 */
+      USBx_OUTEP(epnum)->DOEPCTL |= USB_OTG_DOEPCTL_SD0PID_SEVNFRM; /* DATA0 */
+    }
+  }
   return HAL_OK;
+}
 /**
   * @brief  USB_StopDevice : Stop the usb device mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_StopDevice(USB_OTG_GlobalTypeDef *USBx)
+{
+  HAL_StatusTypeDef ret;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  uint32_t index = 0;
+  uint32_t i;
   /* Clear Pending interrupt */
-  for (index = 0; index < 15 ; index++)
+  for (i = 0U; i < 15U; i++)
+  {
-    USBx_INEP(index)->DIEPINT  = 0xFF;
+    USBx_INEP(i)->DIEPINT = 0xFB7FU;
-    USBx_OUTEP(index)->DOEPINT  = 0xFF;
+    USBx_OUTEP(i)->DOEPINT = 0xFB7FU;
+  }
-  USBx_DEVICE->DAINT = 0xFFFFFFFF;
   /* Clear interrupt masks */
-  USBx_DEVICE->DIEPMSK  = 0;
+  USBx_DEVICE->DIEPMSK  = 0U;
-  USBx_DEVICE->DOEPMSK  = 0;
+  USBx_DEVICE->DOEPMSK  = 0U;
-  USBx_DEVICE->DAINTMSK = 0;
+  USBx_DEVICE->DAINTMSK = 0U;
   /* Flush the FIFO */
-  USB_FlushRxFifo(USBx);
+  ret = USB_FlushRxFifo(USBx);
+  if (ret != HAL_OK)
+  {
+    return ret;
+  }
-  USB_FlushTxFifo(USBx ,  0x10 );
+  ret = USB_FlushTxFifo(USBx,  0x10U);
+  if (ret != HAL_OK)
+  {
+    return ret;
+  }
-  return HAL_OK;
+  return ret;
+}
 /**
   * @brief  USB_SetDevAddress : Stop the usb device mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  address : new device address to be assigned
+  * @param  address  new device address to be assigned
   *          This parameter can be a value from 0 to 255
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_SetDevAddress (USB_OTG_GlobalTypeDef *USBx, uint8_t address)
+HAL_StatusTypeDef  USB_SetDevAddress(USB_OTG_GlobalTypeDef *USBx, uint8_t address)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
-  UNUSED(address);
-  USBx_DEVICE->DCFG &= ~ (USB_OTG_DCFG_DAD);
+  USBx_DEVICE->DCFG &= ~(USB_OTG_DCFG_DAD);
-  USBx_DEVICE->DCFG |= (address << 4) & USB_OTG_DCFG_DAD;
+  USBx_DEVICE->DCFG |= ((uint32_t)address << 4) & USB_OTG_DCFG_DAD;
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevConnect : Connect the USB device by enabling the pull-up/pull-down
+  * @brief  USB_DevConnect : Connect the USB device by enabling Rpu
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_DevConnect (USB_OTG_GlobalTypeDef *USBx)
+HAL_StatusTypeDef  USB_DevConnect(USB_OTG_GlobalTypeDef *USBx)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  /* In case phy is stopped, ensure to ungate and restore the phy CLK */
+  USBx_PCGCCTL &= ~(USB_OTG_PCGCCTL_STOPCLK | USB_OTG_PCGCCTL_GATECLK);
-  UNUSED(USBx);
+  USBx_DEVICE->DCTL &= ~USB_OTG_DCTL_SDIS;
-  USBx_DEVICE->DCTL &= ~USB_OTG_DCTL_SDIS ;
-  HAL_Delay(3);
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevDisconnect : Disconnect the USB device by disabling the pull-up/pull-down
+  * @brief  USB_DevDisconnect : Disconnect the USB device by disabling Rpu
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_DevDisconnect (USB_OTG_GlobalTypeDef *USBx)
+HAL_StatusTypeDef  USB_DevDisconnect(USB_OTG_GlobalTypeDef *USBx)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  /* In case phy is stopped, ensure to ungate and restore the phy CLK */
-  UNUSED(USBx);
+  USBx_PCGCCTL &= ~(USB_OTG_PCGCCTL_STOPCLK | USB_OTG_PCGCCTL_GATECLK);
   USBx_DEVICE->DCTL |= USB_OTG_DCTL_SDIS;
-  HAL_Delay(3);
   return HAL_OK;
+}
 /**
   * @brief  USB_ReadInterrupts: return the global USB interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-uint32_t  USB_ReadInterrupts (USB_OTG_GlobalTypeDef *USBx)
+uint32_t  USB_ReadInterrupts(USB_OTG_GlobalTypeDef *USBx)
+{
-  uint32_t tmpreg = 0;
+  uint32_t tmpreg;
   tmpreg = USBx->GINTSTS;
   tmpreg &= USBx->GINTMSK;
   return tmpreg;
+}
 /**
   * @brief  USB_ReadDevAllOutEpInterrupt: return the USB device OUT endpoints interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-uint32_t USB_ReadDevAllOutEpInterrupt (USB_OTG_GlobalTypeDef *USBx)
+uint32_t USB_ReadDevAllOutEpInterrupt(USB_OTG_GlobalTypeDef *USBx)
+{
-  uint32_t tmpreg = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
+  uint32_t tmpreg;
   tmpreg  = USBx_DEVICE->DAINT;
   tmpreg &= USBx_DEVICE->DAINTMSK;
-  return ((tmpreg & 0xffff0000) >> 16);
+  return ((tmpreg & 0xffff0000U) >> 16);
+}
 /**
   * @brief  USB_ReadDevAllInEpInterrupt: return the USB device IN endpoints interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-uint32_t USB_ReadDevAllInEpInterrupt (USB_OTG_GlobalTypeDef *USBx)
+uint32_t USB_ReadDevAllInEpInterrupt(USB_OTG_GlobalTypeDef *USBx)
+{
-  uint32_t tmpreg = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
+  uint32_t tmpreg;
   tmpreg  = USBx_DEVICE->DAINT;
   tmpreg &= USBx_DEVICE->DAINTMSK;
-  return ((tmpreg & 0xFFFF));
+  return ((tmpreg & 0xFFFFU));
+}
 /**
   * @brief  Returns Device OUT EP Interrupt register
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  epnum : endpoint number
+  * @param  epnum  endpoint number
   *          This parameter can be a value from 0 to 15
   * @retval Device OUT EP Interrupt register
   */
-uint32_t USB_ReadDevOutEPInterrupt (USB_OTG_GlobalTypeDef *USBx , uint8_t epnum)
+uint32_t USB_ReadDevOutEPInterrupt(USB_OTG_GlobalTypeDef *USBx, uint8_t epnum)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
+  uint32_t tmpreg;
-  uint32_t tmpreg = 0;
-  tmpreg  = USBx_OUTEP(epnum)->DOEPINT;
+  tmpreg  = USBx_OUTEP((uint32_t)epnum)->DOEPINT;
   tmpreg &= USBx_DEVICE->DOEPMSK;
   return tmpreg;
+}
 /**
   * @brief  Returns Device IN EP Interrupt register
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  epnum : endpoint number
+  * @param  epnum  endpoint number
   *          This parameter can be a value from 0 to 15
   * @retval Device IN EP Interrupt register
   */
-uint32_t USB_ReadDevInEPInterrupt (USB_OTG_GlobalTypeDef *USBx , uint8_t epnum)
+uint32_t USB_ReadDevInEPInterrupt(USB_OTG_GlobalTypeDef *USBx, uint8_t epnum)
+{
-  uint32_t tmpreg = 0, msk = 0, emp = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t tmpreg, msk, emp;
-  UNUSED(USBx);
   msk = USBx_DEVICE->DIEPMSK;
   emp = USBx_DEVICE->DIEPEMPMSK;
-  msk |= ((emp >> epnum) & 0x1) << 7;
+  msk |= ((emp >> (epnum & EP_ADDR_MSK)) & 0x1U) << 7;
-  tmpreg = USBx_INEP(epnum)->DIEPINT & msk;
+  tmpreg = USBx_INEP((uint32_t)epnum)->DIEPINT & msk;
   return tmpreg;
+}
 /**
   * @brief  USB_ClearInterrupts: clear a USB interrupt
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  interrupt : interrupt flag
+  * @param  interrupt  flag
   * @retval None
   */
-void  USB_ClearInterrupts (USB_OTG_GlobalTypeDef *USBx, uint32_t interrupt)
+void  USB_ClearInterrupts(USB_OTG_GlobalTypeDef *USBx, uint32_t interrupt)
+{
   USBx->GINTSTS |= interrupt;
+}
 /**
   * @brief  Returns USB core mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval return core mode : Host or Device
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
   *           0 : Host
   *           1 : Device
   */
 uint32_t USB_GetMode(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
-  return ((USBx->GINTSTS ) & 0x1);
+  return ((USBx->GINTSTS) & 0x1U);
+}
 /**
   * @brief  Activate EP0 for Setup transactions
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_ActivateSetup (USB_OTG_GlobalTypeDef *USBx)
+HAL_StatusTypeDef  USB_ActivateSetup(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
-  /* Set the MPS of the IN EP based on the enumeration speed */
+  /* Set the MPS of the IN EP0 to 64 bytes */
-  USBx_INEP(0)->DIEPCTL &= ~USB_OTG_DIEPCTL_MPSIZ;
+  USBx_INEP(0U)->DIEPCTL &= ~USB_OTG_DIEPCTL_MPSIZ;
-  if((USBx_DEVICE->DSTS & USB_OTG_DSTS_ENUMSPD) == DSTS_ENUMSPD_LS_PHY_6MHZ)
-  {
-    USBx_INEP(0)->DIEPCTL |= 3;
-  }
   USBx_DEVICE->DCTL |= USB_OTG_DCTL_CGINAK;
   return HAL_OK;
+}
 /**
   * @brief  Prepare the EP0 to start the first control setup
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  psetup : pointer to setup packet
+  * @param  psetup  pointer to setup packet
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EP0_OutStart(USB_OTG_GlobalTypeDef *USBx, uint8_t *psetup)
+{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
   UNUSED(psetup);
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t gSNPSiD = *(__IO uint32_t *)(&USBx->CID + 0x1U);
+  if (gSNPSiD > USB_OTG_CORE_ID_300A)
+  {
+    if ((USBx_OUTEP(0U)->DOEPCTL & USB_OTG_DOEPCTL_EPENA) == USB_OTG_DOEPCTL_EPENA)
+    {
+      return HAL_OK;
+    }
+  }
-  USBx_OUTEP(0)->DOEPTSIZ = 0;
+  USBx_OUTEP(0U)->DOEPTSIZ = 0U;
-  USBx_OUTEP(0)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1 << 19));
+  USBx_OUTEP(0U)->DOEPTSIZ |= (USB_OTG_DOEPTSIZ_PKTCNT & (1U << 19));
-  USBx_OUTEP(0)->DOEPTSIZ |= (3 * 8);
+  USBx_OUTEP(0U)->DOEPTSIZ |= (3U * 8U);
-  USBx_OUTEP(0)->DOEPTSIZ |=  USB_OTG_DOEPTSIZ_STUPCNT;
+  USBx_OUTEP(0U)->DOEPTSIZ |=  USB_OTG_DOEPTSIZ_STUPCNT;
   return HAL_OK;
+}
 /**
-  * @brief  USB_HostInit : Initializes the USB OTG controller registers
+  * @brief  Reset the USB Core (needed after USB clock settings change)
-  *         for Host mode
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  cfg  : pointer to a USB_OTG_CfgTypeDef structure that contains
-  *         the configuration information for the specified USBx peripheral.
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_HostInit (USB_OTG_GlobalTypeDef *USBx, USB_OTG_CfgTypeDef cfg)
+static HAL_StatusTypeDef USB_CoreReset(USB_OTG_GlobalTypeDef *USBx)
+{
-  uint32_t index = 0;
+  uint32_t count = 0U;
-  /* Restart the Phy Clock */
+  /* Wait for AHB master IDLE state. */
-  USBx_PCGCCTL = 0;
-  /* no VBUS sensing*/
-  USBx->GCCFG &=~ (USB_OTG_GCCFG_VBUSASEN);
-  USBx->GCCFG &=~ (USB_OTG_GCCFG_VBUSBSEN);
+  do
-  /* Disable the FS/LS support mode only */
-  if((cfg.speed == USB_OTG_SPEED_FULL)&&
-     (USBx != USB_OTG_FS))
+  {
+    if (++count > 200000U)
+    {
-    USBx_HOST->HCFG |= USB_OTG_HCFG_FSLSS;
+      return HAL_TIMEOUT;
-  }
+    }
+  } while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_AHBIDL) == 0U);
+  /* Core Soft Reset */
+  count = 0U;
+  USBx->GRSTCTL |= USB_OTG_GRSTCTL_CSRST;
-  else
+  do
+  {
+    if (++count > 200000U)
+    {
+      return HAL_TIMEOUT;
+    }
-    USBx_HOST->HCFG &= ~(USB_OTG_HCFG_FSLSS);
+  } while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_CSRST) == USB_OTG_GRSTCTL_CSRST);
+  return HAL_OK;
-  }
+}
+/**
+  * @brief  USB_HostInit : Initializes the USB OTG controller registers
+  *         for Host mode
+  * @param  USBx  Selected device
+  * @param  cfg   pointer to a USB_OTG_CfgTypeDef structure that contains
+  *         the configuration information for the specified USBx peripheral.
+  * @retval HAL status
+  */
+HAL_StatusTypeDef USB_HostInit(USB_OTG_GlobalTypeDef *USBx, USB_OTG_CfgTypeDef cfg)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t i;
+  /* Restart the Phy Clock */
+  USBx_PCGCCTL = 0U;
+  /* Disable VBUS sensing */
+  USBx->GCCFG &= ~(USB_OTG_GCCFG_VBUSASEN);
+  USBx->GCCFG &= ~(USB_OTG_GCCFG_VBUSBSEN);
+  /* Set default Max speed support */
+  USBx_HOST->HCFG &= ~(USB_OTG_HCFG_FSLSS);
   /* Make sure the FIFOs are flushed. */
-  USB_FlushTxFifo(USBx, 0x10 ); /* all Tx FIFOs */
+  (void)USB_FlushTxFifo(USBx, 0x10U); /* all Tx FIFOs */
-  USB_FlushRxFifo(USBx);
+  (void)USB_FlushRxFifo(USBx);
   /* Clear all pending HC Interrupts */
-  for (index = 0; index < cfg.Host_channels; index++)
+  for (i = 0U; i < cfg.Host_channels; i++)
+  {
-    USBx_HC(index)->HCINT = 0xFFFFFFFF;
+    USBx_HC(i)->HCINT = 0xFFFFFFFFU;
-    USBx_HC(index)->HCINTMSK = 0;
+    USBx_HC(i)->HCINTMSK = 0U;
+  }
   /* Enable VBUS driving */
-  USB_DriveVbus(USBx, 1);
+  (void)USB_DriveVbus(USBx, 1U);
-  HAL_Delay(200);
+  HAL_Delay(200U);
   /* Disable all interrupts. */
-  USBx->GINTMSK = 0;
+  USBx->GINTMSK = 0U;
   /* Clear any pending interrupts */
-  USBx->GINTSTS = 0xFFFFFFFF;
+  USBx->GINTSTS = 0xFFFFFFFFU;
-  if(USBx == USB_OTG_FS)
-  {
-    /* set Rx FIFO size */
+  /* set Rx FIFO size */
-    USBx->GRXFSIZ  = (uint32_t )0x80;
+  USBx->GRXFSIZ  = 0x80U;
-    USBx->DIEPTXF0_HNPTXFSIZ = (uint32_t )(((0x60 << 16)& USB_OTG_NPTXFD) | 0x80);
+  USBx->DIEPTXF0_HNPTXFSIZ = (uint32_t)(((0x60U << 16) & USB_OTG_NPTXFD) | 0x80U);
-    USBx->HPTXFSIZ = (uint32_t )(((0x40 << 16)& USB_OTG_HPTXFSIZ_PTXFD) | 0xE0);
+  USBx->HPTXFSIZ = (uint32_t)(((0x40U << 16)& USB_OTG_HPTXFSIZ_PTXFD) | 0xE0U);
-  }
   /* Enable the common interrupts */
   USBx->GINTMSK |= USB_OTG_GINTMSK_RXFLVLM;
   /* Enable interrupts matching to the Host mode ONLY */
-  USBx->GINTMSK |= (USB_OTG_GINTMSK_PRTIM            | USB_OTG_GINTMSK_HCIM |\
+  USBx->GINTMSK |= (USB_OTG_GINTMSK_PRTIM            | USB_OTG_GINTMSK_HCIM | \
-                    USB_OTG_GINTMSK_SOFM             |USB_OTG_GINTSTS_DISCINT|\
+                    USB_OTG_GINTMSK_SOFM             | USB_OTG_GINTSTS_DISCINT | \
                     USB_OTG_GINTMSK_PXFRM_IISOOXFRM  | USB_OTG_GINTMSK_WUIM);
   return HAL_OK;
+}
 /**
   * @brief  USB_InitFSLSPClkSel : Initializes the FSLSPClkSel field of the
   *         HCFG register on the PHY type and set the right frame interval
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  freq : clock frequency
+  * @param  freq  clock frequency
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
   *           HCFG_48_MHZ : Full Speed 48 MHz Clock
   *           HCFG_6_MHZ : Low Speed 6 MHz Clock
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_InitFSLSPClkSel(USB_OTG_GlobalTypeDef *USBx , uint8_t freq)
+HAL_StatusTypeDef USB_InitFSLSPClkSel(USB_OTG_GlobalTypeDef *USBx, uint8_t freq)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
   USBx_HOST->HCFG &= ~(USB_OTG_HCFG_FSLSPCS);
-  USBx_HOST->HCFG |= (freq & USB_OTG_HCFG_FSLSPCS);
+  USBx_HOST->HCFG |= (uint32_t)freq & USB_OTG_HCFG_FSLSPCS;
+  if (freq == HCFG_48_MHZ)
+  {
+    USBx_HOST->HFIR = 48000U;
+  }
-  if (freq ==  HCFG_48_MHZ)
+  else if (freq == HCFG_6_MHZ)
+  {
-    USBx_HOST->HFIR = (uint32_t)48000;
+    USBx_HOST->HFIR = 6000U;
+  }
-  else if (freq ==  HCFG_6_MHZ)
+  else
+  {
-    USBx_HOST->HFIR = (uint32_t)6000;
+    /* ... */
+  }
   return HAL_OK;
+}
 /**
-* @brief  USB_OTG_ResetPort : Reset Host Port
+  * @brief  USB_OTG_ResetPort : Reset Host Port
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL status
-  * @note : (1)The application must wait at least 10 ms
+  * @note (1)The application must wait at least 10 ms
   *   before clearing the reset bit.
   */
 HAL_StatusTypeDef USB_ResetPort(USB_OTG_GlobalTypeDef *USBx)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  __IO uint32_t hprt0 = 0;
+  __IO uint32_t hprt0 = 0U;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
   hprt0 = USBx_HPRT0;
-  hprt0 &= ~(USB_OTG_HPRT_PENA    | USB_OTG_HPRT_PCDET |\
+  hprt0 &= ~(USB_OTG_HPRT_PENA | USB_OTG_HPRT_PCDET |
-    USB_OTG_HPRT_PENCHNG | USB_OTG_HPRT_POCCHNG );
+             USB_OTG_HPRT_PENCHNG | USB_OTG_HPRT_POCCHNG);
   USBx_HPRT0 = (USB_OTG_HPRT_PRST | hprt0);
-  HAL_Delay (10);                                /* See Note #1 */
+  HAL_Delay(100U);                                 /* See Note #1 */
   USBx_HPRT0 = ((~USB_OTG_HPRT_PRST) & hprt0);
+  HAL_Delay(10U);
   return HAL_OK;
+}
 /**
   * @brief  USB_DriveVbus : activate or de-activate vbus
-  * @param  state : VBUS state
+  * @param  state  VBUS state
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
-  *           0 : VBUS Active
+  *           0 : Deactivate VBUS
-  *           1 : VBUS Inactive
+  *           1 : Activate VBUS
   * @retval HAL status
-*/
+  */
-HAL_StatusTypeDef USB_DriveVbus (USB_OTG_GlobalTypeDef *USBx, uint8_t state)
+HAL_StatusTypeDef USB_DriveVbus(USB_OTG_GlobalTypeDef *USBx, uint8_t state)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  __IO uint32_t hprt0 = 0;
+  __IO uint32_t hprt0 = 0U;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
   hprt0 = USBx_HPRT0;
-  hprt0 &= ~(USB_OTG_HPRT_PENA    | USB_OTG_HPRT_PCDET |\
+  hprt0 &= ~(USB_OTG_HPRT_PENA | USB_OTG_HPRT_PCDET |
-          USB_OTG_HPRT_PENCHNG | USB_OTG_HPRT_POCCHNG );
+             USB_OTG_HPRT_PENCHNG | USB_OTG_HPRT_POCCHNG);
-  if (((hprt0 & USB_OTG_HPRT_PPWR) == 0 ) && (state == 1 ))
+  if (((hprt0 & USB_OTG_HPRT_PPWR) == 0U) && (state == 1U))
+  {
     USBx_HPRT0 = (USB_OTG_HPRT_PPWR | hprt0);
+  }
-  if (((hprt0 & USB_OTG_HPRT_PPWR) == USB_OTG_HPRT_PPWR) && (state == 0 ))
+  if (((hprt0 & USB_OTG_HPRT_PPWR) == USB_OTG_HPRT_PPWR) && (state == 0U))
+  {
     USBx_HPRT0 = ((~USB_OTG_HPRT_PPWR) & hprt0);
+  }
   return HAL_OK;
+}
 /**
   * @brief  Return Host Core speed
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval speed : Host speed
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
-  *            @arg USB_OTG_SPEED_FULL: Full speed mode
+  *            @arg HCD_SPEED_FULL: Full speed mode
-  *            @arg USB_OTG_SPEED_LOW: Low speed mode
+  *            @arg HCD_SPEED_LOW: Low speed mode
   */
-uint32_t USB_GetHostSpeed (USB_OTG_GlobalTypeDef *USBx)
+uint32_t USB_GetHostSpeed(USB_OTG_GlobalTypeDef *USBx)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  __IO uint32_t hprt0 = 0;
+  __IO uint32_t hprt0 = 0U;
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
   hprt0 = USBx_HPRT0;
   return ((hprt0 & USB_OTG_HPRT_PSPD) >> 17);
+}
 /**
   * @brief  Return Host Current Frame number
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval current frame number
-*/
+  */
-uint32_t USB_GetCurrentFrame (USB_OTG_GlobalTypeDef *USBx)
+uint32_t USB_GetCurrentFrame(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
   return (USBx_HOST->HFNUM & USB_OTG_HFNUM_FRNUM);
+}
 /**
   * @brief  Initialize a host channel
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  ch_num : Channel number
+  * @param  ch_num  Channel number
   *         This parameter can be a value from 1 to 15
-  * @param  epnum : Endpoint number
+  * @param  epnum  Endpoint number
   *          This parameter can be a value from 1 to 15
-  * @param  dev_address : Current device address
+  * @param  dev_address  Current device address
   *          This parameter can be a value from 0 to 255
-  * @param  speed : Current device speed
+  * @param  speed  Current device speed
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
   *            @arg USB_OTG_SPEED_FULL: Full speed mode
   *            @arg USB_OTG_SPEED_LOW: Low speed mode
-  * @param  ep_type : Endpoint Type
+  * @param  ep_type  Endpoint Type
-  *          This parameter can be one of the these values:
+  *          This parameter can be one of these values:
   *            @arg EP_TYPE_CTRL: Control type
   *            @arg EP_TYPE_ISOC: Isochronous type
   *            @arg EP_TYPE_BULK: Bulk type
   *            @arg EP_TYPE_INTR: Interrupt type
-  * @param  mps : Max Packet Size
+  * @param  mps  Max Packet Size
   *          This parameter can be a value from 0 to32K
   * @retval HAL state
   */
-HAL_StatusTypeDef USB_HC_Init(USB_OTG_GlobalTypeDef *USBx,
+HAL_StatusTypeDef USB_HC_Init(USB_OTG_GlobalTypeDef *USBx, uint8_t ch_num,
-                              uint8_t ch_num,
-                              uint8_t epnum,
+                              uint8_t epnum, uint8_t dev_address, uint8_t speed,
-                              uint8_t dev_address,
+                              uint8_t ep_type, uint16_t mps)
+{
-                              uint8_t speed,
+  HAL_StatusTypeDef ret = HAL_OK;
-                              uint8_t ep_type,
+  uint32_t USBx_BASE = (uint32_t)USBx;
-                              uint16_t mps)
+  uint32_t HCcharEpDir, HCcharLowSpeed;
-{
   /* Clear old interrupt conditions for this host channel. */
-  USBx_HC(ch_num)->HCINT = 0xFFFFFFFF;
+  USBx_HC((uint32_t)ch_num)->HCINT = 0xFFFFFFFFU;
   /* Enable channel interrupts required for this transfer. */
   switch (ep_type)
+  {
-  case EP_TYPE_CTRL:
+    case EP_TYPE_CTRL:
-  case EP_TYPE_BULK:
+    case EP_TYPE_BULK:
-    USBx_HC(ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |\
+      USBx_HC((uint32_t)ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |
-                                USB_OTG_HCINTMSK_STALLM |\
+                                            USB_OTG_HCINTMSK_STALLM |
-                                USB_OTG_HCINTMSK_TXERRM |\
+                                            USB_OTG_HCINTMSK_TXERRM |
-                                USB_OTG_HCINTMSK_DTERRM |\
+                                            USB_OTG_HCINTMSK_DTERRM |
-                                USB_OTG_HCINTMSK_AHBERR |\
+                                            USB_OTG_HCINTMSK_AHBERR |
-                                USB_OTG_HCINTMSK_NAKM ;
+                                            USB_OTG_HCINTMSK_NAKM;
-    if (epnum & 0x80)
+      if ((epnum & 0x80U) == 0x80U)
-    {
+      {
-      USBx_HC(ch_num)->HCINTMSK |= USB_OTG_HCINTMSK_BBERRM;
+        USBx_HC((uint32_t)ch_num)->HCINTMSK |= USB_OTG_HCINTMSK_BBERRM;
-    }
+      }
-    break;
+      break;
-  case EP_TYPE_INTR:
+    case EP_TYPE_INTR:
-    USBx_HC(ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |\
+      USBx_HC((uint32_t)ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |
-                                USB_OTG_HCINTMSK_STALLM |\
+                                            USB_OTG_HCINTMSK_STALLM |
-                                USB_OTG_HCINTMSK_TXERRM |\
+                                            USB_OTG_HCINTMSK_TXERRM |
-                                USB_OTG_HCINTMSK_DTERRM |\
+                                            USB_OTG_HCINTMSK_DTERRM |
-                                USB_OTG_HCINTMSK_NAKM   |\
+                                            USB_OTG_HCINTMSK_NAKM   |
-                                USB_OTG_HCINTMSK_AHBERR |\
+                                            USB_OTG_HCINTMSK_AHBERR |
-                                USB_OTG_HCINTMSK_FRMORM ;
+                                            USB_OTG_HCINTMSK_FRMORM;
-    if (epnum & 0x80)
+      if ((epnum & 0x80U) == 0x80U)
-    {
+      {
-      USBx_HC(ch_num)->HCINTMSK |= USB_OTG_HCINTMSK_BBERRM;
+        USBx_HC((uint32_t)ch_num)->HCINTMSK |= USB_OTG_HCINTMSK_BBERRM;
-    }
+      }
-    break;
+      break;
-  case EP_TYPE_ISOC:
+    case EP_TYPE_ISOC:
-    USBx_HC(ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |\
+      USBx_HC((uint32_t)ch_num)->HCINTMSK = USB_OTG_HCINTMSK_XFRCM  |
-                                USB_OTG_HCINTMSK_ACKM   |\
+                                            USB_OTG_HCINTMSK_ACKM   |
-                                USB_OTG_HCINTMSK_AHBERR |\
+                                            USB_OTG_HCINTMSK_AHBERR |
-                                USB_OTG_HCINTMSK_FRMORM ;
+                                            USB_OTG_HCINTMSK_FRMORM;
-    if (epnum & 0x80)
+      if ((epnum & 0x80U) == 0x80U)
-    {
+      {
-      USBx_HC(ch_num)->HCINTMSK |= (USB_OTG_HCINTMSK_TXERRM | USB_OTG_HCINTMSK_BBERRM);
+        USBx_HC((uint32_t)ch_num)->HCINTMSK |= (USB_OTG_HCINTMSK_TXERRM | USB_OTG_HCINTMSK_BBERRM);
-    }
+      }
+      break;
+    default:
+      ret = HAL_ERROR;
-    break;
+      break;
+  }
   /* Enable the top level host channel interrupt. */
-  USBx_HOST->HAINTMSK |= (1 << ch_num);
+  USBx_HOST->HAINTMSK |= 1UL << (ch_num & 0xFU);
   /* Make sure host channel interrupts are enabled. */
   USBx->GINTMSK |= USB_OTG_GINTMSK_HCIM;
   /* Program the HCCHAR register */
+  if ((epnum & 0x80U) == 0x80U)
+  {
-  USBx_HC(ch_num)->HCCHAR = (((dev_address << 22) & USB_OTG_HCCHAR_DAD)  |\
+    HCcharEpDir = (0x1U << 15) & USB_OTG_HCCHAR_EPDIR;
+  }
+  else
+  {
+    HCcharEpDir = 0U;
+  }
+  if (speed == HPRT0_PRTSPD_LOW_SPEED)
+  {
-                             (((epnum & 0x7F)<< 11) & USB_OTG_HCCHAR_EPNUM)|\
+    HCcharLowSpeed = (0x1U << 17) & USB_OTG_HCCHAR_LSDEV;
+  }
+  else
+  {
+    HCcharLowSpeed = 0U;
+  }
-                             ((((epnum & 0x80) == 0x80)<< 15) & USB_OTG_HCCHAR_EPDIR)|\
+  USBx_HC((uint32_t)ch_num)->HCCHAR = (((uint32_t)dev_address << 22) & USB_OTG_HCCHAR_DAD) |
-                             (((speed == HPRT0_PRTSPD_LOW_SPEED)<< 17) & USB_OTG_HCCHAR_LSDEV)|\
+                                      ((((uint32_t)epnum & 0x7FU) << 11) & USB_OTG_HCCHAR_EPNUM) |
-                             ((ep_type << 18) & USB_OTG_HCCHAR_EPTYP)|\
+                                      (((uint32_t)ep_type << 18) & USB_OTG_HCCHAR_EPTYP) |
-                             (mps & USB_OTG_HCCHAR_MPSIZ));
+                                      ((uint32_t)mps & USB_OTG_HCCHAR_MPSIZ) | HCcharEpDir | HCcharLowSpeed;
   if (ep_type == EP_TYPE_INTR)
+  {
-    USBx_HC(ch_num)->HCCHAR |= USB_OTG_HCCHAR_ODDFRM ;
+    USBx_HC((uint32_t)ch_num)->HCCHAR |= USB_OTG_HCCHAR_ODDFRM ;
+  }
-  return HAL_OK;
+  return ret;
+}
 /**
   * @brief  Start a transfer over a host channel
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  hc : pointer to host channel structure
+  * @param  hc  pointer to host channel structure
   * @retval HAL state
   */
-#if defined   (__CC_ARM) /*!< ARM Compiler */
-#pragma O0
-#elif defined (__GNUC__) /*!< GNU Compiler */
-#pragma GCC optimize ("O0")
-#endif /* __CC_ARM */
 HAL_StatusTypeDef USB_HC_StartXfer(USB_OTG_GlobalTypeDef *USBx, USB_OTG_HCTypeDef *hc)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t ch_num = (uint32_t)hc->ch_num;
+  static __IO uint32_t tmpreg = 0U;
-  uint8_t  is_oddframe = 0;
+  uint8_t  is_oddframe;
-  uint16_t len_words = 0;
+  uint16_t len_words;
-  uint16_t num_packets = 0;
+  uint16_t num_packets;
-  uint16_t max_hc_pkt_count = 256;
+  uint16_t max_hc_pkt_count = 256U;
-  uint32_t tmpreg = 0;
   /* Compute the expected number of packets associated to the transfer */
-  if (hc->xfer_len > 0)
+  if (hc->xfer_len > 0U)
+  {
-    num_packets = (hc->xfer_len + hc->max_packet - 1) / hc->max_packet;
+    num_packets = (uint16_t)((hc->xfer_len + hc->max_packet - 1U) / hc->max_packet);
     if (num_packets > max_hc_pkt_count)
+    {
       num_packets = max_hc_pkt_count;
-      hc->xfer_len = num_packets * hc->max_packet;
+      hc->xfer_len = (uint32_t)num_packets * hc->max_packet;
+    }
+  }
   else
+  {
-    num_packets = 1;
+    num_packets = 1U;
+  }
-  if (hc->ep_is_in)
+  if (hc->ep_is_in != 0U)
+  {
-    hc->xfer_len = num_packets * hc->max_packet;
+    hc->xfer_len = (uint32_t)num_packets * hc->max_packet;
+  }
   /* Initialize the HCTSIZn register */
-  USBx_HC(hc->ch_num)->HCTSIZ = (((hc->xfer_len) & USB_OTG_HCTSIZ_XFRSIZ)) |\
+  USBx_HC(ch_num)->HCTSIZ = (hc->xfer_len & USB_OTG_HCTSIZ_XFRSIZ) |
-    ((num_packets << 19) & USB_OTG_HCTSIZ_PKTCNT) |\
+                            (((uint32_t)num_packets << 19) & USB_OTG_HCTSIZ_PKTCNT) |
-      (((hc->data_pid) << 29) & USB_OTG_HCTSIZ_DPID);
+                            (((uint32_t)hc->data_pid << 29) & USB_OTG_HCTSIZ_DPID);
-  is_oddframe = (USBx_HOST->HFNUM & 0x01) ? 0 : 1;
+  is_oddframe = (((uint32_t)USBx_HOST->HFNUM & 0x01U) != 0U) ? 0U : 1U;
-  USBx_HC(hc->ch_num)->HCCHAR &= ~USB_OTG_HCCHAR_ODDFRM;
+  USBx_HC(ch_num)->HCCHAR &= ~USB_OTG_HCCHAR_ODDFRM;
-  USBx_HC(hc->ch_num)->HCCHAR |= (is_oddframe << 29);
+  USBx_HC(ch_num)->HCCHAR |= (uint32_t)is_oddframe << 29;
   /* Set host channel enable */
-  tmpreg = USBx_HC(hc->ch_num)->HCCHAR;
+  tmpreg = USBx_HC(ch_num)->HCCHAR;
   tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
+  /* make sure to set the correct ep direction */
+  if (hc->ep_is_in != 0U)
+  {
+    tmpreg |= USB_OTG_HCCHAR_EPDIR;
+  }
+  else
+  {
+    tmpreg &= ~USB_OTG_HCCHAR_EPDIR;
+  }
   tmpreg |= USB_OTG_HCCHAR_CHENA;
-  USBx_HC(hc->ch_num)->HCCHAR = tmpreg;
+  USBx_HC(ch_num)->HCCHAR = tmpreg;
-  if((hc->ep_is_in == 0) && (hc->xfer_len > 0))
+  if ((hc->ep_is_in == 0U) && (hc->xfer_len > 0U))
+  {
-    switch(hc->ep_type)
+    switch (hc->ep_type)
+    {
       /* Non periodic transfer */
-    case EP_TYPE_CTRL:
+      case EP_TYPE_CTRL:
-    case EP_TYPE_BULK:
+      case EP_TYPE_BULK:
-      len_words = (hc->xfer_len + 3) / 4;
+        len_words = (uint16_t)((hc->xfer_len + 3U) / 4U);
-      /* check if there is enough space in FIFO space */
+        /* check if there is enough space in FIFO space */
-      if(len_words > (USBx->HNPTXSTS & 0xFFFF))
+        if (len_words > (USBx->HNPTXSTS & 0xFFFFU))
-      {
+        {
-        /* need to process data in nptxfempty interrupt */
+          /* need to process data in nptxfempty interrupt */
-        USBx->GINTMSK |= USB_OTG_GINTMSK_NPTXFEM;
+          USBx->GINTMSK |= USB_OTG_GINTMSK_NPTXFEM;
-      }
+        }
-      break;
+        break;
       /* Periodic transfer */
-    case EP_TYPE_INTR:
+      case EP_TYPE_INTR:
-    case EP_TYPE_ISOC:
+      case EP_TYPE_ISOC:
-      len_words = (hc->xfer_len + 3) / 4;
+        len_words = (uint16_t)((hc->xfer_len + 3U) / 4U);
-      /* check if there is enough space in FIFO space */
+        /* check if there is enough space in FIFO space */
-      if(len_words > (USBx_HOST->HPTXSTS & 0xFFFF)) /* split the transfer */
+        if (len_words > (USBx_HOST->HPTXSTS & 0xFFFFU)) /* split the transfer */
-      {
+        {
-        /* need to process data in ptxfempty interrupt */
+          /* need to process data in ptxfempty interrupt */
-        USBx->GINTMSK |= USB_OTG_GINTMSK_PTXFEM;
+          USBx->GINTMSK |= USB_OTG_GINTMSK_PTXFEM;
-      }
+        }
-      break;
+        break;
-    default:
+      default:
-      break;
+        break;
+    }
     /* Write packet into the Tx FIFO. */
-    USB_WritePacket(USBx, hc->xfer_buff, hc->ch_num, hc->xfer_len);
+    (void)USB_WritePacket(USBx, hc->xfer_buff, hc->ch_num, (uint16_t)hc->xfer_len);
+  }
   return HAL_OK;
+}
 /**
   * @brief Read all host channel interrupts status
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL state
   */
-uint32_t USB_HC_ReadInterrupt (USB_OTG_GlobalTypeDef *USBx)
+uint32_t USB_HC_ReadInterrupt(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
-  return ((USBx_HOST->HAINT) & 0xFFFF);
+  return ((USBx_HOST->HAINT) & 0xFFFFU);
+}
 /**
   * @brief  Halt a host channel
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  hc_num : Host Channel number
+  * @param  hc_num  Host Channel number
   *         This parameter can be a value from 1 to 15
   * @retval HAL state
   */
-HAL_StatusTypeDef USB_HC_Halt(USB_OTG_GlobalTypeDef *USBx , uint8_t hc_num)
+HAL_StatusTypeDef USB_HC_Halt(USB_OTG_GlobalTypeDef *USBx, uint8_t hc_num)
+{
-  uint32_t count = 0;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t hcnum = (uint32_t)hc_num;
-  UNUSED(USBx);
+  uint32_t count = 0U;
+  uint32_t HcEpType = (USBx_HC(hcnum)->HCCHAR & USB_OTG_HCCHAR_EPTYP) >> 18;
   /* Check for space in the request queue to issue the halt. */
-  if (((((USBx_HC(hc_num)->HCCHAR) & USB_OTG_HCCHAR_EPTYP) >> 18) == HCCHAR_CTRL) ||
-     (((((USBx_HC(hc_num)->HCCHAR) & USB_OTG_HCCHAR_EPTYP) >> 18) == HCCHAR_BULK)))
+  if ((HcEpType == HCCHAR_CTRL) || (HcEpType == HCCHAR_BULK))
+  {
-    USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHDIS;
+    USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHDIS;
-    if ((USBx->HNPTXSTS & 0xFFFF) == 0)
+    if ((USBx->HNPTXSTS & (0xFFU << 16)) == 0U)
     {
-      USBx_HC(hc_num)->HCCHAR &= ~USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR &= ~USB_OTG_HCCHAR_CHENA;
-      USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
-      USBx_HC(hc_num)->HCCHAR &= ~USB_OTG_HCCHAR_EPDIR;
+      USBx_HC(hcnum)->HCCHAR &= ~USB_OTG_HCCHAR_EPDIR;
       do
+      {
-        if (++count > 1000)
+        if (++count > 1000U)
+        {
           break;
+        }
-      }
-      while ((USBx_HC(hc_num)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+      } while ((USBx_HC(hcnum)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+    }
     else
+    {
-      USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+    }
+  }
   else
+  {
-    USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHDIS;
+    USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHDIS;
-    if ((USBx_HOST->HPTXSTS & 0xFFFF) == 0)
+    if ((USBx_HOST->HPTXSTS & (0xFFU << 16)) == 0U)
     {
-      USBx_HC(hc_num)->HCCHAR &= ~USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR &= ~USB_OTG_HCCHAR_CHENA;
-      USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
-      USBx_HC(hc_num)->HCCHAR &= ~USB_OTG_HCCHAR_EPDIR;
+      USBx_HC(hcnum)->HCCHAR &= ~USB_OTG_HCCHAR_EPDIR;
       do
+      {
-        if (++count > 1000)
+        if (++count > 1000U)
+        {
           break;
+        }
-      }
-      while ((USBx_HC(hc_num)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+      } while ((USBx_HC(hcnum)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+    }
     else
+    {
-       USBx_HC(hc_num)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+      USBx_HC(hcnum)->HCCHAR |= USB_OTG_HCCHAR_CHENA;
+    }
+  }
   return HAL_OK;
+}
 /**
   * @brief  Initiate Do Ping protocol
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
-  * @param  hc_num : Host Channel number
+  * @param  hc_num  Host Channel number
   *         This parameter can be a value from 1 to 15
   * @retval HAL state
   */
-HAL_StatusTypeDef USB_DoPing(USB_OTG_GlobalTypeDef *USBx , uint8_t ch_num)
+HAL_StatusTypeDef USB_DoPing(USB_OTG_GlobalTypeDef *USBx, uint8_t ch_num)
+{
+  uint32_t USBx_BASE = (uint32_t)USBx;
+  uint32_t chnum = (uint32_t)ch_num;
-  uint8_t  num_packets = 1;
+  uint32_t num_packets = 1U;
-  uint32_t tmpreg = 0;
+  uint32_t tmpreg;
-  /* Prevent unused argument(s) compilation warning */
+  USBx_HC(chnum)->HCTSIZ = ((num_packets << 19) & USB_OTG_HCTSIZ_PKTCNT) |
-  UNUSED(USBx);
+                           USB_OTG_HCTSIZ_DOPING;
-  USBx_HC(ch_num)->HCTSIZ = ((num_packets << 19) & USB_OTG_HCTSIZ_PKTCNT) |\
-                                USB_OTG_HCTSIZ_DOPING;
   /* Set host channel enable */
-  tmpreg = USBx_HC(ch_num)->HCCHAR;
+  tmpreg = USBx_HC(chnum)->HCCHAR;
   tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
   tmpreg |= USB_OTG_HCCHAR_CHENA;
-  USBx_HC(ch_num)->HCCHAR = tmpreg;
+  USBx_HC(chnum)->HCCHAR = tmpreg;
   return HAL_OK;
+}
 /**
   * @brief  Stop Host Core
-  * @param  USBx : Selected device
+  * @param  USBx  Selected device
   * @retval HAL state
   */
 HAL_StatusTypeDef USB_StopHost(USB_OTG_GlobalTypeDef *USBx)
+{
-  uint8_t index;
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  uint32_t count = 0;
+  uint32_t count = 0U;
-  uint32_t value = 0;
+  uint32_t value;
+  uint32_t i;
-  USB_DisableGlobalInt(USBx);
+  (void)USB_DisableGlobalInt(USBx);
-    /* Flush FIFO */
+  /* Flush FIFO */
-  USB_FlushTxFifo(USBx, 0x10);
+  (void)USB_FlushTxFifo(USBx, 0x10U);
-  USB_FlushRxFifo(USBx);
+  (void)USB_FlushRxFifo(USBx);
   /* Flush out any leftover queued requests. */
-  for (index = 0; index <= 15; index++)
+  for (i = 0U; i <= 15U; i++)
+  {
-    value = USBx_HC(index)->HCCHAR;
+    value = USBx_HC(i)->HCCHAR;
     value |=  USB_OTG_HCCHAR_CHDIS;
     value &= ~USB_OTG_HCCHAR_CHENA;
     value &= ~USB_OTG_HCCHAR_EPDIR;
-    USBx_HC(index)->HCCHAR = value;
+    USBx_HC(i)->HCCHAR = value;
+  }
   /* Halt all channels to put them into a known state. */
-  for (index = 0; index <= 15; index++)
+  for (i = 0U; i <= 15U; i++)
+  {
-    value = USBx_HC(index)->HCCHAR ;
+    value = USBx_HC(i)->HCCHAR;
     value |= USB_OTG_HCCHAR_CHDIS;
     value |= USB_OTG_HCCHAR_CHENA;
     value &= ~USB_OTG_HCCHAR_EPDIR;
-    USBx_HC(index)->HCCHAR = value;
+    USBx_HC(i)->HCCHAR = value;
     do
+    {
-      if (++count > 1000)
+      if (++count > 1000U)
+      {
         break;
+      }
-    }
-    while ((USBx_HC(index)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+    } while ((USBx_HC(i)->HCCHAR & USB_OTG_HCCHAR_CHENA) == USB_OTG_HCCHAR_CHENA);
+  }
   /* Clear any pending Host interrupts */
-  USBx_HOST->HAINT = 0xFFFFFFFF;
+  USBx_HOST->HAINT = 0xFFFFFFFFU;
-  USBx->GINTSTS = 0xFFFFFFFF;
+  USBx->GINTSTS = 0xFFFFFFFFU;
-  USB_EnableGlobalInt(USBx);
+  (void)USB_EnableGlobalInt(USBx);
   return HAL_OK;
+}
 /**
-  * @brief  USB_ActivateRemoteWakeup : active remote wakeup signalling
+  * @brief  USB_ActivateRemoteWakeup active remote wakeup signalling
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_ActivateRemoteWakeup(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
-  if((USBx_DEVICE->DSTS & USB_OTG_DSTS_SUSPSTS) == USB_OTG_DSTS_SUSPSTS)
+  if ((USBx_DEVICE->DSTS & USB_OTG_DSTS_SUSPSTS) == USB_OTG_DSTS_SUSPSTS)
+  {
     /* active Remote wakeup signalling */
     USBx_DEVICE->DCTL |= USB_OTG_DCTL_RWUSIG;
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_DeActivateRemoteWakeup : de-active remote wakeup signalling
+  * @brief  USB_DeActivateRemoteWakeup de-active remote wakeup signalling
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_DeActivateRemoteWakeup(USB_OTG_GlobalTypeDef *USBx)
+{
-  /* Prevent unused argument(s) compilation warning */
+  uint32_t USBx_BASE = (uint32_t)USBx;
-  UNUSED(USBx);
   /* active Remote wakeup signalling */
-   USBx_DEVICE->DCTL &= ~(USB_OTG_DCTL_RWUSIG);
+  USBx_DEVICE->DCTL &= ~(USB_OTG_DCTL_RWUSIG);
   return HAL_OK;
+}
+#endif /* defined (USB_OTG_FS) */
-#endif /* USB_OTG_FS */
-/*==============================================================================
-    USB Device FS peripheral available on STM32F102xx and STM32F103xx devices
-==============================================================================*/
 #if defined (USB)
 /**
   * @brief  Initializes the USB Core
-  * @param  USBx: USB Instance
+  * @param  USBx USB Instance
-  * @param  cfg : pointer to a USB_CfgTypeDef structure that contains
+  * @param  cfg pointer to a USB_CfgTypeDef structure that contains
   *         the configuration information for the specified USBx peripheral.
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_CoreInit(USB_TypeDef *USBx, USB_CfgTypeDef cfg)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(cfg);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
   * @brief  USB_EnableGlobalInt
   *         Enables the controller's Global Int in the AHB Config reg
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EnableGlobalInt(USB_TypeDef *USBx)
+{
-  uint32_t winterruptmask = 0;
+  uint32_t winterruptmask;
+  /* Clear pending interrupts */
+  USBx->ISTR = 0U;
   /* Set winterruptmask variable */
-  winterruptmask = USB_CNTR_CTRM  | USB_CNTR_WKUPM | USB_CNTR_SUSPM | USB_CNTR_ERRM \
+  winterruptmask = USB_CNTR_CTRM  | USB_CNTR_WKUPM |
+                   USB_CNTR_SUSPM | USB_CNTR_ERRM |
-     | USB_CNTR_SOFM | USB_CNTR_ESOFM | USB_CNTR_RESETM;
+                   USB_CNTR_SOFM | USB_CNTR_ESOFM |
+                   USB_CNTR_RESETM;
   /* Set interrupt mask */
-  USBx->CNTR |= winterruptmask;
+  USBx->CNTR = (uint16_t)winterruptmask;
   return HAL_OK;
+}
 /**
   * @brief  USB_DisableGlobalInt
   *         Disable the controller's Global Int in the AHB Config reg
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
-*/
+  */
 HAL_StatusTypeDef USB_DisableGlobalInt(USB_TypeDef *USBx)
+{
-  uint32_t winterruptmask = 0;
+  uint32_t winterruptmask;
   /* Set winterruptmask variable */
-  winterruptmask = USB_CNTR_CTRM  | USB_CNTR_WKUPM | USB_CNTR_SUSPM | USB_CNTR_ERRM \
+  winterruptmask = USB_CNTR_CTRM  | USB_CNTR_WKUPM |
+                   USB_CNTR_SUSPM | USB_CNTR_ERRM |
+                   USB_CNTR_SOFM | USB_CNTR_ESOFM |
-    | USB_CNTR_ESOFM | USB_CNTR_RESETM;
+                   USB_CNTR_RESETM;
   /* Clear interrupt mask */
-  USBx->CNTR &= ~winterruptmask;
+  USBx->CNTR &= (uint16_t)(~winterruptmask);
   return HAL_OK;
+}
 /**
-  * @brief  USB_SetCurrentMode : Set functional mode
+  * @brief  USB_SetCurrentMode Set functional mode
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  mode :  current core mode
+  * @param  mode current core mode
   *          This parameter can be one of the these values:
-  *            @arg USB_DEVICE_MODE: Peripheral mode mode
+  *            @arg USB_DEVICE_MODE Peripheral mode
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_SetCurrentMode(USB_TypeDef *USBx , USB_ModeTypeDef mode)
+HAL_StatusTypeDef USB_SetCurrentMode(USB_TypeDef *USBx, USB_ModeTypeDef mode)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(mode);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevInit : Initializes the USB controller registers
+  * @brief  USB_DevInit Initializes the USB controller registers
   *         for device mode
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  cfg  : pointer to a USB_CfgTypeDef structure that contains
+  * @param  cfg  pointer to a USB_CfgTypeDef structure that contains
   *         the configuration information for the specified USBx peripheral.
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_DevInit (USB_TypeDef *USBx, USB_CfgTypeDef cfg)
+HAL_StatusTypeDef USB_DevInit(USB_TypeDef *USBx, USB_CfgTypeDef cfg)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(cfg);
   /* Init Device */
-  /*CNTR_FRES = 1*/
+  /* CNTR_FRES = 1 */
-  USBx->CNTR = USB_CNTR_FRES;
+  USBx->CNTR = (uint16_t)USB_CNTR_FRES;
-  /*CNTR_FRES = 0*/
+  /* CNTR_FRES = 0 */
-  USBx->CNTR = 0;
+  USBx->CNTR = 0U;
-  /*Clear pending interrupts*/
+  /* Clear pending interrupts */
-  USBx->ISTR = 0;
+  USBx->ISTR = 0U;
   /*Set Btable Address*/
   USBx->BTABLE = BTABLE_ADDRESS;
-  /* Enable USB Device Interrupt mask */
-  USB_EnableGlobalInt(USBx);
   return HAL_OK;
+}
 /**
   * @brief  USB_FlushTxFifo : Flush a Tx FIFO
   * @param  num : FIFO number
   *         This parameter can be a value from 1 to 15
 means Flush all Tx FIFOs
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_FlushTxFifo (USB_TypeDef *USBx, uint32_t num)
+HAL_StatusTypeDef USB_FlushTxFifo(USB_TypeDef *USBx, uint32_t num)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(num);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
   * @brief  USB_FlushRxFifo : Flush Rx FIFO
   */
 HAL_StatusTypeDef USB_FlushRxFifo(USB_TypeDef *USBx)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
   * @brief  Activate and configure an endpoint
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_ActivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep)
+{
+  HAL_StatusTypeDef ret = HAL_OK;
+  uint16_t wEpRegVal;
+  wEpRegVal = PCD_GET_ENDPOINT(USBx, ep->num) & USB_EP_T_MASK;
   /* initialize Endpoint */
   switch (ep->type)
+  {
-  case EP_TYPE_CTRL:
+    case EP_TYPE_CTRL:
-    PCD_SET_EPTYPE(USBx, ep->num, USB_EP_CONTROL);
+      wEpRegVal |= USB_EP_CONTROL;
-    break;
+      break;
-  case EP_TYPE_BULK:
+    case EP_TYPE_BULK:
-    PCD_SET_EPTYPE(USBx, ep->num, USB_EP_BULK);
+      wEpRegVal |= USB_EP_BULK;
-    break;
+      break;
-  case EP_TYPE_INTR:
+    case EP_TYPE_INTR:
-    PCD_SET_EPTYPE(USBx, ep->num, USB_EP_INTERRUPT);
+      wEpRegVal |= USB_EP_INTERRUPT;
-    break;
+      break;
-  case EP_TYPE_ISOC:
+    case EP_TYPE_ISOC:
-    PCD_SET_EPTYPE(USBx, ep->num, USB_EP_ISOCHRONOUS);
+      wEpRegVal |= USB_EP_ISOCHRONOUS;
-    break;
+      break;
-  default:
+    default:
+      ret = HAL_ERROR;
       break;
   }
+  PCD_SET_ENDPOINT(USBx, ep->num, (wEpRegVal | USB_EP_CTR_RX | USB_EP_CTR_TX));
   PCD_SET_EP_ADDRESS(USBx, ep->num, ep->num);
-  if (ep->doublebuffer == 0)
+  if (ep->doublebuffer == 0U)
+  {
-    if (ep->is_in)
+    if (ep->is_in != 0U)
+    {
       /*Set the endpoint Transmit buffer address */
       PCD_SET_EP_TX_ADDRESS(USBx, ep->num, ep->pmaadress);
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
+      if (ep->type != EP_TYPE_ISOC)
+      {
-      /* Configure NAK status for the Endpoint*/
+        /* Configure NAK status for the Endpoint */
-      PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_NAK);
+        PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_NAK);
+      }
+      else
+      {
+        /* Configure TX Endpoint to disabled state */
+        PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+      }
+    }
     else
+    {
       /*Set the endpoint Receive buffer address */
       PCD_SET_EP_RX_ADDRESS(USBx, ep->num, ep->pmaadress);
       /*Set the endpoint Receive buffer counter*/
       PCD_SET_EP_RX_CNT(USBx, ep->num, ep->maxpacket);
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       /* Configure VALID status for the Endpoint*/
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID);
+    }
+  }
   /*Double Buffer*/
   else
+  {
-    /*Set the endpoint as double buffered*/
+    /* Set the endpoint as double buffered */
     PCD_SET_EP_DBUF(USBx, ep->num);
-    /*Set buffer address for double buffered mode*/
+    /* Set buffer address for double buffered mode */
-    PCD_SET_EP_DBUF_ADDR(USBx, ep->num,ep->pmaaddr0, ep->pmaaddr1);
+    PCD_SET_EP_DBUF_ADDR(USBx, ep->num, ep->pmaaddr0, ep->pmaaddr1);
-    if (ep->is_in==0)
+    if (ep->is_in == 0U)
+    {
-      /* Clear the data toggle bits for the endpoint IN/OUT*/
+      /* Clear the data toggle bits for the endpoint IN/OUT */
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
-      /* Reset value of the data toggle bits for the endpoint out*/
-      PCD_TX_DTOG(USBx, ep->num);
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID);
       PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+    }
     else
+    {
-      /* Clear the data toggle bits for the endpoint IN/OUT*/
+      /* Clear the data toggle bits for the endpoint IN/OUT */
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
-      PCD_RX_DTOG(USBx, ep->num);
+      if (ep->type != EP_TYPE_ISOC)
+      {
-      /* Configure DISABLE status for the Endpoint*/
+        /* Configure NAK status for the Endpoint */
+        PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_NAK);
+      }
+      else
+      {
+        /* Configure TX Endpoint to disabled state */
-      PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+        PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+      }
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS);
+    }
+  }
-  return HAL_OK;
+  return ret;
+}
 /**
   * @brief  De-activate and de-initialize an endpoint
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_DeactivateEndpoint(USB_TypeDef *USBx, USB_EPTypeDef *ep)
+{
-  if (ep->doublebuffer == 0)
+  if (ep->doublebuffer == 0U)
+  {
-    if (ep->is_in)
+    if (ep->is_in != 0U)
+    {
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
       /* Configure DISABLE status for the Endpoint*/
       PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+    }
     else
+    {
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       /* Configure DISABLE status for the Endpoint*/
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS);
+    }
+  }
   /*Double Buffer*/
   else
   {
-    if (ep->is_in==0)
+    if (ep->is_in == 0U)
+    {
       /* Clear the data toggle bits for the endpoint IN/OUT*/
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
       /* Reset value of the data toggle bits for the endpoint out*/
       PCD_TX_DTOG(USBx, ep->num);
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS);
       PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
+    }
     else
+    {
       /* Clear the data toggle bits for the endpoint IN/OUT*/
       PCD_CLEAR_RX_DTOG(USBx, ep->num);
       PCD_CLEAR_TX_DTOG(USBx, ep->num);
       PCD_RX_DTOG(USBx, ep->num);
       /* Configure DISABLE status for the Endpoint*/
       PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_DIS);
       PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_DIS);
+    }
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_EPStartXfer : setup and starts a transfer over an EP
+  * @brief  USB_EPStartXfer setup and starts a transfer over an EP
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx , USB_EPTypeDef *ep)
+HAL_StatusTypeDef USB_EPStartXfer(USB_TypeDef *USBx, USB_EPTypeDef *ep)
+{
+  uint32_t len;
-  uint16_t pmabuffer = 0;
+  uint16_t pmabuffer;
-  uint32_t len = ep->xfer_len;
+  uint16_t wEPVal;
   /* IN endpoint */
-  if (ep->is_in == 1)
+  if (ep->is_in == 1U)
+  {
     /*Multi packet transfer*/
     if (ep->xfer_len > ep->maxpacket)
+    {
-      len=ep->maxpacket;
+      len = ep->maxpacket;
-      ep->xfer_len-=len;
+    }
     else
     {
-      len=ep->xfer_len;
+      len = ep->xfer_len;
-      ep->xfer_len =0;
+    }
     /* configure and validate Tx endpoint */
-    if (ep->doublebuffer == 0)
+    if (ep->doublebuffer == 0U)
+    {
-      USB_WritePMA(USBx, ep->xfer_buff, ep->pmaadress, len);
+      USB_WritePMA(USBx, ep->xfer_buff, ep->pmaadress, (uint16_t)len);
       PCD_SET_EP_TX_CNT(USBx, ep->num, len);
+    }
     else
+    {
-      /* Write the data to the USB endpoint */
+      /* double buffer bulk management */
-      if (PCD_GET_ENDPOINT(USBx, ep->num)& USB_EP_DTOG_TX)
+      if (ep->type == EP_TYPE_BULK)
+      {
+        if (ep->xfer_len_db > ep->maxpacket)
+        {
+          /* enable double buffer */
+          PCD_SET_EP_DBUF(USBx, ep->num);
+          /* each Time to write in PMA xfer_len_db will */
+          ep->xfer_len_db -= len;
+          /* Fill the two first buffer in the Buffer0 & Buffer1 */
+          if ((PCD_GET_ENDPOINT(USBx, ep->num) & USB_EP_DTOG_TX) != 0U)
+          {
+            /* Set the Double buffer counter for pmabuffer1 */
+            PCD_SET_EP_DBUF1_CNT(USBx, ep->num, ep->is_in, len);
+            pmabuffer = ep->pmaaddr1;
+            /* Write the user buffer to USB PMA */
+            USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
+            ep->xfer_buff += len;
+            if (ep->xfer_len_db > ep->maxpacket)
+            {
+              ep->xfer_len_db -= len;
+            }
+            else
+            {
+              len = ep->xfer_len_db;
+              ep->xfer_len_db = 0U;
+            }
+            /* Set the Double buffer counter for pmabuffer0 */
+            PCD_SET_EP_DBUF0_CNT(USBx, ep->num, ep->is_in, len);
+            pmabuffer = ep->pmaaddr0;
+            /* Write the user buffer to USB PMA */
+            USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
+          }
+          else
+          {
+            /* Set the Double buffer counter for pmabuffer0 */
+            PCD_SET_EP_DBUF0_CNT(USBx, ep->num, ep->is_in, len);
+            pmabuffer = ep->pmaaddr0;
+            /* Write the user buffer to USB PMA */
+            USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
+            ep->xfer_buff += len;
+            if (ep->xfer_len_db > ep->maxpacket)
+            {
+              ep->xfer_len_db -= len;
+            }
+            else
+            {
+              len = ep->xfer_len_db;
+              ep->xfer_len_db = 0U;
+            }
-        /* Set the Double buffer counter for pmabuffer1 */
+            /* Set the Double buffer counter for pmabuffer1 */
-        PCD_SET_EP_DBUF1_CNT(USBx, ep->num, ep->is_in, len);
+            PCD_SET_EP_DBUF1_CNT(USBx, ep->num, ep->is_in, len);
+            pmabuffer = ep->pmaaddr1;
+            /* Write the user buffer to USB PMA */
+            USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
+          }
+        }
+        /* auto Switch to single buffer mode when transfer <Mps no need to manage in double buffer */
+        else
+        {
+          len = ep->xfer_len_db;
+          /* disable double buffer mode */
+          PCD_CLEAR_EP_DBUF(USBx, ep->num);
+          /* Set Tx count with nbre of byte to be transmitted */
+          PCD_SET_EP_TX_CNT(USBx, ep->num, len);
-        pmabuffer = ep->pmaaddr1;
+          pmabuffer = ep->pmaaddr0;
+          /* Write the user buffer to USB PMA */
+          USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
-      }
+        }
+      }/* end if bulk double buffer */
+      /* manage isochronous double buffer IN mode */
       else
+      {
+        /* Write the data to the USB endpoint */
+        if ((PCD_GET_ENDPOINT(USBx, ep->num) & USB_EP_DTOG_TX) != 0U)
+        {
+          /* Set the Double buffer counter for pmabuffer1 */
+          PCD_SET_EP_DBUF1_CNT(USBx, ep->num, ep->is_in, len);
+          pmabuffer = ep->pmaaddr1;
+        }
+        else
+        {
-        /* Set the Double buffer counter for pmabuffer0 */
+          /* Set the Double buffer counter for pmabuffer0 */
-        PCD_SET_EP_DBUF0_CNT(USBx, ep->num, ep->is_in, len);
+          PCD_SET_EP_DBUF0_CNT(USBx, ep->num, ep->is_in, len);
-        pmabuffer = ep->pmaaddr0;
+          pmabuffer = ep->pmaaddr0;
+        }
+        USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, (uint16_t)len);
+        PCD_FreeUserBuffer(USBx, ep->num, ep->is_in);
+      }
-      USB_WritePMA(USBx, ep->xfer_buff, pmabuffer, len);
-      PCD_FreeUserBuffer(USBx, ep->num, ep->is_in);
+    }
     PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_VALID);
+  }
   else /* OUT endpoint */
+  {
-    /* Multi packet transfer*/
-    if (ep->xfer_len > ep->maxpacket)
+    if (ep->doublebuffer == 0U)
+    {
+      /* Multi packet transfer */
+      if (ep->xfer_len > ep->maxpacket)
+      {
-      len=ep->maxpacket;
+        len = ep->maxpacket;
-      ep->xfer_len-=len;
+        ep->xfer_len -= len;
-    }
+      }
-    else
+      else
-    {
+      {
-      len=ep->xfer_len;
+        len = ep->xfer_len;
-      ep->xfer_len =0;
+        ep->xfer_len = 0U;
-    }
+      }
-    /* configure and validate Rx endpoint */
+      /* configure and validate Rx endpoint */
-    if (ep->doublebuffer == 0)
-    {
-      /*Set RX buffer count*/
       PCD_SET_EP_RX_CNT(USBx, ep->num, len);
+    }
     else
+    {
+      /* First Transfer Coming From HAL_PCD_EP_Receive & From ISR */
-      /*Set the Double buffer counter*/
+      /* Set the Double buffer counter */
+      if (ep->type == EP_TYPE_BULK)
+      {
+        PCD_SET_EP_DBUF_CNT(USBx, ep->num, ep->is_in, ep->maxpacket);
+        /* Coming from ISR */
+        if (ep->xfer_count != 0U)
+        {
+          /* update last value to check if there is blocking state */
+          wEPVal = PCD_GET_ENDPOINT(USBx, ep->num);
+          /*Blocking State */
+          if ((((wEPVal & USB_EP_DTOG_RX) != 0U) && ((wEPVal & USB_EP_DTOG_TX) != 0U)) ||
+              (((wEPVal & USB_EP_DTOG_RX) == 0U) && ((wEPVal & USB_EP_DTOG_TX) == 0U)))
+          {
+            PCD_FreeUserBuffer(USBx, ep->num, 0U);
+          }
+        }
+      }
+      /* iso out double */
+      else if (ep->type == EP_TYPE_ISOC)
+      {
+        /* Multi packet transfer */
+        if (ep->xfer_len > ep->maxpacket)
+        {
+          len = ep->maxpacket;
+          ep->xfer_len -= len;
+        }
+        else
+        {
+          len = ep->xfer_len;
+          ep->xfer_len = 0U;
+        }
-      PCD_SET_EP_DBUF_CNT(USBx, ep->num, ep->is_in, len);
+        PCD_SET_EP_DBUF_CNT(USBx, ep->num, ep->is_in, len);
+      }
+      else
+      {
+        return HAL_ERROR;
+      }
+    }
     PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID);
+  }
-  return HAL_OK;
-}
-/**
-  * @brief  USB_WritePacket : Writes a packet into the Tx FIFO associated
-  *         with the EP/channel
-  * @param  USBx : Selected device
-  * @param  src :  pointer to source buffer
-  * @param  ch_ep_num : endpoint or host channel number
-  * @param  len : Number of bytes to write
-  * @retval HAL status
-  */
-HAL_StatusTypeDef USB_WritePacket(USB_TypeDef *USBx, uint8_t *src, uint8_t ch_ep_num, uint16_t len)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
-  UNUSED(src);
-  UNUSED(ch_ep_num);
-  UNUSED(len);
-  /* NOTE : - This function is not required by USB Device FS peripheral, it is used
-              only by USB OTG FS peripheral.
-            - This function is added to ensure compatibility across platforms.
-   */
   return HAL_OK;
+}
-/**
-  * @brief  USB_ReadPacket : read a packet from the Tx FIFO associated
-  *         with the EP/channel
-  * @param  USBx : Selected device
-  * @param  dest : destination pointer
-  * @param  len : Number of bytes to read
-  * @retval pointer to destination buffer
-  */
-void *USB_ReadPacket(USB_TypeDef *USBx, uint8_t *dest, uint16_t len)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(USBx);
-  UNUSED(dest);
-  UNUSED(len);
-  /* NOTE : - This function is not required by USB Device FS peripheral, it is used
-              only by USB OTG FS peripheral.
-            - This function is added to ensure compatibility across platforms.
-   */
-  return ((void *)NULL);
-}
 /**
-  * @brief  USB_EPSetStall : set a stall condition over an EP
+  * @brief  USB_EPSetStall set a stall condition over an EP
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
-HAL_StatusTypeDef USB_EPSetStall(USB_TypeDef *USBx , USB_EPTypeDef *ep)
+HAL_StatusTypeDef USB_EPSetStall(USB_TypeDef *USBx, USB_EPTypeDef *ep)
+{
-  if (ep->num == 0)
+  if (ep->is_in != 0U)
+  {
-    /* This macro sets STALL status for RX & TX*/
-    PCD_SET_EP_TXRX_STATUS(USBx, ep->num, USB_EP_RX_STALL, USB_EP_TX_STALL);
+    PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_STALL);
+  }
   else
+  {
-    if (ep->is_in)
-    {
-      PCD_SET_EP_TX_STATUS(USBx, ep->num , USB_EP_TX_STALL);
-    }
-    else
-    {
-      PCD_SET_EP_RX_STATUS(USBx, ep->num , USB_EP_RX_STALL);
+    PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_STALL);
-    }
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_EPClearStall : Clear a stall condition over an EP
+  * @brief  USB_EPClearStall Clear a stall condition over an EP
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  ep: pointer to endpoint structure
+  * @param  ep pointer to endpoint structure
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EPClearStall(USB_TypeDef *USBx, USB_EPTypeDef *ep)
+{
-  if (ep->is_in)
+  if (ep->doublebuffer == 0U)
-  {
-    PCD_CLEAR_TX_DTOG(USBx, ep->num);
-    PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_VALID);
-  }
-  else
+  {
+    if (ep->is_in != 0U)
+    {
+      PCD_CLEAR_TX_DTOG(USBx, ep->num);
+      if (ep->type != EP_TYPE_ISOC)
+      {
+        /* Configure NAK status for the Endpoint */
+        PCD_SET_EP_TX_STATUS(USBx, ep->num, USB_EP_TX_NAK);
+      }
+    }
+    else
+    {
-    PCD_CLEAR_RX_DTOG(USBx, ep->num);
+      PCD_CLEAR_RX_DTOG(USBx, ep->num);
+      /* Configure VALID status for the Endpoint */
-    PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID);
+      PCD_SET_EP_RX_STATUS(USBx, ep->num, USB_EP_RX_VALID);
+    }
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_StopDevice : Stop the usb device mode
+  * @brief  USB_StopDevice Stop the usb device mode
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_StopDevice(USB_TypeDef *USBx)
+{
   /* disable all interrupts and force USB reset */
-  USBx->CNTR = USB_CNTR_FRES;
+  USBx->CNTR = (uint16_t)USB_CNTR_FRES;
   /* clear interrupt status register */
-  USBx->ISTR = 0;
+  USBx->ISTR = 0U;
   /* switch-off device */
-  USBx->CNTR = (USB_CNTR_FRES | USB_CNTR_PDWN);
+  USBx->CNTR = (uint16_t)(USB_CNTR_FRES | USB_CNTR_PDWN);
   return HAL_OK;
+}
 /**
-  * @brief  USB_SetDevAddress : Stop the usb device mode
+  * @brief  USB_SetDevAddress Stop the usb device mode
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  address : new device address to be assigned
+  * @param  address new device address to be assigned
   *          This parameter can be a value from 0 to 255
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_SetDevAddress (USB_TypeDef *USBx, uint8_t address)
+HAL_StatusTypeDef  USB_SetDevAddress(USB_TypeDef *USBx, uint8_t address)
+{
-  if(address == 0)
+  if (address == 0U)
+  {
-   /* set device address and enable function */
+    /* set device address and enable function */
-   USBx->DADDR = USB_DADDR_EF;
+    USBx->DADDR = (uint16_t)USB_DADDR_EF;
+  }
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevConnect : Connect the USB device by enabling the pull-up/pull-down
+  * @brief  USB_DevConnect Connect the USB device by enabling the pull-up/pull-down
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_DevConnect (USB_TypeDef *USBx)
+HAL_StatusTypeDef  USB_DevConnect(USB_TypeDef *USBx)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
-  * @brief  USB_DevDisconnect : Disconnect the USB device by disabling the pull-up/pull-down
+  * @brief  USB_DevDisconnect Disconnect the USB device by disabling the pull-up/pull-down
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
-HAL_StatusTypeDef  USB_DevDisconnect (USB_TypeDef *USBx)
+HAL_StatusTypeDef  USB_DevDisconnect(USB_TypeDef *USBx)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
-  * @brief  USB_ReadInterrupts: return the global USB interrupt status
+  * @brief  USB_ReadInterrupts return the global USB interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
-uint32_t  USB_ReadInterrupts (USB_TypeDef *USBx)
+uint32_t  USB_ReadInterrupts(USB_TypeDef *USBx)
+{
-  uint32_t tmpreg = 0;
+  uint32_t tmpreg;
   tmpreg = USBx->ISTR;
   return tmpreg;
+}
 /**
-  * @brief  USB_ReadDevAllOutEpInterrupt: return the USB device OUT endpoints interrupt status
+  * @brief  USB_ReadDevAllOutEpInterrupt return the USB device OUT endpoints interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
-uint32_t USB_ReadDevAllOutEpInterrupt (USB_TypeDef *USBx)
+uint32_t USB_ReadDevAllOutEpInterrupt(USB_TypeDef *USBx)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return (0);
+}
 /**
-  * @brief  USB_ReadDevAllInEpInterrupt: return the USB device IN endpoints interrupt status
+  * @brief  USB_ReadDevAllInEpInterrupt return the USB device IN endpoints interrupt status
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
-uint32_t USB_ReadDevAllInEpInterrupt (USB_TypeDef *USBx)
+uint32_t USB_ReadDevAllInEpInterrupt(USB_TypeDef *USBx)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return (0);
+}
 /**
   * @brief  Returns Device OUT EP Interrupt register
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  epnum : endpoint number
+  * @param  epnum endpoint number
   *          This parameter can be a value from 0 to 15
   * @retval Device OUT EP Interrupt register
   */
-uint32_t USB_ReadDevOutEPInterrupt (USB_TypeDef *USBx , uint8_t epnum)
+uint32_t USB_ReadDevOutEPInterrupt(USB_TypeDef *USBx, uint8_t epnum)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(epnum);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return (0);
+}
 /**
   * @brief  Returns Device IN EP Interrupt register
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  epnum : endpoint number
+  * @param  epnum endpoint number
   *          This parameter can be a value from 0 to 15
   * @retval Device IN EP Interrupt register
   */
-uint32_t USB_ReadDevInEPInterrupt (USB_TypeDef *USBx , uint8_t epnum)
+uint32_t USB_ReadDevInEPInterrupt(USB_TypeDef *USBx, uint8_t epnum)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(epnum);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return (0);
+}
 /**
   * @brief  USB_ClearInterrupts: clear a USB interrupt
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  interrupt : interrupt flag
+  * @param  interrupt  flag
   * @retval None
   */
-void  USB_ClearInterrupts (USB_TypeDef *USBx, uint32_t interrupt)
+void  USB_ClearInterrupts(USB_TypeDef *USBx, uint32_t interrupt)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(interrupt);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
+}
 /**
   * @brief  Prepare the EP0 to start the first control setup
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
-  * @param  psetup : pointer to setup packet
+  * @param  psetup pointer to setup packet
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_EP0_OutStart(USB_TypeDef *USBx, uint8_t *psetup)
+{
   /* Prevent unused argument(s) compilation warning */
   UNUSED(USBx);
   UNUSED(psetup);
   /* NOTE : - This function is not required by USB Device FS peripheral, it is used
               only by USB OTG FS peripheral.
             - This function is added to ensure compatibility across platforms.
    */
   return HAL_OK;
+}
 /**
   * @brief  USB_ActivateRemoteWakeup : active remote wakeup signalling
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_ActivateRemoteWakeup(USB_TypeDef *USBx)
+{
-  USBx->CNTR |= USB_CNTR_RESUME;
+  USBx->CNTR |= (uint16_t)USB_CNTR_RESUME;
   return HAL_OK;
+}
 /**
-  * @brief  USB_DeActivateRemoteWakeup : de-active remote wakeup signalling
+  * @brief  USB_DeActivateRemoteWakeup de-active remote wakeup signalling
-  * @param  USBx : Selected device
+  * @param  USBx Selected device
   * @retval HAL status
   */
 HAL_StatusTypeDef USB_DeActivateRemoteWakeup(USB_TypeDef *USBx)
+{
-  USBx->CNTR &= ~(USB_CNTR_RESUME);
+  USBx->CNTR &= (uint16_t)(~USB_CNTR_RESUME);
   return HAL_OK;
+}
 /**
-  * @brief  Copy a buffer from user memory area to packet memory area (PMA)
+  * @brief Copy a buffer from user memory area to packet memory area (PMA)
-  * @param  USBx : pointer to USB register.
+  * @param   USBx USB peripheral instance register address.
-  * @param  pbUsrBuf : pointer to user memory area.
+  * @param   pbUsrBuf pointer to user memory area.
-  * @param  wPMABufAddr : address into PMA.
+  * @param   wPMABufAddr address into PMA.
-  * @param  wNBytes : number of bytes to be copied.
+  * @param   wNBytes no. of bytes to be copied.
   * @retval None
   */
 void USB_WritePMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes)
+{
-  uint32_t nbytes = (wNBytes + 1) >> 1;   /* nbytes = (wNBytes + 1) / 2 */
+  uint32_t n = ((uint32_t)wNBytes + 1U) >> 1;
+  uint32_t BaseAddr = (uint32_t)USBx;
-  uint32_t index = 0, temp1 = 0, temp2 = 0;
+  uint32_t i, temp1, temp2;
-  uint16_t *pdwVal = NULL;
+  __IO uint16_t *pdwVal;
+  uint8_t *pBuf = pbUsrBuf;
-  pdwVal = (uint16_t *)(wPMABufAddr * 2 + (uint32_t)USBx + 0x400);
+  pdwVal = (__IO uint16_t *)(BaseAddr + 0x400U + ((uint32_t)wPMABufAddr * PMA_ACCESS));
-  for (index = nbytes; index != 0; index--)
+  for (i = n; i != 0U; i--)
   {
-    temp1 = (uint16_t) * pbUsrBuf;
+    temp1 = *pBuf;
-    pbUsrBuf++;
+    pBuf++;
-    temp2 = temp1 | (uint16_t) * pbUsrBuf << 8;
+    temp2 = temp1 | ((uint16_t)((uint16_t) *pBuf << 8));
-    *pdwVal++ = temp2;
+    *pdwVal = (uint16_t)temp2;
+    pdwVal++;
+#if PMA_ACCESS > 1U
     pdwVal++;
+#endif
-    pbUsrBuf++;
+    pBuf++;
+  }
+}
 /**
-  * @brief  Copy a buffer from user memory area to packet memory area (PMA)
+  * @brief Copy data from packet memory area (PMA) to user memory buffer
-  * @param  USBx : pointer to USB register.
+  * @param   USBx USB peripheral instance register address.
-* @param  pbUsrBuf : pointer to user memory area.
+  * @param   pbUsrBuf pointer to user memory area.
-  * @param  wPMABufAddr : address into PMA.
+  * @param   wPMABufAddr address into PMA.
-  * @param  wNBytes : number of bytes to be copied.
+  * @param   wNBytes no. of bytes to be copied.
   * @retval None
   */
 void USB_ReadPMA(USB_TypeDef *USBx, uint8_t *pbUsrBuf, uint16_t wPMABufAddr, uint16_t wNBytes)
+{
-  uint32_t nbytes = (wNBytes + 1) >> 1;/* /2*/
+  uint32_t n = (uint32_t)wNBytes >> 1;
-  uint32_t index = 0;
+  uint32_t BaseAddr = (uint32_t)USBx;
-  uint32_t *pdwVal = NULL;
+  uint32_t i, temp;
-  pdwVal = (uint32_t *)(wPMABufAddr * 2 + (uint32_t)USBx + 0x400);
-  for (index = nbytes; index != 0; index--)
-  {
-    *(uint16_t*)pbUsrBuf++ = *pdwVal++;
+  __IO uint16_t *pdwVal;
-    pbUsrBuf++;
+  uint8_t *pBuf = pbUsrBuf;
-  }
-}
-#endif /* USB */
-/**
-  * @}
-  */
-/**
-  * @}
-  */
+  pdwVal = (__IO uint16_t *)(BaseAddr + 0x400U + ((uint32_t)wPMABufAddr * PMA_ACCESS));
-#if defined (USB_OTG_FS)
-/** @addtogroup USB_LL_Private_Functions
-  * @{
-  */
-/**
-  * @brief  Reset the USB Core (needed after USB clock settings change)
-  * @param  USBx : Selected device
-  * @retval HAL status
-  */
-static HAL_StatusTypeDef USB_CoreReset(USB_OTG_GlobalTypeDef *USBx)
-{
-  uint32_t count = 0;
+  for (i = n; i != 0U; i--)
-  /* Wait for AHB master IDLE state. */
-  do
+  {
-    if (++count > 200000)
+    temp = *(__IO uint16_t *)pdwVal;
+    pdwVal++;
+    *pBuf = (uint8_t)((temp >> 0) & 0xFFU);
-    {
+    pBuf++;
-      return HAL_TIMEOUT;
+    *pBuf = (uint8_t)((temp >> 8) & 0xFFU);
-    }
+    pBuf++;
+#if PMA_ACCESS > 1U
+    pdwVal++;
+#endif
+  }
-  while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_AHBIDL) == 0);
-  /* Core Soft Reset */
+  if ((wNBytes % 2U) != 0U)
-  count = 0;
-  USBx->GRSTCTL |= USB_OTG_GRSTCTL_CSRST;
-  do
+  {
-    if (++count > 200000)
+    temp = *pdwVal;
-    {
-      return HAL_TIMEOUT;
+    *pBuf = (uint8_t)((temp >> 0) & 0xFFU);
-    }
+  }
-  while ((USBx->GRSTCTL & USB_OTG_GRSTCTL_CSRST) == USB_OTG_GRSTCTL_CSRST);
-  return HAL_OK;
+}
+#endif /* defined (USB) */
 /**
   * @}
   */
-#endif /* USB_OTG_FS */
-#endif /* STM32F102x6 || STM32F102xB || */
-       /* STM32F103x6 || STM32F103xB || */
-       /* STM32F103xE || STM32F103xG || */
-       /* STM32F105xC || STM32F107xC    */
-#endif /* defined (HAL_PCD_MODULE_ENABLED) || defined (HAL_HCD_MODULE_ENABLED) */
 /**
   * @}
   */
+#endif /* defined (USB) || defined (USB_OTG_FS) */
+#endif /* defined (HAL_PCD_MODULE_ENABLED) || defined (HAL_HCD_MODULE_ENABLED) */
 /**
   * @}
   */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Subversion Repositories LedShow

(root)/trunk/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c – Rev 2 → 9