Release v2.6.0

Class/AUDIO/Inc/usbd_audio.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_AUDIO_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -50,6 +50,14 @@
 #define USBD_MAX_NUM_INTERFACES                       1U
 #endif /* USBD_AUDIO_FREQ */
 
+#ifndef AUDIO_HS_BINTERVAL
+#define AUDIO_HS_BINTERVAL                            0x01U
+#endif /* AUDIO_HS_BINTERVAL */
+
+#ifndef AUDIO_FS_BINTERVAL
+#define AUDIO_FS_BINTERVAL                            0x01U
+#endif /* AUDIO_FS_BINTERVAL */
+
 #define AUDIO_OUT_EP                                  0x01U
 #define USB_AUDIO_CONFIG_DESC_SIZ                     0x6DU
 #define AUDIO_INTERFACE_DESC_SIZE                     0x09U
@@ -91,6 +99,9 @@
 
 #define AUDIO_OUT_STREAMING_CTRL                      0x02U
 
+#define AUDIO_OUT_TC                                  0x01U
+#define AUDIO_IN_TC                                   0x02U
+
 
 #define AUDIO_OUT_PACKET                              (uint16_t)(((USBD_AUDIO_FREQ * 2U * 2U) / 1000U))
 #define AUDIO_DEFAULT_VOLUME                          70U
@@ -101,13 +112,13 @@
 /* Total size of the audio transfer buffer */
 #define AUDIO_TOTAL_BUF_SIZE                          ((uint16_t)(AUDIO_OUT_PACKET * AUDIO_OUT_PACKET_NUM))
 
-    /* Audio Commands enumeration */
+/* Audio Commands enumeration */
 typedef enum
 {
   AUDIO_CMD_START = 1,
   AUDIO_CMD_PLAY,
   AUDIO_CMD_STOP,
-}AUDIO_CMD_TypeDef;
+} AUDIO_CMD_TypeDef;
 
 
 typedef enum
@@ -116,8 +127,7 @@ typedef enum
   AUDIO_OFFSET_HALF,
   AUDIO_OFFSET_FULL,
   AUDIO_OFFSET_UNKNOWN,
-}
+} AUDIO_OffsetTypeDef;
-AUDIO_OffsetTypeDef;
 /**
   * @}
   */
@@ -126,15 +136,13 @@ AUDIO_OffsetTypeDef;
 /** @defgroup USBD_CORE_Exported_TypesDefinitions
   * @{
   */
- typedef struct
+typedef struct
 {
   uint8_t cmd;
   uint8_t data[USB_MAX_EP0_SIZE];
   uint8_t len;
   uint8_t unit;
-}
+} USBD_AUDIO_ControlTypeDef;
-USBD_AUDIO_ControlTypeDef;
-
 
 
 typedef struct
@@ -146,20 +154,19 @@ typedef struct
   uint16_t rd_ptr;
   uint16_t wr_ptr;
   USBD_AUDIO_ControlTypeDef control;
-}
+} USBD_AUDIO_HandleTypeDef;
-USBD_AUDIO_HandleTypeDef;
 
 
 typedef struct
 {
-    int8_t  (*Init)         (uint32_t  AudioFreq, uint32_t Volume, uint32_t options);
+  int8_t (*Init)(uint32_t AudioFreq, uint32_t Volume, uint32_t options);
-    int8_t  (*DeInit)       (uint32_t options);
+  int8_t (*DeInit)(uint32_t options);
-    int8_t  (*AudioCmd)     (uint8_t* pbuf, uint32_t size, uint8_t cmd);
+  int8_t (*AudioCmd)(uint8_t *pbuf, uint32_t size, uint8_t cmd);
-    int8_t  (*VolumeCtl)    (uint8_t vol);
+  int8_t (*VolumeCtl)(uint8_t vol);
-    int8_t  (*MuteCtl)      (uint8_t cmd);
+  int8_t (*MuteCtl)(uint8_t cmd);
-    int8_t  (*PeriodicTC)   (uint8_t cmd);
+  int8_t (*PeriodicTC)(uint8_t *pbuf, uint32_t size, uint8_t cmd);
-    int8_t  (*GetState)     (void);
+  int8_t (*GetState)(void);
-}USBD_AUDIO_ItfTypeDef;
+} USBD_AUDIO_ItfTypeDef;
 /**
   * @}
   */
@@ -187,10 +194,10 @@ extern USBD_ClassTypeDef  USBD_AUDIO;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t  USBD_AUDIO_RegisterInterface  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_AUDIO_RegisterInterface(USBD_HandleTypeDef *pdev,
                                      USBD_AUDIO_ItfTypeDef *fops);
 
-void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset);
+void USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset);
 /**
   * @}
   */

Class/AUDIO/Inc/usbd_audio_if_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_AUDIO_IF_TEMPLATE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/

Class/AUDIO/Src/usbd_audio.c

@@ -48,16 +48,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}.c"
+- "stm32xxxxx_{eval}{discovery}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}_audio.c"
+- "stm32xxxxx_{eval}{discovery}_audio.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_audio.h"
@@ -103,42 +103,26 @@
   */
 
 
-
-
 /** @defgroup USBD_AUDIO_Private_FunctionPrototypes
   * @{
   */
+static uint8_t USBD_AUDIO_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_AUDIO_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
 
-
+static uint8_t USBD_AUDIO_Setup(USBD_HandleTypeDef *pdev,
-static uint8_t  USBD_AUDIO_Init (USBD_HandleTypeDef *pdev,
-                               uint8_t cfgidx);
-
-static uint8_t  USBD_AUDIO_DeInit (USBD_HandleTypeDef *pdev,
-                                 uint8_t cfgidx);
-
-static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
                                 USBD_SetupReqTypedef *req);
 
-static uint8_t  *USBD_AUDIO_GetCfgDesc (uint16_t *length);
+static uint8_t *USBD_AUDIO_GetCfgDesc(uint16_t *length);
-
+static uint8_t *USBD_AUDIO_GetDeviceQualifierDesc(uint16_t *length);
-static uint8_t  *USBD_AUDIO_GetDeviceQualifierDesc (uint16_t *length);
+static uint8_t USBD_AUDIO_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
-
+static uint8_t USBD_AUDIO_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
-static uint8_t  USBD_AUDIO_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_AUDIO_EP0_RxReady(USBD_HandleTypeDef *pdev);
-
+static uint8_t USBD_AUDIO_EP0_TxReady(USBD_HandleTypeDef *pdev);
-static uint8_t  USBD_AUDIO_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_AUDIO_SOF(USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_AUDIO_EP0_TxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_AUDIO_SOF (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_AUDIO_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_AUDIO_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
 
+static uint8_t USBD_AUDIO_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_AUDIO_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
 static void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
 static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
 
 /**
@@ -277,7 +261,7 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   AUDIO_STREAMING_GENERAL,              /* bDescriptorSubtype */
   0x01,                                 /* bTerminalLink */
   0x01,                                 /* bDelay */
-  0x01,                                 /* wFormatTag AUDIO_FORMAT_PCM  0x0001*/
+  0x01,                                 /* wFormatTag AUDIO_FORMAT_PCM  0x0001 */
   0x00,
   /* 07 byte*/
 
@@ -296,10 +280,10 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   /* Endpoint 1 - Standard Descriptor */
   AUDIO_STANDARD_ENDPOINT_DESC_SIZE,    /* bLength */
   USB_DESC_TYPE_ENDPOINT,               /* bDescriptorType */
-  AUDIO_OUT_EP,                         /* bEndpointAddress 1 out endpoint*/
+  AUDIO_OUT_EP,                         /* bEndpointAddress 1 out endpoint */
   USBD_EP_TYPE_ISOC,                    /* bmAttributes */
   AUDIO_PACKET_SZE(USBD_AUDIO_FREQ),    /* wMaxPacketSize in Bytes (Freq(Samples)*2(Stereo)*2(HalfWord)) */
-  0x01,                                 /* bInterval */
+  AUDIO_FS_BINTERVAL,                   /* bInterval */
   0x00,                                 /* bRefresh */
   0x00,                                 /* bSynchAddress */
   /* 09 byte*/
@@ -316,7 +300,7 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
 } ;
 
 /* USB Standard Device Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_AUDIO_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END=
+__ALIGN_BEGIN static uint8_t USBD_AUDIO_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
 {
   USB_LEN_DEV_QUALIFIER_DESC,
   USB_DESC_TYPE_DEVICE_QUALIFIER,
@@ -345,24 +329,35 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIE
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+static uint8_t USBD_AUDIO_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
   USBD_AUDIO_HandleTypeDef *haudio;
 
+    /* Allocate Audio structure */
+  haudio = USBD_malloc(sizeof(USBD_AUDIO_HandleTypeDef));
+
+  if (haudio == NULL)
+  {
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
+  }
+
+  pdev->pClassData = (void *)haudio;
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
+  {
+    pdev->ep_out[AUDIO_OUT_EP & 0xFU].bInterval = AUDIO_HS_BINTERVAL;
+  }
+  else   /* LOW and FULL-speed endpoints */
+  {
+    pdev->ep_out[AUDIO_OUT_EP & 0xFU].bInterval = AUDIO_FS_BINTERVAL;
+  }
+
   /* Open EP OUT */
-  USBD_LL_OpenEP(pdev, AUDIO_OUT_EP, USBD_EP_TYPE_ISOC, AUDIO_OUT_PACKET);
+  (void)USBD_LL_OpenEP(pdev, AUDIO_OUT_EP, USBD_EP_TYPE_ISOC, AUDIO_OUT_PACKET);
   pdev->ep_out[AUDIO_OUT_EP & 0xFU].is_used = 1U;
 
-  /* Allocate Audio structure */
-  pdev->pClassData = USBD_malloc(sizeof (USBD_AUDIO_HandleTypeDef));
-
-  if(pdev->pClassData == NULL)
-  {
-    return USBD_FAIL;
-  }
-  else
-  {
-    haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
   haudio->alt_setting = 0U;
   haudio->offset = AUDIO_OFFSET_UNKNOWN;
   haudio->wr_ptr = 0U;
@@ -372,16 +367,16 @@ static uint8_t  USBD_AUDIO_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   /* Initialize the Audio output Hardware layer */
   if (((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->Init(USBD_AUDIO_FREQ,
                                                        AUDIO_DEFAULT_VOLUME,
-                                                         0U) != 0)
+                                                       0U) != 0U)
   {
-      return USBD_FAIL;
+    return (uint8_t)USBD_FAIL;
   }
 
   /* Prepare Out endpoint to receive 1st packet */
-    USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP, haudio->buffer,
+  (void)USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP, haudio->buffer,
                                AUDIO_OUT_PACKET);
-  }
+
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -391,23 +386,24 @@ static uint8_t  USBD_AUDIO_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_AUDIO_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                                 uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
 
   /* Open EP OUT */
-  USBD_LL_CloseEP(pdev, AUDIO_OUT_EP);
+  (void)USBD_LL_CloseEP(pdev, AUDIO_OUT_EP);
   pdev->ep_out[AUDIO_OUT_EP & 0xFU].is_used = 0U;
+  pdev->ep_out[AUDIO_OUT_EP & 0xFU].bInterval = 0U;
 
   /* DeInit  physical Interface components */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData != NULL)
   {
     ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->DeInit(0U);
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -417,20 +413,20 @@ static uint8_t  USBD_AUDIO_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_AUDIO_Setup(USBD_HandleTypeDef *pdev,
                                 USBD_SetupReqTypedef *req)
 {
   USBD_AUDIO_HandleTypeDef *haudio;
   uint16_t len;
   uint8_t *pbuf;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
 
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-  case USB_REQ_TYPE_CLASS :
+  case USB_REQ_TYPE_CLASS:
     switch (req->bRequest)
     {
     case AUDIO_REQ_GET_CUR:
@@ -442,7 +438,7 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -454,38 +450,38 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     case USB_REQ_GET_DESCRIPTOR:
-      if( (req->wValue >> 8) == AUDIO_DESCRIPTOR_TYPE)
+      if ((req->wValue >> 8) == AUDIO_DESCRIPTOR_TYPE)
       {
         pbuf = USBD_AUDIO_CfgDesc + 18;
-        len = MIN(USB_AUDIO_DESC_SIZ , req->wLength);
+        len = MIN(USB_AUDIO_DESC_SIZ, req->wLength);
 
-        USBD_CtlSendData (pdev, pbuf, len);
+        (void)USBD_CtlSendData(pdev, pbuf, len);
       }
       break;
 
-    case USB_REQ_GET_INTERFACE :
+    case USB_REQ_GET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&haudio->alt_setting, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&haudio->alt_setting, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
-    case USB_REQ_SET_INTERFACE :
+    case USB_REQ_SET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
         if ((uint8_t)(req->wValue) <= USBD_MAX_NUM_INTERFACES)
@@ -495,30 +491,33 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
         else
         {
           /* Call the error management function (command will be nacked */
-           USBD_CtlError (pdev, req);
+          USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
         }
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 
@@ -529,9 +528,10 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_AUDIO_GetCfgDesc (uint16_t *length)
+static uint8_t *USBD_AUDIO_GetCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_AUDIO_CfgDesc);
+  *length = (uint16_t)sizeof(USBD_AUDIO_CfgDesc);
+
   return USBD_AUDIO_CfgDesc;
 }
 
@@ -542,12 +542,13 @@ static uint8_t  *USBD_AUDIO_GetCfgDesc (uint16_t *length)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_DataIn (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_AUDIO_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
+  UNUSED(pdev);
+  UNUSED(epnum);
 
   /* Only OUT data are processed */
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -556,13 +557,14 @@ static uint8_t  USBD_AUDIO_DataIn (USBD_HandleTypeDef *pdev,
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_AUDIO_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
   USBD_AUDIO_HandleTypeDef *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
   if (haudio->control.cmd == AUDIO_REQ_SET_CUR)
-  {/* In this driver, to simplify code, only SET_CUR request is managed */
+  {
+    /* In this driver, to simplify code, only SET_CUR request is managed */
 
     if (haudio->control.unit == AUDIO_OUT_STREAMING_CTRL)
     {
@@ -572,7 +574,7 @@ static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev)
     }
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_AUDIO_EP0_TxReady
@@ -580,10 +582,12 @@ static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_AUDIO_EP0_TxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_AUDIO_EP0_TxReady(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   /* Only OUT control data are processed */
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_AUDIO_SOF
@@ -591,9 +595,11 @@ static uint8_t  USBD_AUDIO_EP0_TxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_AUDIO_SOF (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_AUDIO_SOF(USBD_HandleTypeDef *pdev)
 {
-  return USBD_OK;
+  UNUSED(pdev);
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -602,17 +608,23 @@ static uint8_t  USBD_AUDIO_SOF (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
+void USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
 {
-  uint32_t cmd = 0U;
   USBD_AUDIO_HandleTypeDef *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+  uint32_t BufferSize = AUDIO_TOTAL_BUF_SIZE / 2U;
+
+  if (pdev->pClassData == NULL)
+  {
+    return;
+  }
+
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
   haudio->offset = offset;
 
-  if(haudio->rd_enable == 1U)
+  if (haudio->rd_enable == 1U)
   {
-    haudio->rd_ptr += (uint16_t)(AUDIO_TOTAL_BUF_SIZE / 2U);
+    haudio->rd_ptr += (uint16_t)BufferSize;
 
     if (haudio->rd_ptr == AUDIO_TOTAL_BUF_SIZE)
     {
@@ -621,40 +633,39 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
     }
   }
 
-  if(haudio->rd_ptr > haudio->wr_ptr)
+  if (haudio->rd_ptr > haudio->wr_ptr)
   {
-    if((haudio->rd_ptr - haudio->wr_ptr) < AUDIO_OUT_PACKET)
+    if ((haudio->rd_ptr - haudio->wr_ptr) < AUDIO_OUT_PACKET)
     {
-      cmd = AUDIO_TOTAL_BUF_SIZE / 2U + 4U;
+      BufferSize += 4U;
     }
     else
     {
-      if((haudio->rd_ptr - haudio->wr_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
+      if ((haudio->rd_ptr - haudio->wr_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
       {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U - 4U;
+        BufferSize -= 4U;
       }
     }
   }
   else
   {
-    if((haudio->wr_ptr - haudio->rd_ptr) < AUDIO_OUT_PACKET)
+    if ((haudio->wr_ptr - haudio->rd_ptr) < AUDIO_OUT_PACKET)
     {
-      cmd = AUDIO_TOTAL_BUF_SIZE / 2U - 4U;
+       BufferSize -= 4U;
     }
     else
     {
-      if((haudio->wr_ptr - haudio->rd_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
+      if ((haudio->wr_ptr - haudio->rd_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
       {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U + 4U;
+         BufferSize += 4U;
       }
     }
   }
 
-  if(haudio->offset == AUDIO_OFFSET_FULL)
+  if (haudio->offset == AUDIO_OFFSET_FULL)
   {
     ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->AudioCmd(&haudio->buffer[0],
-                                                         cmd,
+                                                         BufferSize, AUDIO_CMD_PLAY);
-                                                         AUDIO_CMD_PLAY);
     haudio->offset = AUDIO_OFFSET_NONE;
   }
 }
@@ -666,10 +677,12 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_AUDIO_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  UNUSED(pdev);
+  UNUSED(epnum);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_AUDIO_IsoOutIncomplete
@@ -678,10 +691,12 @@ static uint8_t  USBD_AUDIO_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t ep
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_AUDIO_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  UNUSED(pdev);
+  UNUSED(epnum);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_AUDIO_DataOut
@@ -690,24 +705,31 @@ static uint8_t  USBD_AUDIO_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t e
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_AUDIO_DataOut (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_AUDIO_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
+  uint16_t PacketSize;
   USBD_AUDIO_HandleTypeDef *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
   if (epnum == AUDIO_OUT_EP)
   {
-    /* Increment the Buffer pointer or roll it back when all buffers are full */
+    /* Get received data packet length */
+    PacketSize = (uint16_t)USBD_LL_GetRxDataSize(pdev, epnum);
 
-    haudio->wr_ptr += AUDIO_OUT_PACKET;
+    /* Packet received Callback */
+    ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->PeriodicTC(&haudio->buffer[haudio->wr_ptr],
+                                                           PacketSize, AUDIO_OUT_TC);
+
+    /* Increment the Buffer pointer or roll it back when all buffers are full */
+    haudio->wr_ptr += PacketSize;
 
     if (haudio->wr_ptr == AUDIO_TOTAL_BUF_SIZE)
     {
       /* All buffers are full: roll back */
       haudio->wr_ptr = 0U;
 
-      if(haudio->offset == AUDIO_OFFSET_UNKNOWN)
+      if (haudio->offset == AUDIO_OFFSET_UNKNOWN)
       {
         ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->AudioCmd(&haudio->buffer[0],
                                                              AUDIO_TOTAL_BUF_SIZE / 2U,
@@ -716,7 +738,7 @@ static uint8_t  USBD_AUDIO_DataOut (USBD_HandleTypeDef *pdev,
       }
     }
 
-    if(haudio->rd_enable == 0U)
+    if (haudio->rd_enable == 0U)
     {
       if (haudio->wr_ptr == (AUDIO_TOTAL_BUF_SIZE / 2U))
       {
@@ -725,11 +747,12 @@ static uint8_t  USBD_AUDIO_DataOut (USBD_HandleTypeDef *pdev,
     }
 
     /* Prepare Out endpoint to receive next audio packet */
-    USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP, &haudio->buffer[haudio->wr_ptr],
+    (void)USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP,
+                                 &haudio->buffer[haudio->wr_ptr],
                                  AUDIO_OUT_PACKET);
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -742,12 +765,12 @@ static uint8_t  USBD_AUDIO_DataOut (USBD_HandleTypeDef *pdev,
 static void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   USBD_AUDIO_HandleTypeDef *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
-  memset(haudio->control.data, 0, 64U);
+  (void)USBD_memset(haudio->control.data, 0, 64U);
 
   /* Send the current mute state */
-  USBD_CtlSendData (pdev, haudio->control.data, req->wLength);
+  (void)USBD_CtlSendData(pdev, haudio->control.data, req->wLength);
 }
 
 /**
@@ -760,14 +783,12 @@ static void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
 static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   USBD_AUDIO_HandleTypeDef *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef*) pdev->pClassData;
+  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
-  if (req->wLength)
+  if (req->wLength != 0U)
   {
     /* Prepare the reception of the buffer over EP0 */
-    USBD_CtlPrepareRx (pdev,
+    (void)USBD_CtlPrepareRx(pdev, haudio->control.data, req->wLength);
-                       haudio->control.data,
-                       req->wLength);
 
     haudio->control.cmd = AUDIO_REQ_SET_CUR;     /* Set the request value */
     haudio->control.len = (uint8_t)req->wLength; /* Set the request data length */
@@ -782,9 +803,10 @@ static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-static uint8_t  *USBD_AUDIO_GetDeviceQualifierDesc (uint16_t *length)
+static uint8_t *USBD_AUDIO_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_AUDIO_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_AUDIO_DeviceQualifierDesc);
+
   return USBD_AUDIO_DeviceQualifierDesc;
 }
 
@@ -793,14 +815,17 @@ static uint8_t  *USBD_AUDIO_GetDeviceQualifierDesc (uint16_t *length)
 * @param  fops: Audio interface callback
 * @retval status
 */
-uint8_t  USBD_AUDIO_RegisterInterface  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_AUDIO_RegisterInterface(USBD_HandleTypeDef *pdev,
                                      USBD_AUDIO_ItfTypeDef *fops)
 {
-  if(fops != NULL)
+  if (fops == NULL)
   {
-    pdev->pUserData= fops;
+    return (uint8_t)USBD_FAIL;
   }
-  return USBD_OK;
+
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 /**
   * @}

Class/AUDIO/Src/usbd_audio_if_template.c

@@ -12,16 +12,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}.c"
+- "stm32xxxxx_{eval}{discovery}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}_audio.c"
+- "stm32xxxxx_{eval}{discovery}_audio.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_audio_if_template.h"
@@ -65,13 +65,13 @@
   * @{
   */
 
-static int8_t  TEMPLATE_Init         (uint32_t  AudioFreq, uint32_t Volume, uint32_t options);
+static int8_t  TEMPLATE_Init(uint32_t  AudioFreq, uint32_t Volume, uint32_t options);
-static int8_t  TEMPLATE_DeInit       (uint32_t options);
+static int8_t  TEMPLATE_DeInit(uint32_t options);
-static int8_t  TEMPLATE_AudioCmd     (uint8_t* pbuf, uint32_t size, uint8_t cmd);
+static int8_t  TEMPLATE_AudioCmd(uint8_t *pbuf, uint32_t size, uint8_t cmd);
-static int8_t  TEMPLATE_VolumeCtl    (uint8_t vol);
+static int8_t  TEMPLATE_VolumeCtl(uint8_t vol);
-static int8_t  TEMPLATE_MuteCtl      (uint8_t cmd);
+static int8_t  TEMPLATE_MuteCtl(uint8_t cmd);
-static int8_t  TEMPLATE_PeriodicTC   (uint8_t cmd);
+static int8_t  TEMPLATE_PeriodicTC(uint8_t *pbuf, uint32_t size, uint8_t cmd);
-static int8_t  TEMPLATE_GetState     (void);
+static int8_t  TEMPLATE_GetState(void);
 
 USBD_AUDIO_ItfTypeDef USBD_AUDIO_Template_fops =
 {
@@ -94,6 +94,10 @@ USBD_AUDIO_ItfTypeDef USBD_AUDIO_Template_fops =
   */
 static int8_t TEMPLATE_Init(uint32_t  AudioFreq, uint32_t Volume, uint32_t options)
 {
+  UNUSED(AudioFreq);
+  UNUSED(Volume);
+  UNUSED(options);
+
   /*
      Add your initialization code here
   */
@@ -108,6 +112,8 @@ static int8_t TEMPLATE_Init(uint32_t  AudioFreq, uint32_t Volume, uint32_t optio
   */
 static int8_t TEMPLATE_DeInit(uint32_t options)
 {
+  UNUSED(options);
+
   /*
      Add your deinitialization code here
   */
@@ -123,8 +129,11 @@ static int8_t TEMPLATE_DeInit(uint32_t options)
   * @param  cmd: command opcode
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_AudioCmd (uint8_t* pbuf, uint32_t size, uint8_t cmd)
+static int8_t TEMPLATE_AudioCmd(uint8_t *pbuf, uint32_t size, uint8_t cmd)
 {
+  UNUSED(pbuf);
+  UNUSED(size);
+  UNUSED(cmd);
 
   return (0);
 }
@@ -134,8 +143,9 @@ static int8_t TEMPLATE_AudioCmd (uint8_t* pbuf, uint32_t size, uint8_t cmd)
   * @param  vol: volume level (0..100)
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_VolumeCtl (uint8_t vol)
+static int8_t TEMPLATE_VolumeCtl(uint8_t vol)
 {
+  UNUSED(vol);
 
   return (0);
 }
@@ -145,8 +155,9 @@ static int8_t TEMPLATE_VolumeCtl (uint8_t vol)
   * @param  cmd: vmute command
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_MuteCtl (uint8_t cmd)
+static int8_t TEMPLATE_MuteCtl(uint8_t cmd)
 {
+  UNUSED(cmd);
 
   return (0);
 }
@@ -156,8 +167,11 @@ static int8_t TEMPLATE_MuteCtl (uint8_t cmd)
   * @param  cmd
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_PeriodicTC (uint8_t cmd)
+static int8_t TEMPLATE_PeriodicTC(uint8_t *pbuf, uint32_t size, uint8_t cmd)
 {
+  UNUSED(pbuf);
+  UNUSED(size);
+  UNUSED(cmd);
 
   return (0);
 }
@@ -167,9 +181,8 @@ static int8_t TEMPLATE_PeriodicTC (uint8_t cmd)
   * @param  None
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_GetState (void)
+static int8_t TEMPLATE_GetState(void)
 {
-
   return (0);
 }
 /**

Class/BillBoard/Inc/usbd_billboard.h

@@ -0,0 +1,163 @@
+/**
+  ******************************************************************************
+  * @file    usbd_billboard.h
+  * @author  MCD Application Team
+  * @brief   Header file for the usbd_billboard.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USB_BB_H
+#define __USB_BB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_ioreq.h"
+#include  "usbd_desc.h"
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_BB
+  * @brief This file is the Header file for usbd_billboard.c
+  * @{
+  */
+
+/** @defgroup USBD_BB_Exported_Defines
+  * @{
+  */
+#define USB_BB_CONFIG_DESC_SIZ                  18U
+
+#ifndef USB_BB_MAX_NUM_ALT_MODE
+#define USB_BB_MAX_NUM_ALT_MODE                 0x2U
+#endif /* USB_BB_MAX_NUM_ALT_MODE */
+
+#ifndef USBD_BB_IF_STRING_INDEX
+#define USBD_BB_IF_STRING_INDEX                 0x10U
+#endif /* USBD_BB_IF_STRING_INDEX */
+
+
+#define USBD_BILLBOARD_CAPABILITY               0x0DU
+#define USBD_BILLBOARD_ALTMODE_CAPABILITY       0x0FU
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CORE_Exported_TypesDefinitions
+  * @{
+  */
+typedef  struct  _BB_DescHeader
+{
+  uint8_t  bLength;
+  uint8_t  bDescriptorType;
+  uint8_t  bDevCapabilityType;
+}
+USBD_BB_DescHeader_t;
+
+typedef struct
+{
+  uint16_t wSVID;
+  uint8_t  bAlternateMode;
+  uint8_t  iAlternateModeString;
+} USBD_BB_AltModeTypeDef;
+
+typedef struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint8_t   bDevCapabilityType;
+  uint8_t   bIndex;
+  uint32_t  dwAlternateModeVdo;
+} USBD_BB_AltModeCapDescTypeDef;
+
+typedef  struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint8_t   bDevCapabilityType;
+  uint8_t   iAddtionalInfoURL;
+  uint8_t   bNbrOfAltModes;
+  uint8_t   bPreferredAltMode;
+  uint16_t  VconnPwr;
+  uint8_t   bmConfigured[32];
+  uint16_t  bcdVersion;
+  uint8_t   bAdditionalFailureInfo;
+  uint8_t   bReserved;
+  USBD_BB_AltModeTypeDef  wSVID[USB_BB_MAX_NUM_ALT_MODE];
+} USBD_BosBBCapDescTypedef;
+
+typedef enum
+{
+  UNSPECIFIED_ERROR = 0,
+  CONFIGURATION_NOT_ATTEMPTED,
+  CONFIGURATION_UNSUCCESSFUL,
+  CONFIGURATION_SUCCESSFUL,
+} BB_AltModeState;
+
+/**
+  * @}
+  */
+
+
+
+/** @defgroup USBD_CORE_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CORE_Exported_Variables
+  * @{
+  */
+
+extern USBD_ClassTypeDef  USBD_BB;
+#define USBD_BB_CLASS    &USBD_BB
+/**
+  * @}
+  */
+
+/** @defgroup USB_CORE_Exported_Functions
+  * @{
+  */
+
+#if (USBD_CLASS_BOS_ENABLED == 1)
+void *USBD_BB_GetCapDesc(USBD_HandleTypeDef *pdev, uint8_t *buf);
+void *USBD_BB_GetAltModeDesc(USBD_HandleTypeDef *pdev, uint8_t *buf, uint8_t idx);
+#endif
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __USB_BB_H */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/BillBoard/Src/usbd_billboard.c

@@ -0,0 +1,496 @@
+/**
+  ******************************************************************************
+  * @file    usbd_billboard.c
+  * @author  MCD Application Team
+  * @brief   This file provides the high layer firmware functions to manage the
+  *          following functionalities of the USB BillBoard Class:
+  *           - Initialization and Configuration of high and low layer
+  *           - Enumeration as BillBoard Device
+  *           - Error management
+ * @verbatim
+  *
+  *          ===================================================================
+  *                                BillBoard Class Description
+  *          ===================================================================
+  *           This module manages the BillBoard class V1.2.1 following the "Device Class Definition
+  *           for BillBoard Devices (BB) Version R1.2.1 Sept 08, 2016".
+  *           This driver implements the following aspects of the specification:
+  *             - Device descriptor management
+  *             - Configuration descriptor management
+  *             - Enumeration as an USB BillBoard device
+  *             - Enumeration & management of BillBoard device supported alternate modes
+  *
+  *  @endverbatim
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_billboard.h"
+#include "usbd_ctlreq.h"
+
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup USBD_BB
+  * @brief usbd core module
+  * @{
+  */
+
+/** @defgroup USBD_BB_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_BB_Private_Defines
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_BB_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_BB_Private_FunctionPrototypes
+  * @{
+  */
+
+static uint8_t USBD_BB_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_BB_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_BB_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static uint8_t USBD_BB_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_BB_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_BB_EP0_RxReady(USBD_HandleTypeDef *pdev);
+
+static uint8_t *USBD_BB_GetCfgDesc(uint16_t *length);
+static uint8_t *USBD_BB_GetDeviceQualifierDesc(uint16_t *length);
+static uint8_t *USBD_BB_GetOtherSpeedCfgDesc(uint16_t *length);
+
+#if (USBD_CLASS_BOS_ENABLED == 1)
+USBD_BB_DescHeader_t *USBD_BB_GetNextDesc(uint8_t *pbuf, uint16_t *ptr);
+#endif
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_BB_Private_Variables
+  * @{
+  */
+USBD_ClassTypeDef  USBD_BB =
+{
+  USBD_BB_Init,             /* Init */
+  USBD_BB_DeInit,           /* DeInit */
+  USBD_BB_Setup,            /* Setup */
+  NULL,                     /* EP0_TxSent */
+  USBD_BB_EP0_RxReady,      /* EP0_RxReady */
+  USBD_BB_DataIn,           /* DataIn */
+  USBD_BB_DataOut,          /* DataOut */
+  NULL,                     /* SOF */
+  NULL,
+  NULL,
+  USBD_BB_GetCfgDesc,
+  USBD_BB_GetCfgDesc,
+  USBD_BB_GetOtherSpeedCfgDesc,
+  USBD_BB_GetDeviceQualifierDesc,
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
+  NULL,
+#endif
+};
+
+/* USB Standard Device Qualifier Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_BB_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
+{
+  USB_LEN_DEV_QUALIFIER_DESC,     /* bLength */
+  USB_DESC_TYPE_DEVICE_QUALIFIER, /* bDescriptorType */
+  0x01,                           /* bcdUSB */
+  0x20,
+  0x11,                           /* bDeviceClass */
+  0x00,                           /* bDeviceSubClass */
+  0x00,                           /* bDeviceProtocol */
+  0x40,                           /* bMaxPacketSize0 */
+  0x01,                           /* bNumConfigurations */
+  0x00,                           /* bReserved */
+};
+
+/* USB device Configuration Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_BB_CfgDesc[USB_BB_CONFIG_DESC_SIZ]  __ALIGN_END =
+{
+  0x09,                        /* bLength: Configuration Descriptor size */
+  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
+  USB_BB_CONFIG_DESC_SIZ,      /* wTotalLength: Bytes returned */
+  0x00,
+  0x01,                        /* bNumInterfaces: 1 interface */
+  0x01,                        /* bConfigurationValue: Configuration value */
+  USBD_IDX_CONFIG_STR,         /* iConfiguration: Index of string descriptor describing the configuration */
+  0xC0,                        /* bmAttributes: bus powered and Support Remote Wake-up */
+  0x00,                        /* MaxPower 100 mA: this current is used for detecting Vbus */
+  /* 09 */
+
+  /************** Descriptor of BillBoard interface ****************/
+  /* 09 */
+  0x09,                        /* bLength: Interface Descriptor size */
+  USB_DESC_TYPE_INTERFACE,     /* bDescriptorType: Interface descriptor type */
+  0x00,                        /* bInterfaceNumber: Number of Interface */
+  0x00,                        /* bAlternateSetting: Alternate setting */
+  0x00,                        /* bNumEndpoints */
+  0x11,                        /* bInterfaceClass: billboard */
+  0x00,                        /* bInterfaceSubClass */
+  0x00,                        /* nInterfaceProtocol */
+  USBD_BB_IF_STRING_INDEX,     /* iInterface: Index of string descriptor */
+};
+
+/* USB device Other Speed Configuration Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_BB_OtherSpeedCfgDesc[USB_BB_CONFIG_DESC_SIZ]   __ALIGN_END  =
+{
+  0x09,                        /* bLength: Configuation Descriptor size */
+  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
+  USB_BB_CONFIG_DESC_SIZ,
+  0x00,
+  0x01,                        /* bNumInterfaces: 1 interface */
+  0x01,                        /* bConfigurationValue: */
+  USBD_IDX_CONFIG_STR,         /* iConfiguration: */
+  0xC0,                        /* bmAttributes: */
+  0x00,                        /* MaxPower 100 mA */
+
+  /************** Descriptor of BillBoard interface ****************/
+  /* 09 */
+  0x09,                        /* bLength: Interface Descriptor size */
+  USB_DESC_TYPE_INTERFACE,     /* bDescriptorType: Interface descriptor type */
+  0x00,                        /* bInterfaceNumber: Number of Interface */
+  0x00,                        /* bAlternateSetting: Alternate setting */
+  0x00,                        /* bNumEndpoints*/
+  0x11,                        /* bInterfaceClass: billboard */
+  0x00,                        /* bInterfaceSubClass */
+  0x00,                        /* nInterfaceProtocol */
+  USBD_BB_IF_STRING_INDEX,     /* iInterface: Index of string descriptor */
+} ;
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_BB_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  USBD_BB_Init
+  *         Initialize the BB interface
+  * @param  pdev: device instance
+  * @param  cfgidx: Configuration index
+  * @retval status
+  */
+static uint8_t USBD_BB_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+{
+  /* Prevent unused argument compilation warning */
+  UNUSED(pdev);
+  UNUSED(cfgidx);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_BB_Init
+  *         DeInitialize the BB layer
+  * @param  pdev: device instance
+  * @param  cfgidx: Configuration index
+  * @retval status
+  */
+static uint8_t USBD_BB_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+{
+  /* Prevent unused argument compilation warning */
+  UNUSED(pdev);
+  UNUSED(cfgidx);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_BB_Setup
+  *         Handle the BB specific requests
+  * @param  pdev: instance
+  * @param  req: usb requests
+  * @retval status
+  */
+static uint8_t USBD_BB_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+{
+  USBD_StatusTypeDef ret = USBD_OK;
+  uint16_t status_info = 0U;
+  uint16_t AltSetting = 0U;
+
+  switch (req->bmRequest & USB_REQ_TYPE_MASK)
+  {
+  case USB_REQ_TYPE_CLASS:
+    break;
+  case USB_REQ_TYPE_STANDARD:
+    switch (req->bRequest)
+    {
+    case USB_REQ_GET_STATUS:
+      if (pdev->dev_state == USBD_STATE_CONFIGURED)
+      {
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        ret = USBD_FAIL;
+      }
+      break;
+
+    case USB_REQ_GET_INTERFACE:
+      if (pdev->dev_state == USBD_STATE_CONFIGURED)
+      {
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&AltSetting, 1U);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        ret = USBD_FAIL;
+      }
+      break;
+
+    case USB_REQ_SET_INTERFACE:
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
+    default:
+      USBD_CtlError(pdev, req);
+      ret = USBD_FAIL;
+      break;
+    }
+    break;
+
+  default:
+    USBD_CtlError(pdev, req);
+    ret = USBD_FAIL;
+    break;
+  }
+
+  return (uint8_t)ret;
+}
+
+/**
+  * @brief  USBD_BB_DataIn
+  *         Data sent on non-control IN endpoint
+  * @param  pdev: device instance
+  * @param  epnum: endpoint number
+  * @retval status
+  */
+static uint8_t USBD_BB_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
+{
+  /* Prevent unused argument compilation warning */
+  UNUSED(pdev);
+  UNUSED(epnum);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_BB_DataOut
+  *         Data received on non-control Out endpoint
+  * @param  pdev: device instance
+  * @param  epnum: endpoint number
+  * @retval status
+  */
+static uint8_t USBD_BB_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
+{
+  /* Prevent unused argument compilation warning */
+  UNUSED(pdev);
+  UNUSED(epnum);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_BB_EP0_RxReady
+  *         Handle EP0 Rx Ready event
+  * @param  pdev: device instance
+  * @retval status
+  */
+static uint8_t USBD_BB_EP0_RxReady(USBD_HandleTypeDef *pdev)
+{
+  /* Prevent unused argument compilation warning */
+  UNUSED(pdev);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_BB_GetCfgDesc
+  *         return configuration descriptor
+  * @param  speed : current device speed
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+static uint8_t *USBD_BB_GetCfgDesc(uint16_t *length)
+{
+  *length = (uint16_t)sizeof(USBD_BB_CfgDesc);
+  return USBD_BB_CfgDesc;
+}
+
+/**
+  * @brief  USBD_BB_GetOtherSpeedCfgDesc
+  *         return other speed configuration descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+uint8_t *USBD_BB_GetOtherSpeedCfgDesc(uint16_t *length)
+{
+  *length = (uint16_t)sizeof(USBD_BB_OtherSpeedCfgDesc);
+  return USBD_BB_OtherSpeedCfgDesc;
+}
+
+/**
+  * @brief  DeviceQualifierDescriptor
+  *         return Device Qualifier descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+static uint8_t *USBD_BB_GetDeviceQualifierDesc(uint16_t *length)
+{
+  *length = (uint16_t)sizeof(USBD_BB_DeviceQualifierDesc);
+  return USBD_BB_DeviceQualifierDesc;
+}
+
+
+#if (USBD_CLASS_BOS_ENABLED == 1U)
+/**
+  * @brief  USBD_BB_GetNextDesc
+  *         This function return the next descriptor header
+  * @param  buf: Buffer where the descriptor is available
+  * @param  ptr: data pointer inside the descriptor
+  * @retval next header
+  */
+USBD_BB_DescHeader_t *USBD_BB_GetNextDesc(uint8_t *pbuf, uint16_t *ptr)
+{
+  USBD_BB_DescHeader_t *pnext = (USBD_BB_DescHeader_t *)pbuf;
+
+  *ptr += pnext->bLength;
+  pnext = (USBD_BB_DescHeader_t *)(pbuf + pnext->bLength);
+
+  return (pnext);
+}
+
+
+/**
+  * @brief  USBD_BB_GetCapDesc
+  *         This function return the Billboard Capability descriptor
+  * @param  pdev: device instance
+  * @param  pBosDesc:  pointer to Bos descriptor
+  * @retval pointer to Billboard Capability descriptor
+  */
+void *USBD_BB_GetCapDesc(USBD_HandleTypeDef *pdev, uint8_t *pBosDesc)
+{
+  UNUSED(pdev);
+
+  USBD_BB_DescHeader_t *pdesc = (USBD_BB_DescHeader_t *)pBosDesc;
+  USBD_BosDescTypedef *desc = (USBD_BosDescTypedef *)pBosDesc;
+  USBD_BosBBCapDescTypedef *pCapDesc = NULL;
+  uint16_t ptr;
+
+  if (desc->wTotalLength > desc->bLength)
+  {
+    ptr = desc->bLength;
+
+    while (ptr < desc->wTotalLength)
+    {
+      pdesc = USBD_BB_GetNextDesc((uint8_t *)pdesc, &ptr);
+
+      if (pdesc->bDevCapabilityType == USBD_BILLBOARD_CAPABILITY)
+      {
+        pCapDesc = (USBD_BosBBCapDescTypedef *)pdesc;
+        break;
+      }
+    }
+  }
+  return (void *)pCapDesc;
+}
+
+
+/**
+  * @brief  USBD_BB_GetAltModeDesc
+  *         This function return the Billboard Alternate Mode descriptor
+  * @param  pdev: device instance
+  * @param  pBosDesc:  pointer to Bos descriptor
+  * @param  idx:  Index of requested Alternate Mode descriptor
+  * @retval pointer to Alternate Mode descriptor
+  */
+void *USBD_BB_GetAltModeDesc(USBD_HandleTypeDef *pdev, uint8_t *pBosDesc, uint8_t idx)
+{
+  UNUSED(pdev);
+
+  USBD_BB_DescHeader_t *pdesc = (USBD_BB_DescHeader_t *)pBosDesc;
+  USBD_BosDescTypedef *desc = (USBD_BosDescTypedef *)pBosDesc;
+  USBD_BB_AltModeCapDescTypeDef *pAltModDesc = NULL;
+  uint8_t cnt = 0U;
+  uint16_t ptr;
+
+  if (desc->wTotalLength > desc->bLength)
+  {
+    ptr = desc->bLength;
+
+    while (ptr < desc->wTotalLength)
+    {
+      pdesc = USBD_BB_GetNextDesc((uint8_t *)pdesc, &ptr);
+
+      if (pdesc->bDevCapabilityType == USBD_BILLBOARD_ALTMODE_CAPABILITY)
+      {
+        if (cnt == idx)
+        {
+          pAltModDesc = (USBD_BB_AltModeCapDescTypeDef *)pdesc;
+          break;
+        }
+        else
+        {
+          cnt++;
+        }
+      }
+    }
+  }
+  return (void *)pAltModDesc;
+}
+#endif
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC/Inc/usbd_cdc.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_CDC_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,11 +46,11 @@
 #define CDC_CMD_EP                                  0x82U  /* EP2 for CDC commands */
 
 #ifndef CDC_HS_BINTERVAL
-  #define CDC_HS_BINTERVAL                          0x10U
+#define CDC_HS_BINTERVAL                            0x10U
 #endif /* CDC_HS_BINTERVAL */
 
 #ifndef CDC_FS_BINTERVAL
-  #define CDC_FS_BINTERVAL                          0x10U
+#define CDC_FS_BINTERVAL                            0x10U
 #endif /* CDC_FS_BINTERVAL */
 
 /* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
@@ -96,16 +96,16 @@ typedef struct
   uint8_t  format;
   uint8_t  paritytype;
   uint8_t  datatype;
-}USBD_CDC_LineCodingTypeDef;
+} USBD_CDC_LineCodingTypeDef;
 
 typedef struct _USBD_CDC_Itf
 {
-  int8_t (* Init)          (void);
+  int8_t (* Init)(void);
-  int8_t (* DeInit)        (void);
+  int8_t (* DeInit)(void);
-  int8_t (* Control)       (uint8_t cmd, uint8_t* pbuf, uint16_t length);
+  int8_t (* Control)(uint8_t cmd, uint8_t *pbuf, uint16_t length);
-  int8_t (* Receive)       (uint8_t* Buf, uint32_t *Len);
+  int8_t (* Receive)(uint8_t *Buf, uint32_t *Len);
-
+  int8_t (* TransmitCplt)(uint8_t *Buf, uint32_t *Len, uint8_t epnum);
-}USBD_CDC_ItfTypeDef;
+} USBD_CDC_ItfTypeDef;
 
 
 typedef struct
@@ -120,8 +120,7 @@ typedef struct
 
   __IO uint32_t TxState;
   __IO uint32_t RxState;
-}
+} USBD_CDC_HandleTypeDef;
-USBD_CDC_HandleTypeDef;
 
 
 
@@ -146,19 +145,15 @@ extern USBD_ClassTypeDef  USBD_CDC;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t  USBD_CDC_RegisterInterface  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_RegisterInterface(USBD_HandleTypeDef *pdev,
                                    USBD_CDC_ItfTypeDef *fops);
 
-uint8_t  USBD_CDC_SetTxBuffer        (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
-                                      uint8_t  *pbuff,
+                             uint32_t length);
-                                      uint16_t length);
 
-uint8_t  USBD_CDC_SetRxBuffer        (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
-                                      uint8_t  *pbuff);
+uint8_t USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev);
-
+uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
-uint8_t  USBD_CDC_ReceivePacket      (USBD_HandleTypeDef *pdev);
-
-uint8_t  USBD_CDC_TransmitPacket     (USBD_HandleTypeDef *pdev);
 /**
   * @}
   */

Class/CDC/Inc/usbd_cdc_if_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_CDC_IF_TEMPLATE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/

Class/CDC/Src/usbd_cdc.c

@@ -45,15 +45,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_cdc.h"
@@ -99,33 +99,18 @@
   * @{
   */
 
+static uint8_t USBD_CDC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_CDC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_CDC_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static uint8_t USBD_CDC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_CDC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_CDC_EP0_RxReady(USBD_HandleTypeDef *pdev);
 
-static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev,
+static uint8_t *USBD_CDC_GetFSCfgDesc(uint16_t *length);
-                               uint8_t cfgidx);
+static uint8_t *USBD_CDC_GetHSCfgDesc(uint16_t *length);
-
+static uint8_t *USBD_CDC_GetOtherSpeedCfgDesc(uint16_t *length);
-static uint8_t  USBD_CDC_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t *USBD_CDC_GetOtherSpeedCfgDesc(uint16_t *length);
-                                 uint8_t cfgidx);
+uint8_t *USBD_CDC_GetDeviceQualifierDescriptor(uint16_t *length);
-
-static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req);
-
-static uint8_t  USBD_CDC_DataIn (USBD_HandleTypeDef *pdev,
-                                 uint8_t epnum);
-
-static uint8_t  USBD_CDC_DataOut (USBD_HandleTypeDef *pdev,
-                                 uint8_t epnum);
-
-static uint8_t  USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  *USBD_CDC_GetFSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CDC_GetHSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CDC_GetOtherSpeedCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CDC_GetOtherSpeedCfgDesc (uint16_t *length);
-
-uint8_t  *USBD_CDC_GetDeviceQualifierDescriptor (uint16_t *length);
 
 /* USB Standard Device Descriptor */
 __ALIGN_BEGIN static uint8_t USBD_CDC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
@@ -171,9 +156,9 @@ USBD_ClassTypeDef  USBD_CDC =
 };
 
 /* USB CDC device Configuration Descriptor */
-__ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
 {
-  /*Configuration Descriptor*/
+  /* Configuration Descriptor */
   0x09,                                       /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                /* bDescriptorType: Configuration */
   USB_CDC_CONFIG_DESC_SIZ,                    /* wTotalLength:no of returned bytes */
@@ -186,7 +171,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
 
   /*---------------------------------------------------------------------------*/
 
-  /*Interface Descriptor */
+  /* Interface Descriptor */
   0x09,                                       /* bLength: Interface Descriptor size */
   USB_DESC_TYPE_INTERFACE,                    /* bDescriptorType: Interface */
                                               /* Interface descriptor type */
@@ -198,34 +183,34 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
   0x00,                                       /* iInterface: */
 
-  /*Header Functional Descriptor*/
+  /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x00,                                       /* bDescriptorSubtype: Header Func Desc */
   0x10,                                       /* bcdCDC: spec release number */
   0x01,
 
-  /*Call Management Functional Descriptor*/
+  /* Call Management Functional Descriptor */
   0x05,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x01,                                       /* bDescriptorSubtype: Call Management Func Desc */
   0x00,                                       /* bmCapabilities: D0+D1 */
   0x01,                                       /* bDataInterface: 1 */
 
-  /*ACM Functional Descriptor*/
+  /* ACM Functional Descriptor */
   0x04,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x02,                                       /* bDescriptorSubtype: Abstract Control Management desc */
   0x02,                                       /* bmCapabilities */
 
-  /*Union Functional Descriptor*/
+  /* Union Functional Descriptor */
   0x05,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x06,                                       /* bDescriptorSubtype: Union func desc */
   0x00,                                       /* bMasterInterface: Communication class interface */
   0x01,                                       /* bSlaveInterface0: Data Class Interface */
 
-  /*Endpoint 2 Descriptor*/
+  /* Endpoint 2 Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
@@ -235,7 +220,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   CDC_HS_BINTERVAL,                           /* bInterval: */
   /*---------------------------------------------------------------------------*/
 
-  /*Data class interface descriptor*/
+  /* Data class interface descriptor */
   0x09,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_INTERFACE,                    /* bDescriptorType: */
   0x01,                                       /* bInterfaceNumber: Number of Interface */
@@ -246,7 +231,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x00,                                       /* bInterfaceProtocol: */
   0x00,                                       /* iInterface: */
 
-  /*Endpoint OUT Descriptor*/
+  /* Endpoint OUT Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_OUT_EP,                                 /* bEndpointAddress */
@@ -255,7 +240,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
   0x00,                                       /* bInterval: ignore for Bulk transfer */
 
-  /*Endpoint IN Descriptor*/
+  /* Endpoint IN Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_IN_EP,                                  /* bEndpointAddress */
@@ -263,13 +248,13 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),        /* wMaxPacketSize: */
   HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
   0x00                                        /* bInterval: ignore for Bulk transfer */
-} ;
+};
 
 
 /* USB CDC device Configuration Descriptor */
-__ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
 {
-  /*Configuration Descriptor*/
+  /* Configuration Descriptor */
   0x09,                                       /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                /* bDescriptorType: Configuration */
   USB_CDC_CONFIG_DESC_SIZ,                    /* wTotalLength:no of returned bytes */
@@ -282,7 +267,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
 
   /*---------------------------------------------------------------------------*/
 
-  /*Interface Descriptor */
+  /* Interface Descriptor */
   0x09,                                       /* bLength: Interface Descriptor size */
   USB_DESC_TYPE_INTERFACE,                    /* bDescriptorType: Interface */
   /* Interface descriptor type */
@@ -294,34 +279,34 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
   0x00,                                       /* iInterface: */
 
-  /*Header Functional Descriptor*/
+  /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x00,                                       /* bDescriptorSubtype: Header Func Desc */
   0x10,                                       /* bcdCDC: spec release number */
   0x01,
 
-  /*Call Management Functional Descriptor*/
+  /* Call Management Functional Descriptor */
   0x05,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x01,                                       /* bDescriptorSubtype: Call Management Func Desc */
   0x00,                                       /* bmCapabilities: D0+D1 */
   0x01,                                       /* bDataInterface: 1 */
 
-  /*ACM Functional Descriptor*/
+  /* ACM Functional Descriptor */
   0x04,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x02,                                       /* bDescriptorSubtype: Abstract Control Management desc */
   0x02,                                       /* bmCapabilities */
 
-  /*Union Functional Descriptor*/
+  /* Union Functional Descriptor */
   0x05,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x06,                                       /* bDescriptorSubtype: Union func desc */
   0x00,                                       /* bMasterInterface: Communication class interface */
   0x01,                                       /* bSlaveInterface0: Data Class Interface */
 
-  /*Endpoint 2 Descriptor*/
+  /* Endpoint 2 Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
@@ -331,7 +316,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   CDC_FS_BINTERVAL,                           /* bInterval: */
   /*---------------------------------------------------------------------------*/
 
-  /*Data class interface descriptor*/
+  /* Data class interface descriptor */
   0x09,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_INTERFACE,                    /* bDescriptorType: */
   0x01,                                       /* bInterfaceNumber: Number of Interface */
@@ -342,7 +327,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x00,                                       /* bInterfaceProtocol: */
   0x00,                                       /* iInterface: */
 
-  /*Endpoint OUT Descriptor*/
+  /* Endpoint OUT Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_OUT_EP,                                 /* bEndpointAddress */
@@ -351,7 +336,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
   0x00,                                       /* bInterval: ignore for Bulk transfer */
 
-  /*Endpoint IN Descriptor*/
+  /* Endpoint IN Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_IN_EP,                                  /* bEndpointAddress */
@@ -359,9 +344,9 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),        /* wMaxPacketSize: */
   HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
   0x00                                        /* bInterval: ignore for Bulk transfer */
-} ;
+};
 
-__ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
 {
   0x09,                                       /* bLength: Configuation Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
@@ -385,7 +370,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
   0x00,                                       /* iInterface: */
 
-  /*Header Functional Descriptor*/
+  /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x00,                                       /* bDescriptorSubtype: Header Func Desc */
@@ -414,7 +399,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
 
   /*Endpoint 2 Descriptor*/
   0x07,                                       /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT      ,   /* bDescriptorType: Endpoint */
+  USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
   0x03,                                       /* bmAttributes: Interrupt */
   LOBYTE(CDC_CMD_PACKET_SIZE),                /* wMaxPacketSize: */
@@ -468,54 +453,60 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+static uint8_t USBD_CDC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  uint8_t ret = 0U;
+  UNUSED(cfgidx);
   USBD_CDC_HandleTypeDef *hcdc;
 
-  if(pdev->dev_speed == USBD_SPEED_HIGH)
+  hcdc = USBD_malloc(sizeof(USBD_CDC_HandleTypeDef));
+
+  if (hcdc == NULL)
+  {
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
+  }
+
+  pdev->pClassData = (void *)hcdc;
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
   {
     /* Open EP IN */
-    USBD_LL_OpenEP(pdev, CDC_IN_EP, USBD_EP_TYPE_BULK,
+    (void)USBD_LL_OpenEP(pdev, CDC_IN_EP, USBD_EP_TYPE_BULK,
                          CDC_DATA_HS_IN_PACKET_SIZE);
 
      pdev->ep_in[CDC_IN_EP & 0xFU].is_used = 1U;
 
      /* Open EP OUT */
-    USBD_LL_OpenEP(pdev, CDC_OUT_EP, USBD_EP_TYPE_BULK,
+     (void)USBD_LL_OpenEP(pdev, CDC_OUT_EP, USBD_EP_TYPE_BULK,
                           CDC_DATA_HS_OUT_PACKET_SIZE);
 
       pdev->ep_out[CDC_OUT_EP & 0xFU].is_used = 1U;
 
+      /* Set bInterval for CDC CMD Endpoint */
+      pdev->ep_in[CDC_CMD_EP & 0xFU].bInterval = CDC_HS_BINTERVAL;
   }
   else
   {
     /* Open EP IN */
-    USBD_LL_OpenEP(pdev, CDC_IN_EP, USBD_EP_TYPE_BULK,
+    (void)USBD_LL_OpenEP(pdev, CDC_IN_EP, USBD_EP_TYPE_BULK,
                          CDC_DATA_FS_IN_PACKET_SIZE);
 
      pdev->ep_in[CDC_IN_EP & 0xFU].is_used = 1U;
 
      /* Open EP OUT */
-    USBD_LL_OpenEP(pdev, CDC_OUT_EP, USBD_EP_TYPE_BULK,
+     (void)USBD_LL_OpenEP(pdev, CDC_OUT_EP, USBD_EP_TYPE_BULK,
                           CDC_DATA_FS_OUT_PACKET_SIZE);
 
       pdev->ep_out[CDC_OUT_EP & 0xFU].is_used = 1U;
+
+      /* Set bInterval for CMD Endpoint */
+      pdev->ep_in[CDC_CMD_EP & 0xFU].bInterval = CDC_FS_BINTERVAL;
   }
+
   /* Open Command IN EP */
-  USBD_LL_OpenEP(pdev, CDC_CMD_EP, USBD_EP_TYPE_INTR, CDC_CMD_PACKET_SIZE);
+  (void)USBD_LL_OpenEP(pdev, CDC_CMD_EP, USBD_EP_TYPE_INTR, CDC_CMD_PACKET_SIZE);
   pdev->ep_in[CDC_CMD_EP & 0xFU].is_used = 1U;
 
-  pdev->pClassData = USBD_malloc(sizeof (USBD_CDC_HandleTypeDef));
-
-  if(pdev->pClassData == NULL)
-  {
-    ret = 1U;
-  }
-  else
-  {
-    hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
-
   /* Init  physical Interface components */
   ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Init();
 
@@ -523,20 +514,20 @@ static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   hcdc->TxState = 0U;
   hcdc->RxState = 0U;
 
-    if(pdev->dev_speed == USBD_SPEED_HIGH)
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
   {
     /* Prepare Out endpoint to receive next packet */
-      USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
+    (void)USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
                                  CDC_DATA_HS_OUT_PACKET_SIZE);
   }
   else
   {
     /* Prepare Out endpoint to receive next packet */
-      USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
+    (void)USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
                                  CDC_DATA_FS_OUT_PACKET_SIZE);
   }
-  }
+
-  return ret;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -546,27 +537,29 @@ static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_CDC_DeInit (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+static uint8_t USBD_CDC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
   uint8_t ret = 0U;
 
   /* Close EP IN */
-  USBD_LL_CloseEP(pdev, CDC_IN_EP);
+  (void)USBD_LL_CloseEP(pdev, CDC_IN_EP);
   pdev->ep_in[CDC_IN_EP & 0xFU].is_used = 0U;
 
   /* Close EP OUT */
-  USBD_LL_CloseEP(pdev, CDC_OUT_EP);
+  (void)USBD_LL_CloseEP(pdev, CDC_OUT_EP);
   pdev->ep_out[CDC_OUT_EP & 0xFU].is_used = 0U;
 
   /* Close Command IN EP */
-  USBD_LL_CloseEP(pdev, CDC_CMD_EP);
+  (void)USBD_LL_CloseEP(pdev, CDC_CMD_EP);
   pdev->ep_in[CDC_CMD_EP & 0xFU].is_used = 0U;
+  pdev->ep_in[CDC_CMD_EP & 0xFU].bInterval = 0U;
 
   /* DeInit  physical Interface components */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData != NULL)
   {
     ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->DeInit();
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
 
@@ -580,39 +573,39 @@ static uint8_t  USBD_CDC_DeInit (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CDC_Setup(USBD_HandleTypeDef *pdev,
                               USBD_SetupReqTypedef *req)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
   uint8_t ifalt = 0U;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-  case USB_REQ_TYPE_CLASS :
+  case USB_REQ_TYPE_CLASS:
-    if (req->wLength)
+    if (req->wLength != 0U)
     {
-      if (req->bmRequest & 0x80U)
+      if ((req->bmRequest & 0x80U) != 0U)
       {
         ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Control(req->bRequest,
-                                                          (uint8_t *)(void *)hcdc->data,
+                                                          (uint8_t *)hcdc->data,
                                                           req->wLength);
 
-          USBD_CtlSendData (pdev, (uint8_t *)(void *)hcdc->data, req->wLength);
+          (void)USBD_CtlSendData(pdev, (uint8_t *)hcdc->data, req->wLength);
       }
       else
       {
         hcdc->CmdOpCode = req->bRequest;
         hcdc->CmdLength = (uint8_t)req->wLength;
 
-        USBD_CtlPrepareRx (pdev, (uint8_t *)(void *)hcdc->data, req->wLength);
+        (void)USBD_CtlPrepareRx(pdev, (uint8_t *)hcdc->data, req->wLength);
       }
     }
     else
     {
       ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Control(req->bRequest,
-                                                        (uint8_t *)(void *)req, 0U);
+                                                        (uint8_t *)req, 0U);
     }
     break;
 
@@ -622,11 +615,11 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
@@ -634,11 +627,11 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, &ifalt, 1U);
+        (void)USBD_CtlSendData(pdev, &ifalt, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
@@ -646,25 +639,28 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_SET_INTERFACE:
       if (pdev->dev_state != USBD_STATE_CONFIGURED)
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -674,31 +670,34 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
   * @param  epnum: endpoint number
   * @retval status
   */
-static uint8_t  USBD_CDC_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_CDC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
-  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef*)pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc;
   PCD_HandleTypeDef *hpcd = pdev->pData;
 
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData == NULL)
   {
-    if((pdev->ep_in[epnum].total_length > 0U) && ((pdev->ep_in[epnum].total_length % hpcd->IN_ep[epnum].maxpacket) == 0U))
+    return (uint8_t)USBD_FAIL;
+  }
+
+  hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
+
+  if ((pdev->ep_in[epnum].total_length > 0U) &&
+      ((pdev->ep_in[epnum].total_length % hpcd->IN_ep[epnum].maxpacket) == 0U))
   {
     /* Update the packet total length */
     pdev->ep_in[epnum].total_length = 0U;
 
     /* Send ZLP */
-      USBD_LL_Transmit (pdev, epnum, NULL, 0U);
+    (void)USBD_LL_Transmit(pdev, epnum, NULL, 0U);
   }
   else
   {
     hcdc->TxState = 0U;
+    ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->TransmitCplt(hcdc->TxBuffer, &hcdc->TxLength, epnum);
   }
-    return USBD_OK;
+
-  }
+  return (uint8_t)USBD_OK;
-  else
-  {
-    return USBD_FAIL;
-  }
 }
 
 /**
@@ -708,25 +707,24 @@ static uint8_t  USBD_CDC_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum)
   * @param  epnum: endpoint number
   * @retval status
   */
-static uint8_t  USBD_CDC_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_CDC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
+
+  if (pdev->pClassData == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   /* Get the received data length */
-  hcdc->RxLength = USBD_LL_GetRxDataSize (pdev, epnum);
+  hcdc->RxLength = USBD_LL_GetRxDataSize(pdev, epnum);
 
   /* USB data will be immediately processed, this allow next USB traffic being
   NAKed till the end of the application Xfer */
-  if(pdev->pClassData != NULL)
+
-  {
   ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Receive(hcdc->RxBuffer, &hcdc->RxLength);
 
-    return USBD_OK;
+  return (uint8_t)USBD_OK;
-  }
-  else
-  {
-    return USBD_FAIL;
-  }
 }
 
 /**
@@ -735,19 +733,20 @@ static uint8_t  USBD_CDC_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_CDC_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
-  if((pdev->pUserData != NULL) && (hcdc->CmdOpCode != 0xFFU))
+  if ((pdev->pUserData != NULL) && (hcdc->CmdOpCode != 0xFFU))
   {
     ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Control(hcdc->CmdOpCode,
-                                                      (uint8_t *)(void *)hcdc->data,
+                                                      (uint8_t *)hcdc->data,
                                                       (uint16_t)hcdc->CmdLength);
     hcdc->CmdOpCode = 0xFFU;
 
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -757,9 +756,10 @@ static uint8_t  USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CDC_GetFSCfgDesc (uint16_t *length)
+static uint8_t *USBD_CDC_GetFSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CDC_CfgFSDesc);
+  *length = (uint16_t)sizeof(USBD_CDC_CfgFSDesc);
+
   return USBD_CDC_CfgFSDesc;
 }
 
@@ -770,9 +770,10 @@ static uint8_t  *USBD_CDC_GetFSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CDC_GetHSCfgDesc (uint16_t *length)
+static uint8_t *USBD_CDC_GetHSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CDC_CfgHSDesc);
+  *length = (uint16_t)sizeof(USBD_CDC_CfgHSDesc);
+
   return USBD_CDC_CfgHSDesc;
 }
 
@@ -783,9 +784,10 @@ static uint8_t  *USBD_CDC_GetHSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CDC_GetOtherSpeedCfgDesc (uint16_t *length)
+static uint8_t *USBD_CDC_GetOtherSpeedCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CDC_OtherSpeedCfgDesc);
+  *length = (uint16_t)sizeof(USBD_CDC_OtherSpeedCfgDesc);
+
   return USBD_CDC_OtherSpeedCfgDesc;
 }
 
@@ -795,9 +797,10 @@ static uint8_t  *USBD_CDC_GetOtherSpeedCfgDesc (uint16_t *length)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_CDC_GetDeviceQualifierDescriptor (uint16_t *length)
+uint8_t *USBD_CDC_GetDeviceQualifierDescriptor(uint16_t *length)
 {
-  *length = sizeof (USBD_CDC_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_CDC_DeviceQualifierDesc);
+
   return USBD_CDC_DeviceQualifierDesc;
 }
 
@@ -807,18 +810,17 @@ uint8_t  *USBD_CDC_GetDeviceQualifierDescriptor (uint16_t *length)
   * @param  fops: CD  Interface callback
   * @retval status
   */
-uint8_t  USBD_CDC_RegisterInterface  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_RegisterInterface(USBD_HandleTypeDef *pdev,
                                    USBD_CDC_ItfTypeDef *fops)
 {
-  uint8_t  ret = USBD_FAIL;
+  if (fops == NULL)
-
-  if(fops != NULL)
   {
-    pdev->pUserData= fops;
+    return (uint8_t)USBD_FAIL;
-    ret = USBD_OK;
   }
 
-  return ret;
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -827,16 +829,15 @@ uint8_t  USBD_CDC_RegisterInterface  (USBD_HandleTypeDef   *pdev,
   * @param  pbuff: Tx Buffer
   * @retval status
   */
-uint8_t  USBD_CDC_SetTxBuffer  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev,
-                                uint8_t  *pbuff,
+                             uint8_t *pbuff, uint32_t length)
-                                uint16_t length)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
   hcdc->TxBuffer = pbuff;
   hcdc->TxLength = length;
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 
@@ -846,14 +847,13 @@ uint8_t  USBD_CDC_SetTxBuffer  (USBD_HandleTypeDef   *pdev,
   * @param  pbuff: Rx Buffer
   * @retval status
   */
-uint8_t  USBD_CDC_SetRxBuffer  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff)
-                                   uint8_t  *pbuff)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
   hcdc->RxBuffer = pbuff;
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -864,11 +864,15 @@ uint8_t  USBD_CDC_SetRxBuffer  (USBD_HandleTypeDef   *pdev,
   */
 uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
+  USBD_StatusTypeDef ret = USBD_BUSY;
 
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData == NULL)
   {
-    if(hcdc->TxState == 0U)
+    return (uint8_t)USBD_FAIL;
+  }
+
+  if (hcdc->TxState == 0U)
   {
     /* Tx Transfer in progress */
     hcdc->TxState = 1U;
@@ -877,20 +881,12 @@ uint8_t  USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev)
     pdev->ep_in[CDC_IN_EP & 0xFU].total_length = hcdc->TxLength;
 
     /* Transmit next packet */
-      USBD_LL_Transmit(pdev, CDC_IN_EP, hcdc->TxBuffer,
+    (void)USBD_LL_Transmit(pdev, CDC_IN_EP, hcdc->TxBuffer, hcdc->TxLength);
-                       (uint16_t)hcdc->TxLength);
 
-      return USBD_OK;
+    ret = USBD_OK;
-    }
-    else
-    {
-      return USBD_BUSY;
-    }
-  }
-  else
-  {
-    return USBD_FAIL;
   }
+
+  return (uint8_t)ret;
 }
 
 
@@ -902,33 +898,27 @@ uint8_t  USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev)
   */
 uint8_t USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev)
 {
-  USBD_CDC_HandleTypeDef   *hcdc = (USBD_CDC_HandleTypeDef*) pdev->pClassData;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
-  /* Suspend or Resume USB Out process */
+  if (pdev->pClassData == NULL)
-  if(pdev->pClassData != NULL)
   {
-    if(pdev->dev_speed == USBD_SPEED_HIGH  )
+    return (uint8_t)USBD_FAIL;
+  }
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
   {
     /* Prepare Out endpoint to receive next packet */
-      USBD_LL_PrepareReceive(pdev,
+    (void)USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
-                             CDC_OUT_EP,
-                             hcdc->RxBuffer,
                                  CDC_DATA_HS_OUT_PACKET_SIZE);
   }
   else
   {
     /* Prepare Out endpoint to receive next packet */
-      USBD_LL_PrepareReceive(pdev,
+    (void)USBD_LL_PrepareReceive(pdev, CDC_OUT_EP, hcdc->RxBuffer,
-                             CDC_OUT_EP,
-                             hcdc->RxBuffer,
                                  CDC_DATA_FS_OUT_PACKET_SIZE);
   }
-    return USBD_OK;
+
-  }
+  return (uint8_t)USBD_OK;
-  else
-  {
-    return USBD_FAIL;
-  }
 }
 /**
   * @}

Class/CDC/Src/usbd_cdc_if_template.c

@@ -12,15 +12,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_cdc_if_template.h"
@@ -64,26 +64,28 @@
   * @{
   */
 
-static int8_t TEMPLATE_Init     (void);
+static int8_t TEMPLATE_Init(void);
-static int8_t TEMPLATE_DeInit   (void);
+static int8_t TEMPLATE_DeInit(void);
-static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length);
+static int8_t TEMPLATE_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length);
-static int8_t TEMPLATE_Receive  (uint8_t* pbuf, uint32_t *Len);
+static int8_t TEMPLATE_Receive(uint8_t *pbuf, uint32_t *Len);
+static int8_t TEMPLATE_TransmitCplt(uint8_t *pbuf, uint32_t *Len, uint8_t epnum);
 
 USBD_CDC_ItfTypeDef USBD_CDC_Template_fops =
 {
   TEMPLATE_Init,
   TEMPLATE_DeInit,
   TEMPLATE_Control,
-  TEMPLATE_Receive
+  TEMPLATE_Receive,
+  TEMPLATE_TransmitCplt
 };
 
 USBD_CDC_LineCodingTypeDef linecoding =
-  {
+{
   115200, /* baud rate*/
   0x00,   /* stop bits-1*/
   0x00,   /* parity - none*/
   0x08    /* nb. of bits 8*/
-  };
+};
 
 /* Private functions ---------------------------------------------------------*/
 
@@ -124,7 +126,7 @@ static int8_t TEMPLATE_DeInit(void)
   * @param  Len: Number of data to be sent (in bytes)
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
+static int8_t TEMPLATE_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length)
 {
   switch (cmd)
   {
@@ -149,7 +151,7 @@ static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
       break;
 
     case CDC_SET_LINE_CODING:
-    linecoding.bitrate    = (uint32_t)(pbuf[0] | (pbuf[1] << 8) |\
+      linecoding.bitrate    = (uint32_t)(pbuf[0] | (pbuf[1] << 8) | \
                                          (pbuf[2] << 16) | (pbuf[3] << 24));
       linecoding.format     = pbuf[4];
       linecoding.paritytype = pbuf[5];
@@ -192,7 +194,7 @@ static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
   *
   *         @note
   *         This function will issue a NAK packet on any OUT packet received on
-  *         USB endpoint untill exiting this function. If you exit this function
+  *         USB endpoint until exiting this function. If you exit this function
   *         before transfer is complete on CDC interface (ie. using DMA controller)
   *         it will result in receiving more data while previous ones are still
   *         not sent.
@@ -201,8 +203,31 @@ static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
   * @param  Len: Number of data received (in bytes)
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_Receive (uint8_t* Buf, uint32_t *Len)
+static int8_t TEMPLATE_Receive(uint8_t *Buf, uint32_t *Len)
 {
+  UNUSED(Buf);
+  UNUSED(Len);
+
+  return (0);
+}
+
+/**
+  * @brief  TEMPLATE_TransmitCplt
+  *         Data transmited callback
+  *
+  *         @note
+  *         This function is IN transfer complete callback used to inform user that
+  *         the submitted Data is successfully sent over USB.
+  *
+  * @param  Buf: Buffer of data to be received
+  * @param  Len: Number of data received (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t TEMPLATE_TransmitCplt(uint8_t *Buf, uint32_t *Len, uint8_t epnum)
+{
+  UNUSED(Buf);
+  UNUSED(Len);
+  UNUSED(epnum);
 
   return (0);
 }

Class/CDC_ECM/Inc/usbd_cdc_ecm.h

@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    usbd_cdc_ecm.h
+  * @author  MCD Application Team
+  * @brief   header file for the usbd_cdc_ecm.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                      www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USB_CDC_ECM_H
+#define __USB_CDC_ECM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup usbd_cdc_ecm
+  * @brief This file is the Header file for usbd_cdc_ecm.c
+  * @{
+  */
+
+
+/** @defgroup usbd_cdc_ecm_Exported_Defines
+  * @{
+  */
+/* Comment this define in order to disable the CDC ECM Notification pipe */
+
+
+#define CDC_ECM_IN_EP                                   0x81U  /* EP1 for data IN */
+#define CDC_ECM_OUT_EP                                  0x01U  /* EP1 for data OUT */
+#define CDC_ECM_CMD_EP                                  0x82U  /* EP2 for CDC ECM commands */
+
+#ifndef CDC_ECM_CMD_ITF_NBR
+#define CDC_ECM_CMD_ITF_NBR                             0x00U /* Command Interface Number 0 */
+#endif /* CDC_ECM_CMD_ITF_NBR */
+
+#ifndef CDC_ECM_COM_ITF_NBR
+#define CDC_ECM_COM_ITF_NBR                             0x01U /* Communication Interface Number 0 */
+#endif /* CDC_ECM_CMD_ITF_NBR */
+
+#ifndef CDC_ECM_HS_BINTERVAL
+#define CDC_ECM_HS_BINTERVAL                            0x10U
+#endif /* CDC_ECM_HS_BINTERVAL */
+
+#ifndef CDC_ECM_FS_BINTERVAL
+#define CDC_ECM_FS_BINTERVAL                            0x10U
+#endif /* CDC_ECM_FS_BINTERVAL */
+
+#ifndef USBD_SUPPORT_USER_STRING_DESC
+#define USBD_SUPPORT_USER_STRING_DESC                   1U
+#endif /* USBD_SUPPORT_USER_STRING_DESC */
+
+/* CDC_ECM Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
+#define CDC_ECM_DATA_HS_MAX_PACKET_SIZE                 512U  /* Endpoint IN & OUT Packet size */
+#define CDC_ECM_DATA_FS_MAX_PACKET_SIZE                 64U   /* Endpoint IN & OUT Packet size */
+#define CDC_ECM_CMD_PACKET_SIZE                         16U    /* Control Endpoint Packet size */
+
+#define CDC_ECM_CONFIG_DESC_SIZ                         79U
+
+#define CDC_ECM_DATA_HS_IN_PACKET_SIZE                  CDC_ECM_DATA_HS_MAX_PACKET_SIZE
+#define CDC_ECM_DATA_HS_OUT_PACKET_SIZE                 CDC_ECM_DATA_HS_MAX_PACKET_SIZE
+
+#define CDC_ECM_DATA_FS_IN_PACKET_SIZE                  CDC_ECM_DATA_FS_MAX_PACKET_SIZE
+#define CDC_ECM_DATA_FS_OUT_PACKET_SIZE                 CDC_ECM_DATA_FS_MAX_PACKET_SIZE
+
+/*---------------------------------------------------------------------*/
+/*  CDC_ECM definitions                                                    */
+/*---------------------------------------------------------------------*/
+#define CDC_ECM_SEND_ENCAPSULATED_COMMAND                       0x00U
+#define CDC_ECM_GET_ENCAPSULATED_RESPONSE                       0x01U
+#define CDC_ECM_SET_ETH_MULTICAST_FILTERS                       0x40U
+#define CDC_ECM_SET_ETH_PWRM_PATTERN_FILTER                     0x41U
+#define CDC_ECM_GET_ETH_PWRM_PATTERN_FILTER                     0x42U
+#define CDC_ECM_SET_ETH_PACKET_FILTER                           0x43U
+#define CDC_ECM_GET_ETH_STATISTIC                               0x44U
+
+#define CDC_ECM_NET_DISCONNECTED                                0x00U
+#define CDC_ECM_NET_CONNECTED                                   0x01U
+
+
+/* Ethernet statistics definitions */
+#define CDC_ECM_XMIT_OK_VAL                                     CDC_ECM_ETH_STATS_VAL_ENABLED
+#define CDC_ECM_XMIT_OK                                         0x01U
+#define CDC_ECM_RVC_OK                                          0x02U
+#define CDC_ECM_XMIT_ERROR                                      0x04U
+#define CDC_ECM_RCV_ERROR                                       0x08U
+#define CDC_ECM_RCV_NO_BUFFER                                   0x10U
+#define CDC_ECM_DIRECTED_BYTES_XMIT                             0x20U
+#define CDC_ECM_DIRECTED_FRAMES_XMIT                            0x40U
+#define CDC_ECM_MULTICAST_BYTES_XMIT                            0x80U
+
+#define CDC_ECM_MULTICAST_FRAMES_XMIT                           0x01U
+#define CDC_ECM_BROADCAST_BYTES_XMIT                            0x02U
+#define CDC_ECM_BROADCAST_FRAMES_XMIT                           0x04U
+#define CDC_ECM_DIRECTED_BYTES_RCV                              0x08U
+#define CDC_ECM_DIRECTED_FRAMES_RCV                             0x10U
+#define CDC_ECM_MULTICAST_BYTES_RCV                             0x20U
+#define CDC_ECM_MULTICAST_FRAMES_RCV                            0x40U
+#define CDC_ECM_BROADCAST_BYTES_RCV                             0x80U
+
+#define CDC_ECM_BROADCAST_FRAMES_RCV                            0x01U
+#define CDC_ECM_RCV_CRC_ERROR                                   0x02U
+#define CDC_ECM_TRANSMIT_QUEUE_LENGTH                           0x04U
+#define CDC_ECM_RCV_ERROR_ALIGNMENT                             0x08U
+#define CDC_ECM_XMIT_ONE_COLLISION                              0x10U
+#define CDC_ECM_XMIT_MORE_COLLISIONS                            0x20U
+#define CDC_ECM_XMIT_DEFERRED                                   0x40U
+#define CDC_ECM_XMIT_MAX_COLLISIONS                             0x80U
+
+#define CDC_ECM_RCV_OVERRUN                                     0x40U
+#define CDC_ECM_XMIT_UNDERRUN                                   0x40U
+#define CDC_ECM_XMIT_HEARTBEAT_FAILURE                          0x40U
+#define CDC_ECM_XMIT_TIMES_CRS_LOST                             0x40U
+#define CDC_ECM_XMIT_LATE_COLLISIONS                            0x40U
+
+#define CDC_ECM_ETH_STATS_RESERVED                              0xE0U
+#define CDC_ECM_BMREQUEST_TYPE_ECM                              0xA1U
+
+/* MAC String index */
+#define CDC_ECM_MAC_STRING_INDEX                                6U
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CORE_Exported_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+typedef struct
+{
+  int8_t (* Init)(void);
+  int8_t (* DeInit)(void);
+  int8_t (* Control)(uint8_t cmd, uint8_t *pbuf, uint16_t length);
+  int8_t (* Receive)(uint8_t *Buf, uint32_t *Len);
+  int8_t (* TransmitCplt)(uint8_t *Buf, uint32_t *Len, uint8_t epnum);
+  int8_t (* Process)(USBD_HandleTypeDef *pdev);
+  const uint8_t *pStrDesc;
+} USBD_CDC_ECM_ItfTypeDef;
+
+typedef struct
+{
+  uint8_t   bmRequest;
+  uint8_t   bRequest;
+  uint16_t  wValue;
+  uint16_t  wIndex;
+  uint16_t  wLength;
+  uint8_t   data[8];
+} USBD_CDC_ECM_NotifTypeDef;
+
+typedef struct
+{
+  uint32_t data[2000 / 4];      /* Force 32bits alignment */
+  uint8_t  CmdOpCode;
+  uint8_t  CmdLength;
+  uint8_t  Reserved1;  /* Reserved Byte to force 4 bytes alignment of following fields */
+  uint8_t  Reserved2;  /* Reserved Byte to force 4 bytes alignment of following fields */
+  uint8_t  *RxBuffer;
+  uint8_t  *TxBuffer;
+  uint32_t RxLength;
+  uint32_t TxLength;
+
+  __IO uint32_t TxState;
+  __IO uint32_t RxState;
+
+  __IO uint32_t  MaxPcktLen;
+  __IO uint32_t  LinkStatus;
+  __IO uint32_t  NotificationStatus;
+  USBD_CDC_ECM_NotifTypeDef   Req;
+} USBD_CDC_ECM_HandleTypeDef;
+
+typedef enum
+{
+  NETWORK_CONNECTION = 0x00,
+  RESPONSE_AVAILABLE = 0x01,
+  CONNECTION_SPEED_CHANGE = 0x2A
+} USBD_CDC_ECM_NotifCodeTypeDef;
+
+/** @defgroup USBD_CORE_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CORE_Exported_Variables
+  * @{
+  */
+
+extern USBD_ClassTypeDef  USBD_CDC_ECM;
+#define USBD_CDC_ECM_CLASS &USBD_CDC_ECM
+/**
+  * @}
+  */
+
+/** @defgroup USB_CORE_Exported_Functions
+  * @{
+  */
+uint8_t  USBD_CDC_ECM_RegisterInterface(USBD_HandleTypeDef *pdev,
+                                        USBD_CDC_ECM_ItfTypeDef *fops);
+
+uint8_t  USBD_CDC_ECM_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
+                                  uint32_t length);
+
+uint8_t  USBD_CDC_ECM_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
+
+uint8_t  USBD_CDC_ECM_ReceivePacket(USBD_HandleTypeDef *pdev);
+
+uint8_t  USBD_CDC_ECM_TransmitPacket(USBD_HandleTypeDef *pdev);
+
+uint8_t  USBD_CDC_ECM_SendNotification(USBD_HandleTypeDef *pdev,
+                                       USBD_CDC_ECM_NotifCodeTypeDef  Notif,
+                                       uint16_t bVal, uint8_t *pData);
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __USB_CDC_ECM_H */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC_ECM/Inc/usbd_cdc_ecm_if_template.h

@@ -0,0 +1,82 @@
+/**
+  ******************************************************************************
+  * @file    Inc/usbd_cdc_ecm_if_template.h
+  * @author  MCD Application Team
+  * @brief   Header for usbd_cdc_ecm_if_template.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_CDC_ECM_IF_H
+#define __USBD_CDC_ECM_IF_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_cdc_ecm.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* Ensure this MAC address value is same as MAC_ADDRx declared in STM32xxx_conf.h */
+#define CDC_ECM_MAC_STR_DESC                 (uint8_t *)"000202030000"
+#define CDC_ECM_MAC_ADDR0                    0x00U /* 01 */
+#define CDC_ECM_MAC_ADDR1                    0x02U /* 02 */
+#define CDC_ECM_MAC_ADDR2                    0x02U /* 03 */
+#define CDC_ECM_MAC_ADDR3                    0x03U /* 00 */
+#define CDC_ECM_MAC_ADDR4                    0x00U /* 00 */
+#define CDC_ECM_MAC_ADDR5                    0x00U /* 00 */
+
+/* Max Number of Trials waiting for Tx ready */
+#define CDC_ECM_MAX_TX_WAIT_TRIALS           1000000U
+
+#define CDC_ECM_ETH_STATS_BYTE0                                 0U
+/*(uint8_t)(CDC_ECM_XMIT_OK_VAL | CDC_ECM_RVC_OK_VAL | CDC_ECM_XMIT_ERROR_VAL | \
+            CDC_ECM_RCV_ERROR_VAL | CDC_ECM_RCV_NO_BUFFER_VAL | CDC_ECM_DIRECTED_BYTES_XMIT_VAL | \
+            CDC_ECM_DIRECTED_FRAMES_XMIT_VAL | CDC_ECM_MULTICAST_BYTES_XMIT_VAL) */
+
+#define CDC_ECM_ETH_STATS_BYTE1                                 0U
+/*(uint8_t)(CDC_ECM_MULTICAST_FRAMES_XMIT_VAL | CDC_ECM_BROADCAST_BYTES_XMIT_VAL | \
+            CDC_ECM_BROADCAST_FRAMES_XMIT_VAL | CDC_ECM_DIRECTED_BYTES_RCV_VAL | \
+            CDC_ECM_DIRECTED_FRAMES_RCV_VAL | CDC_ECM_MULTICAST_BYTES_RCV_VAL | \
+            CDC_ECM_MULTICAST_FRAMES_RCV_VAL | CDC_ECM_BROADCAST_BYTES_RCV_VAL) */
+
+#define CDC_ECM_ETH_STATS_BYTE2                                 0U
+/*(uint8_t)(CDC_ECM_BROADCAST_FRAMES_RCV_VAL | CDC_ECM_RCV_CRC_ERROR_VAL | \
+            CDC_ECM_TRANSMIT_QUEUE_LENGTH_VAL | CDC_ECM_RCV_ERROR_ALIGNMENT_VAL | \
+            CDC_ECM_XMIT_ONE_COLLISION_VAL | CDC_ECM_XMIT_MORE_COLLISIONS_VAL | \
+            CDC_ECM_XMIT_DEFERRED_VAL | CDC_ECM_XMIT_MAX_COLLISIONS_VAL) */
+
+#define CDC_ECM_ETH_STATS_BYTE3                                 0U
+/*(uint8_t)(CDC_ECM_RCV_OVERRUN_VAL | CDC_ECM_XMIT_UNDERRUN_VAL | CDC_ECM_XMIT_HEARTBEAT_FAILURE_VAL | \
+            CDC_ECM_XMIT_TIMES_CRS_LOST_VAL | CDC_ECM_XMIT_LATE_COLLISIONS_VAL | CDC_ECM_ETH_STATS_RESERVED) */
+
+/* Ethernet Maximum Segment size, typically 1514 bytes */
+#define CDC_ECM_ETH_MAX_SEGSZE                                  1514U
+
+/* Number of Ethernet multicast filters */
+#define CDC_ECM_ETH_NBR_MACFILTERS                              0U
+
+/* Number of wakeup power filters */
+#define CDC_ECM_ETH_NBR_PWRFILTERS                              0U
+
+
+#define CDC_ECM_CONNECT_SPEED_UPSTREAM                          0x004C4B40U /* 5Mbps */
+#define CDC_ECM_CONNECT_SPEED_DOWNSTREAM                        0x004C4B40U /* 5Mbps */
+
+extern USBD_CDC_ECM_ItfTypeDef                          USBD_CDC_ECM_fops;
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+#endif /* __USBD_CDC_ECM_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC_ECM/Src/usbd_cdc_ecm_if_template.c

@@ -0,0 +1,247 @@
+/**
+  ******************************************************************************
+  * @file    Src/usbd_cdc_ecm_if_template.c
+  * @author  MCD Application Team
+  * @brief   Source file for USBD CDC_ECM interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "main.h"
+/*
+
+  Include here  LwIP files if used
+
+*/
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+  #pragma data_alignment=4
+#endif
+__ALIGN_BEGIN static uint8_t UserRxBuffer[CDC_ECM_ETH_MAX_SEGSZE + 100]__ALIGN_END; /* Received Data over USB are stored in this buffer */
+
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+  #pragma data_alignment=4
+#endif
+__ALIGN_BEGIN  static uint8_t UserTxBuffer[CDC_ECM_ETH_MAX_SEGSZE + 100]__ALIGN_END; /* Received Data over CDC_ECM (CDC_ECM interface) are stored in this buffer */
+
+static uint8_t CDC_ECMInitialized = 0U;
+
+/* USB handler declaration */
+extern USBD_HandleTypeDef  USBD_Device;
+
+/* Private function prototypes -----------------------------------------------*/
+static int8_t CDC_ECM_Itf_Init(void);
+static int8_t CDC_ECM_Itf_DeInit(void);
+static int8_t CDC_ECM_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length);
+static int8_t CDC_ECM_Itf_Receive(uint8_t *pbuf, uint32_t *Len);
+static int8_t CDC_ECM_Itf_TransmitCplt(uint8_t *pbuf, uint32_t *Len, uint8_t epnum);
+static int8_t CDC_ECM_Itf_Process(USBD_HandleTypeDef *pdev);
+
+USBD_CDC_ECM_ItfTypeDef USBD_CDC_ECM_fops =
+{
+  CDC_ECM_Itf_Init,
+  CDC_ECM_Itf_DeInit,
+  CDC_ECM_Itf_Control,
+  CDC_ECM_Itf_Receive,
+  CDC_ECM_Itf_TransmitCplt,
+  CDC_ECM_Itf_Process,
+  (uint8_t *)CDC_ECM_MAC_STR_DESC,
+};
+
+/* Private functions ---------------------------------------------------------*/
+
+/**
+  * @brief  CDC_ECM_Itf_Init
+  *         Initializes the CDC_ECM media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_Init(void)
+{
+  if (CDC_ECMInitialized == 0U)
+  {
+    /*
+      Initialize the TCP/IP stack here
+    */
+
+    CDC_ECMInitialized = 1U;
+  }
+
+  /* Set Application Buffers */
+  (void)USBD_CDC_ECM_SetTxBuffer(&USBD_Device, UserTxBuffer, 0U);
+  (void)USBD_CDC_ECM_SetRxBuffer(&USBD_Device, UserRxBuffer);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_ECM_Itf_DeInit
+  *         DeInitializes the CDC_ECM media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_DeInit(void)
+{
+  USBD_CDC_ECM_HandleTypeDef *hcdc_cdc_ecm = (USBD_CDC_ECM_HandleTypeDef *)(USBD_Device.pClassData);
+
+  /* Notify application layer that link is down */
+  hcdc_cdc_ecm->LinkStatus = 0U;
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_ECM_Itf_Control
+  *         Manage the CDC_ECM class requests
+  * @param  Cmd: Command code
+  * @param  Buf: Buffer containing command data (request parameters)
+  * @param  Len: Number of data to be sent (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length)
+{
+  USBD_CDC_ECM_HandleTypeDef *hcdc_cdc_ecm = (USBD_CDC_ECM_HandleTypeDef *)(USBD_Device.pClassData);
+
+  switch (cmd)
+  {
+    case CDC_ECM_SEND_ENCAPSULATED_COMMAND:
+      /* Add your code here */
+      break;
+
+    case CDC_ECM_GET_ENCAPSULATED_RESPONSE:
+      /* Add your code here */
+      break;
+
+    case CDC_ECM_SET_ETH_MULTICAST_FILTERS:
+      /* Add your code here */
+      break;
+
+  case CDC_ECM_SET_ETH_PWRM_PATTERN_FILTER:
+      /* Add your code here */
+      break;
+
+  case CDC_ECM_GET_ETH_PWRM_PATTERN_FILTER:
+      /* Add your code here */
+      break;
+
+  case CDC_ECM_SET_ETH_PACKET_FILTER:
+      /* Check if this is the first time we enter */
+      if (hcdc_cdc_ecm->LinkStatus == 0U)
+      {
+        /*
+          Setup the Link up at TCP/IP level
+        */
+        hcdc_cdc_ecm->LinkStatus = 1U;
+
+        /* Modification for MacOS which doesn't send SetInterface before receiving INs */
+        if (hcdc_cdc_ecm->NotificationStatus == 0U)
+        {
+          /* Send notification: NETWORK_CONNECTION Event */
+          (void)USBD_CDC_ECM_SendNotification(&USBD_Device, NETWORK_CONNECTION,
+                                              CDC_ECM_NET_CONNECTED, NULL);
+
+          /* Prepare for sending Connection Speed Change notification */
+          hcdc_cdc_ecm->NotificationStatus = 1U;
+        }
+      }
+      /* Add your code here */
+      break;
+
+  case CDC_ECM_GET_ETH_STATISTIC:
+      /* Add your code here */
+      break;
+
+    default:
+      break;
+  }
+  UNUSED(length);
+  UNUSED(pbuf);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_ECM_Itf_Receive
+  *         Data received over USB OUT endpoint are sent over CDC_ECM interface
+  *         through this function.
+  * @param  Buf: Buffer of data to be transmitted
+  * @param  Len: Number of data received (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_Receive(uint8_t *Buf, uint32_t *Len)
+{
+  /* Get the CDC_ECM handler pointer */
+  USBD_CDC_ECM_HandleTypeDef *hcdc_cdc_ecm = (USBD_CDC_ECM_HandleTypeDef *)(USBD_Device.pClassData);
+
+  /* Call Eth buffer processing */
+  hcdc_cdc_ecm->RxState = 1U;
+
+  UNUSED(Len);
+  UNUSED(Buf);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_ECM_Itf_TransmitCplt
+  *         Data transmited callback
+  *
+  *         @note
+  *         This function is IN transfer complete callback used to inform user that
+  *         the submitted Data is successfully sent over USB.
+  *
+  * @param  Buf: Buffer of data to be received
+  * @param  Len: Number of data received (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_TransmitCplt(uint8_t *Buf, uint32_t *Len, uint8_t epnum)
+{
+  UNUSED(Buf);
+  UNUSED(Len);
+  UNUSED(epnum);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_ECM_Itf_Process
+  *         Data received over USB OUT endpoint are sent over CDC_ECM interface
+  *         through this function.
+  * @param  pdef: pointer to the USB Device Handle
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_ECM_Itf_Process(USBD_HandleTypeDef *pdev)
+{
+  /* Get the CDC_ECM handler pointer */
+  USBD_CDC_ECM_HandleTypeDef *hcdc_cdc_ecm = (USBD_CDC_ECM_HandleTypeDef *)(pdev->pClassData);
+
+  if ((hcdc_cdc_ecm != NULL) && (hcdc_cdc_ecm->LinkStatus != 0U))
+  {
+    /*
+      Read a received packet from the Ethernet buffers and send it
+      to the lwIP for handling
+      Call here the TCP/IP background tasks.
+    */
+  }
+
+  return (0);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC_RNDIS/Inc/usbd_cdc_rndis.h

@@ -0,0 +1,529 @@
+/**
+  ******************************************************************************
+  * @file    usbd_cdc_rndis.h
+  * @author  MCD Application Team
+  * @brief   header file for the usbd_cdc_rndis.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                      www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USB_CDC_RNDIS_H
+#define __USB_CDC_RNDIS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup usbd_cdc_rndis
+  * @brief This file is the Header file for usbd_cdc_rndis.c
+  * @{
+  */
+
+
+/** @defgroup usbd_cdc_rndis_Exported_Defines
+  * @{
+  */
+
+#define CDC_RNDIS_IN_EP                                   0x81U  /* EP1 for data IN */
+#define CDC_RNDIS_OUT_EP                                  0x01U  /* EP1 for data OUT */
+#define CDC_RNDIS_CMD_EP                                  0x82U  /* EP2 for CDC_RNDIS commands */
+
+#ifndef CDC_RNDIS_CMD_ITF_NBR
+#define CDC_RNDIS_CMD_ITF_NBR                             0x00U /* Command Interface Number 0 */
+#endif /* CDC_RNDIS_CMD_ITF_NBR */
+
+#ifndef CDC_RNDIS_COM_ITF_NBR
+#define CDC_RNDIS_COM_ITF_NBR                             0x01U /* Communication Interface Number 0 */
+#endif /* CDC_RNDIS_CMD_ITF_NBR */
+
+#ifndef CDC_RNDIS_HS_BINTERVAL
+#define CDC_RNDIS_HS_BINTERVAL                            0x10U
+#endif /* CDC_RNDIS_HS_BINTERVAL */
+
+#ifndef CDC_RNDIS_FS_BINTERVAL
+#define CDC_RNDIS_FS_BINTERVAL                            0x10U
+#endif /* CDC_RNDIS_FS_BINTERVAL */
+
+
+/* CDC_RNDIS Endpoints parameters: you can fine tune these values
+   depending on the needed baudrates and performance. */
+#define CDC_RNDIS_DATA_HS_MAX_PACKET_SIZE                 512U  /* Endpoint IN & OUT Packet size */
+#define CDC_RNDIS_DATA_FS_MAX_PACKET_SIZE                 64U   /* Endpoint IN & OUT Packet size */
+#define CDC_RNDIS_CMD_PACKET_SIZE                         16U   /* Control Endpoint Packet size */
+
+#define CDC_RNDIS_CONFIG_DESC_SIZ                         75U
+#define CDC_RNDIS_DATA_HS_IN_PACKET_SIZE                  CDC_RNDIS_DATA_HS_MAX_PACKET_SIZE
+#define CDC_RNDIS_DATA_HS_OUT_PACKET_SIZE                 CDC_RNDIS_DATA_HS_MAX_PACKET_SIZE
+
+#define CDC_RNDIS_DATA_FS_IN_PACKET_SIZE                  CDC_RNDIS_DATA_FS_MAX_PACKET_SIZE
+#define CDC_RNDIS_DATA_FS_OUT_PACKET_SIZE                 CDC_RNDIS_DATA_FS_MAX_PACKET_SIZE
+
+/*---------------------------------------------------------------------*/
+/*  CDC_RNDIS definitions                                                    */
+/*---------------------------------------------------------------------*/
+
+/** Implemented CDC_RNDIS Version Major */
+#define CDC_RNDIS_VERSION_MAJOR                     0x01U
+
+/* Implemented CDC_RNDIS Version Minor */
+#define CDC_RNDIS_VERSION_MINOR                     0x00U
+
+/* Maximum size in bytes of a CDC_RNDIS control message
+   which can be sent or received */
+#define CDC_RNDIS_MESSAGE_BUFFER_SIZE               128U
+
+/* Maximum size in bytes of an Ethernet frame
+   according to the Ethernet standard */
+#define CDC_RNDIS_ETH_FRAME_SIZE_MAX                1536U
+
+/* Maximum size allocated for buffer
+   inside Query messages structures */
+#define CDC_RNDIS_MAX_INFO_BUFF_SZ                  200U
+#define CDC_RNDIS_MAX_DATA_SZE                      2000U
+
+/* Notification request value for a CDC_RNDIS
+   Response Available notification */
+#define CDC_RNDIS_NOTIFICATION_RESP_AVAILABLE       0x00000001UL
+
+
+#define CDC_RNDIS_PACKET_MSG_ID                     0x00000001UL
+#define CDC_RNDIS_INITIALIZE_MSG_ID                 0x00000002UL
+#define CDC_RNDIS_HALT_MSG_ID                       0x00000003UL
+#define CDC_RNDIS_QUERY_MSG_ID                      0x00000004UL
+#define CDC_RNDIS_SET_MSG_ID                        0x00000005UL
+#define CDC_RNDIS_RESET_MSG_ID                      0x00000006UL
+#define CDC_RNDIS_INDICATE_STATUS_MSG_ID            0x00000007UL
+#define CDC_RNDIS_KEEPALIVE_MSG_ID                  0x00000008UL
+
+#define CDC_RNDIS_INITIALIZE_CMPLT_ID               0x80000002UL
+#define CDC_RNDIS_QUERY_CMPLT_ID                    0x80000004UL
+#define CDC_RNDIS_SET_CMPLT_ID                      0x80000005UL
+#define CDC_RNDIS_RESET_CMPLT_ID                    0x80000006UL
+#define CDC_RNDIS_KEEPALIVE_CMPLT_ID                0x80000008UL
+
+#define CDC_RNDIS_STATUS_SUCCESS                    0x00000000UL
+#define CDC_RNDIS_STATUS_FAILURE                    0xC0000001UL
+#define CDC_RNDIS_STATUS_INVALID_DATA               0xC0010015UL
+#define CDC_RNDIS_STATUS_NOT_SUPPORTED              0xC00000BBUL
+#define CDC_RNDIS_STATUS_MEDIA_CONNECT              0x4001000BUL
+#define CDC_RNDIS_STATUS_MEDIA_DISCONNECT           0x4001000CUL
+/** Media state */
+#define CDC_RNDIS_MEDIA_STATE_CONNECTED             0x00000000UL
+#define CDC_RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001UL
+
+/** Media types */
+#define CDC_RNDIS_MEDIUM_802_3                      0x00000000UL
+
+#define CDC_RNDIS_DF_CONNECTIONLESS                 0x00000001UL
+#define CDC_RNDIS_DF_CONNECTION_ORIENTED            0x00000002UL
+
+/** Hardware status of the underlying NIC */
+#define CDC_RNDIS_HW_STS_READY                      0x00000000UL
+#define CDC_RNDIS_HW_STS_INITIALIZING               0x00000001UL
+#define CDC_RNDIS_HW_STS_RESET                      0x00000002UL
+#define CDC_RNDIS_HW_STS_CLOSING                    0x00000003UL
+#define CDC_RNDIS_HW_STS_NOT_READY                  0x00000004UL
+
+/** Packet filter */
+#define CDC_RNDIS_PACKET_DIRECTED                   0x00000001UL
+#define CDC_RNDIS_PACKET_MULTICAST                  0x00000002UL
+#define CDC_RNDIS_PACKET_ALL_MULTICAST              0x00000004UL
+#define CDC_RNDIS_PACKET_BROADCAST                  0x00000008UL
+#define CDC_RNDIS_PACKET_SOURCE_ROUTING             0x00000010UL
+#define CDC_RNDIS_PACKET_PROMISCUOUS                0x00000020UL
+#define CDC_RNDIS_PACKET_SMT                        0x00000040UL
+#define CDC_RNDIS_PACKET_ALL_LOCAL                  0x00000080UL
+#define CDC_RNDIS_PACKET_GROUP                      0x00001000UL
+#define CDC_RNDIS_PACKET_ALL_FUNCTIONAL             0x00002000UL
+#define CDC_RNDIS_PACKET_FUNCTIONAL                 0x00004000UL
+#define CDC_RNDIS_PACKET_MAC_FRAME                  0x00008000UL
+
+#define OID_GEN_SUPPORTED_LIST                      0x00010101UL
+#define OID_GEN_HARDWARE_STATUS                     0x00010102UL
+#define OID_GEN_MEDIA_SUPPORTED                     0x00010103UL
+#define OID_GEN_MEDIA_IN_USE                        0x00010104UL
+#define OID_GEN_MAXIMUM_FRAME_SIZE                  0x00010106UL
+#define OID_GEN_MAXIMUM_TOTAL_SIZE                  0x00010111UL
+#define OID_GEN_LINK_SPEED                          0x00010107UL
+#define OID_GEN_TRANSMIT_BLOCK_SIZE                 0x0001010AUL
+#define OID_GEN_RECEIVE_BLOCK_SIZE                  0x0001010BUL
+#define OID_GEN_VENDOR_ID                           0x0001010CUL
+#define OID_GEN_VENDOR_DESCRIPTION                  0x0001010DUL
+#define OID_GEN_CURRENT_PACKET_FILTER               0x0001010EUL
+#define OID_GEN_MEDIA_CONNECT_STATUS                0x00010114UL
+#define OID_GEN_MAXIMUM_SEND_PACKETS                0x00010115UL
+#define OID_GEN_PHYSICAL_MEDIUM                     0x00010202UL
+#define OID_GEN_XMIT_OK                             0x00020101UL
+#define OID_GEN_RCV_OK                              0x00020102UL
+#define OID_GEN_XMIT_ERROR                          0x00020103UL
+#define OID_GEN_RCV_ERROR                           0x00020104UL
+#define OID_GEN_RCV_NO_BUFFER                       0x00020105UL
+#define OID_GEN_CDC_RNDIS_CONFIG_PARAMETER          0x0001021BUL
+#define OID_802_3_PERMANENT_ADDRESS                 0x01010101UL
+#define OID_802_3_CURRENT_ADDRESS                   0x01010102UL
+#define OID_802_3_MULTICAST_LIST                    0x01010103UL
+#define OID_802_3_MAXIMUM_LIST_SIZE                 0x01010104UL
+#define OID_802_3_RCV_ERROR_ALIGNMENT               0x01020101UL
+#define OID_802_3_XMIT_ONE_COLLISION                0x01020102UL
+#define OID_802_3_XMIT_MORE_COLLISIONS              0x01020103UL
+
+
+#define CDC_RNDIS_SEND_ENCAPSULATED_COMMAND         0x00U
+#define CDC_RNDIS_GET_ENCAPSULATED_RESPONSE         0x01U
+
+#define CDC_RNDIS_NET_DISCONNECTED                  0x00U
+#define CDC_RNDIS_NET_CONNECTED                     0x01U
+
+#define CDC_RNDIS_BMREQUEST_TYPE_RNDIS              0xA1U
+#define CDC_RNDIS_PCKTMSG_DATAOFFSET_OFFSET         8U
+
+/* MAC String index */
+#define CDC_RNDIS_MAC_STRING_INDEX                  6U
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CORE_Exported_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+typedef struct _USBD_CDC_RNDIS_Itf
+{
+  int8_t (* Init)(void);
+  int8_t (* DeInit)(void);
+  int8_t (* Control)(uint8_t cmd, uint8_t *pbuf, uint16_t length);
+  int8_t (* Receive)(uint8_t *Buf, uint32_t *Len);
+  int8_t (* TransmitCplt)(uint8_t *Buf, uint32_t *Len, uint8_t epnum);
+  int8_t (* Process)(USBD_HandleTypeDef *pdev);
+  uint8_t *pStrDesc;
+} USBD_CDC_RNDIS_ItfTypeDef;
+
+/* CDC_RNDIS State values */
+typedef enum
+{
+  CDC_RNDIS_STATE_UNINITIALIZED    = 0,
+  CDC_RNDIS_STATE_BUS_INITIALIZED  = 1,
+  CDC_RNDIS_STATE_INITIALIZED      = 2,
+  CDC_RNDIS_STATE_DATA_INITIALIZED = 3
+} USBD_CDC_RNDIS_StateTypeDef;
+
+typedef struct
+{
+  uint8_t   bmRequest;
+  uint8_t   bRequest;
+  uint16_t  wValue;
+  uint16_t  wIndex;
+  uint16_t  wLength;
+  uint8_t   data[8];
+} USBD_CDC_RNDIS_NotifTypeDef;
+
+typedef struct
+{
+  uint32_t        data[2000 / 4]; /* Force 32bits alignment */
+  uint8_t         CmdOpCode;
+  uint8_t         CmdLength;
+  uint8_t         ResponseRdy;     /* Indicates if the Device Response to an CDC_RNDIS msg is ready */
+  uint8_t         Reserved1;       /* Reserved Byte to force 4 bytes alignment of following fields */
+  uint8_t         *RxBuffer;
+  uint8_t         *TxBuffer;
+  uint32_t        RxLength;
+  uint32_t        TxLength;
+
+  USBD_CDC_RNDIS_NotifTypeDef     Req;
+  USBD_CDC_RNDIS_StateTypeDef     State;
+
+  __IO uint32_t   TxState;
+  __IO uint32_t   RxState;
+
+  __IO uint32_t   MaxPcktLen;
+  __IO uint32_t   LinkStatus;
+  __IO uint32_t   NotificationStatus;
+  __IO uint32_t   PacketFilter;
+} USBD_CDC_RNDIS_HandleTypeDef;
+
+
+typedef enum
+{
+  NETWORK_CONNECTION = 0x00,
+  RESPONSE_AVAILABLE = 0x01,
+  CONNECTION_SPEED_CHANGE = 0x2A
+} USBD_CDC_RNDIS_NotifCodeTypeDef;
+
+
+/* Messages Sent by the Host ---------------------*/
+
+/* Type define for a CDC_RNDIS Initialize command message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t MajorVersion;
+  uint32_t MinorVersion;
+  uint32_t MaxTransferSize;
+} USBD_CDC_RNDIS_InitMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Halt Message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+} USBD_CDC_RNDIS_HaltMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Query command message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t RequestId;
+  uint32_t Oid;
+  uint32_t InfoBufLength;
+  uint32_t InfoBufOffset;
+  uint32_t DeviceVcHandle;
+  uint32_t InfoBuf[CDC_RNDIS_MAX_INFO_BUFF_SZ];
+} USBD_CDC_RNDIS_QueryMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Set command message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Oid;
+  uint32_t InfoBufLength;
+  uint32_t InfoBufOffset;
+  uint32_t DeviceVcHandle;
+  uint32_t InfoBuf[CDC_RNDIS_MAX_INFO_BUFF_SZ];
+} USBD_CDC_RNDIS_SetMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Reset message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t Reserved;
+} USBD_CDC_RNDIS_ResetMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Keepalive command message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+} USBD_CDC_RNDIS_KpAliveMsgTypeDef;
+
+
+/* Messages Sent by the Device ---------------------*/
+
+/* Type define for a CDC_RNDIS Initialize complete response message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Status;
+  uint32_t MajorVersion;
+  uint32_t MinorVersion;
+  uint32_t DeviceFlags;
+  uint32_t Medium;
+  uint32_t MaxPacketsPerTransfer;
+  uint32_t MaxTransferSize;
+  uint32_t PacketAlignmentFactor;
+  uint32_t AFListOffset;
+  uint32_t AFListSize;
+} USBD_CDC_RNDIS_InitCpltMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Query complete response message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Status;
+  uint32_t InfoBufLength;
+  uint32_t InfoBufOffset;
+  uint32_t InfoBuf[CDC_RNDIS_MAX_INFO_BUFF_SZ];
+} USBD_CDC_RNDIS_QueryCpltMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Set complete response message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Status;
+} USBD_CDC_RNDIS_SetCpltMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Reset complete message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t Status;
+  uint32_t AddrReset;
+} USBD_CDC_RNDIS_ResetCpltMsgTypeDef;
+
+/* Type define for CDC_RNDIS struct to indicate a change
+   in the status of the device */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t Status;
+  uint32_t StsBufLength;
+  uint32_t StsBufOffset;
+} USBD_CDC_RNDIS_StsChangeMsgTypeDef;
+
+/* Type define for a CDC_RNDIS Keepalive complete message */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Status;
+} USBD_CDC_RNDIS_KpAliveCpltMsgTypeDef;
+
+
+/* Messages Sent by both Host and Device ---------------------*/
+
+/* Type define for a CDC_RNDIS packet message, used to encapsulate
+   Ethernet packets sent to and from the adapter */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t DataOffset;
+  uint32_t DataLength;
+  uint32_t OOBDataOffset;
+  uint32_t OOBDataLength;
+  uint32_t NumOOBDataElements;
+  uint32_t PerPacketInfoOffset;
+  uint32_t PerPacketInfoLength;
+  uint32_t VcHandle;
+  uint32_t Reserved;
+} USBD_CDC_RNDIS_PacketMsgTypeDef;
+
+/* Miscellaneous types used for parsing ---------------------*/
+
+/* The common part for all CDC_RNDIS messages Complete response */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+  uint32_t ReqId;
+  uint32_t Status;
+} USBD_CDC_RNDIS_CommonCpltMsgTypeDef;
+
+/* Type define for a single parameter structure */
+typedef struct
+{
+  uint32_t ParamNameOffset;
+  uint32_t ParamNameLength;
+  uint32_t ParamType;
+  uint32_t ParamValueOffset;
+  uint32_t ParamValueLength;
+} USBD_CDC_RNDIS_ParamStructTypeDef;
+
+
+/* Type define of a single CDC_RNDIS OOB data record */
+typedef struct
+{
+  uint32_t Size;
+  uint32_t Type;
+  uint32_t ClassInfoType;
+  uint32_t OOBData[sizeof(uint32_t)];
+} USBD_CDC_RNDIS_OOBPacketTypeDef;
+
+/* Type define for notification structure */
+typedef struct
+{
+  uint32_t notification;
+  uint32_t reserved;
+} USBD_CDC_RNDIS_NotifStructTypeDef;
+
+/* This structure will be used to store the type, the size and ID for any
+   received message from the control endpoint */
+typedef struct
+{
+  uint32_t MsgType;
+  uint32_t MsgLength;
+} USBD_CDC_RNDIS_CtrlMsgTypeDef;
+
+
+/** @defgroup USBD_CORE_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CORE_Exported_Variables
+  * @{
+  */
+
+extern USBD_ClassTypeDef USBD_CDC_RNDIS;
+#define USBD_CDC_RNDIS_CLASS &USBD_CDC_RNDIS
+/**
+  * @}
+  */
+
+/** @defgroup USB_CORE_Exported_Functions
+  * @{
+  */
+uint8_t USBD_CDC_RNDIS_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
+uint8_t USBD_CDC_RNDIS_ReceivePacket(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_RNDIS_TransmitPacket(USBD_HandleTypeDef *pdev);
+
+uint8_t USBD_CDC_RNDIS_RegisterInterface(USBD_HandleTypeDef *pdev,
+                                         USBD_CDC_RNDIS_ItfTypeDef *fops);
+
+uint8_t USBD_CDC_RNDIS_SetTxBuffer(USBD_HandleTypeDef *pdev,
+                                   uint8_t *pbuff, uint32_t length);
+
+uint8_t USBD_CDC_RNDIS_SendNotification(USBD_HandleTypeDef *pdev,
+                                        USBD_CDC_RNDIS_NotifCodeTypeDef Notif,
+                                        uint16_t bVal, uint8_t *pData);
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __USB_CDC_RNDIS_H */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC_RNDIS/Inc/usbd_cdc_rndis_if_template.h

@@ -0,0 +1,60 @@
+/**
+  ******************************************************************************
+  * @file    usbd_cdc_rndis_if_template.h
+  * @author  MCD Application Team
+  * @brief   Header for usbd_cdc_rndis_if.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                      www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_CDC_RNDIS_IF_H
+#define __USBD_CDC_RNDIS_IF_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_cdc_rndis.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* Ensure this MAC address value is same as MAC_ADDRx declared in STM32xxx_conf.h */
+#define CDC_RNDIS_MAC_STR_DESC                 (uint8_t *)"000202030000"
+#define CDC_RNDIS_MAC_ADDR0                    0x00U /* 01 */
+#define CDC_RNDIS_MAC_ADDR1                    0x02U /* 02 */
+#define CDC_RNDIS_MAC_ADDR2                    0x02U /* 03 */
+#define CDC_RNDIS_MAC_ADDR3                    0x03U /* 00 */
+#define CDC_RNDIS_MAC_ADDR4                    0x00U /* 00 */
+#define CDC_RNDIS_MAC_ADDR5                    0x00U /* 00 */
+
+#define USBD_CDC_RNDIS_VENDOR_DESC             "STMicroelectronics"
+#define USBD_CDC_RNDIS_LINK_SPEED              100000U /* 10Mbps */
+#define USBD_CDC_RNDIS_VID                     0x0483U
+
+/* Max Number of Trials waiting for Tx ready */
+#define CDC_RNDIS_MAX_TX_WAIT_TRIALS           1000000U
+
+/* Ethernet Maximum Segment size, typically 1514 bytes */
+#define CDC_RNDIS_ETH_MAX_SEGSZE                            1514U
+
+#define CDC_RNDIS_CONNECT_SPEED_UPSTREAM                    0x1E000000U
+#define CDC_RNDIS_CONNECT_SPEED_DOWNSTREAM                  0x1E000000U
+
+
+extern USBD_CDC_RNDIS_ItfTypeDef                    USBD_CDC_RNDIS_fops;
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+#endif /* __USBD_CDC_RNDIS_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC_RNDIS/Src/usbd_cdc_rndis_if_template.c

@@ -0,0 +1,233 @@
+/**
+  ******************************************************************************
+  * @file    usbd_cdc_rndis_if_template.c
+  * @author  MCD Application Team
+  * @brief   Source file for USBD CDC_RNDIS interface template
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                      www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+/* Include TCP/IP stack header files */
+/*
+#include "lwip/opt.h"
+#include "lwip/init.h"
+#include "lwip/dhcp.h"
+#include "lwip/netif.h"
+#include "lwip/timeouts.h"
+#include "netif/etharp.h"
+#include "http_cgi_ssi.h"
+#include "ethernetif.h"
+*/
+
+#include "main.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+  #pragma data_alignment=4
+#endif
+__ALIGN_BEGIN uint8_t UserRxBuffer[CDC_RNDIS_ETH_MAX_SEGSZE + 100] __ALIGN_END; /* Received Data over USB are stored in this buffer */
+
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+  #pragma data_alignment=4
+#endif
+__ALIGN_BEGIN static uint8_t UserTxBuffer[CDC_RNDIS_ETH_MAX_SEGSZE + 100] __ALIGN_END; /* Received Data over CDC_RNDIS (CDC_RNDIS interface) are stored in this buffer */
+
+static uint8_t CDC_RNDISInitialized = 0U;
+
+/* USB handler declaration */
+extern USBD_HandleTypeDef  USBD_Device;
+
+
+/* Private function prototypes -----------------------------------------------*/
+static int8_t CDC_RNDIS_Itf_Init(void);
+static int8_t CDC_RNDIS_Itf_DeInit(void);
+static int8_t CDC_RNDIS_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length);
+static int8_t CDC_RNDIS_Itf_Receive(uint8_t *pbuf, uint32_t *Len);
+static int8_t CDC_RNDIS_Itf_TransmitCplt(uint8_t *pbuf, uint32_t *Len, uint8_t epnum);
+static int8_t CDC_RNDIS_Itf_Process(USBD_HandleTypeDef *pdev);
+
+USBD_CDC_RNDIS_ItfTypeDef USBD_CDC_RNDIS_fops =
+{
+  CDC_RNDIS_Itf_Init,
+  CDC_RNDIS_Itf_DeInit,
+  CDC_RNDIS_Itf_Control,
+  CDC_RNDIS_Itf_Receive,
+  CDC_RNDIS_Itf_TransmitCplt,
+  CDC_RNDIS_Itf_Process,
+  (uint8_t *)CDC_RNDIS_MAC_STR_DESC,
+};
+
+/* Private functions ---------------------------------------------------------*/
+
+/**
+  * @brief  CDC_RNDIS_Itf_Init
+  *         Initializes the CDC_RNDIS media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_Init(void)
+{
+  if (CDC_RNDISInitialized == 0U)
+  {
+    /*
+      Initialize the LwIP stack
+      Add your code here
+
+    */
+
+    CDC_RNDISInitialized = 1U;
+  }
+
+  /* Set Application Buffers */
+  (void)USBD_CDC_RNDIS_SetTxBuffer(&USBD_Device, UserTxBuffer, 0U);
+  (void)USBD_CDC_RNDIS_SetRxBuffer(&USBD_Device, UserRxBuffer);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_RNDIS_Itf_DeInit
+  *         DeInitializes the CDC_RNDIS media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_DeInit(void)
+{
+  USBD_CDC_RNDIS_HandleTypeDef *hcdc_cdc_rndis = (USBD_CDC_RNDIS_HandleTypeDef *)(USBD_Device.pClassData);
+
+  /*
+     Add your code here
+  */
+
+  /* Notify application layer that link is down */
+  hcdc_cdc_rndis->LinkStatus = 0U;
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_RNDIS_Itf_Control
+  *         Manage the CDC_RNDIS class requests
+  * @param  Cmd: Command code
+  * @param  Buf: Buffer containing command data (request parameters)
+  * @param  Len: Number of data to be sent (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length)
+{
+  USBD_CDC_RNDIS_HandleTypeDef *hcdc_cdc_rndis = (USBD_CDC_RNDIS_HandleTypeDef *)(USBD_Device.pClassData);
+
+  switch (cmd)
+  {
+    case CDC_RNDIS_SEND_ENCAPSULATED_COMMAND:
+      /* Add your code here */
+      break;
+
+    case CDC_RNDIS_GET_ENCAPSULATED_RESPONSE:
+      /* Check if this is the first time we enter */
+      if (hcdc_cdc_rndis->LinkStatus == 0U)
+      {
+        /* Setup the Link up at TCP/IP stack level */
+        hcdc_cdc_rndis->LinkStatus = 1U;
+        /*
+          Add your code here
+        */
+      }
+      /* Add your code here */
+      break;
+
+    default:
+      /* Add your code here */
+      break;
+  }
+
+  UNUSED(length);
+  UNUSED(pbuf);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_RNDIS_Itf_Receive
+  *         Data received over USB OUT endpoint are sent over CDC_RNDIS interface
+  *         through this function.
+  * @param  Buf: Buffer of data to be transmitted
+  * @param  Len: Number of data received (in bytes)
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_Receive(uint8_t *Buf, uint32_t *Len)
+{
+  /* Get the CDC_RNDIS handler pointer */
+  USBD_CDC_RNDIS_HandleTypeDef *hcdc_cdc_rndis = (USBD_CDC_RNDIS_HandleTypeDef *)(USBD_Device.pClassData);
+
+  /* Call Eth buffer processing */
+  hcdc_cdc_rndis->RxState = 1U;
+
+  UNUSED(Buf);
+  UNUSED(Len);     
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_RNDIS_Itf_TransmitCplt
+  *         Data transmited callback
+  *
+  *         @note
+  *         This function is IN transfer complete callback used to inform user that
+  *         the submitted Data is successfully sent over USB.
+  *
+  * @param  Buf: Buffer of data to be received
+  * @param  Len: Number of data received (in bytes)
+  * @param  epnum: EP number
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_TransmitCplt(uint8_t *Buf, uint32_t *Len, uint8_t epnum)
+{
+  UNUSED(Buf);
+  UNUSED(Len);
+  UNUSED(epnum);
+
+  return (0);
+}
+
+/**
+  * @brief  CDC_RNDIS_Itf_Process
+  *         Data received over USB OUT endpoint are sent over CDC_RNDIS interface
+  *         through this function.
+  * @param  pdef: pointer to the USB Device Handle
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t CDC_RNDIS_Itf_Process(USBD_HandleTypeDef *pdev)
+{
+  /* Get the CDC_RNDIS handler pointer */
+  USBD_CDC_RNDIS_HandleTypeDef   *hcdc_cdc_rndis = (USBD_CDC_RNDIS_HandleTypeDef *)(pdev->pClassData);
+
+  if ((hcdc_cdc_rndis != NULL) && (hcdc_cdc_rndis->LinkStatus != 0U))
+  {
+    /*
+       Add your code here
+       Read a received packet from the Ethernet buffers and send it
+       to the lwIP for handling
+    */
+  }
+
+  return (0);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CustomHID/Inc/usbd_customhid.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_CUSTOMHID_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -51,18 +51,19 @@
 #define USB_CUSTOM_HID_DESC_SIZ                      9U
 
 #ifndef CUSTOM_HID_HS_BINTERVAL
-  #define CUSTOM_HID_HS_BINTERVAL            0x05U
+#define CUSTOM_HID_HS_BINTERVAL                      0x05U
 #endif /* CUSTOM_HID_HS_BINTERVAL */
 
 #ifndef CUSTOM_HID_FS_BINTERVAL
-  #define CUSTOM_HID_FS_BINTERVAL            0x05U
+#define CUSTOM_HID_FS_BINTERVAL                      0x05U
 #endif /* CUSTOM_HID_FS_BINTERVAL */
 
 #ifndef USBD_CUSTOMHID_OUTREPORT_BUF_SIZE
-  #define USBD_CUSTOMHID_OUTREPORT_BUF_SIZE  0x02U
+#define USBD_CUSTOMHID_OUTREPORT_BUF_SIZE            0x02U
 #endif /* USBD_CUSTOMHID_OUTREPORT_BUF_SIZE */
+
 #ifndef USBD_CUSTOM_HID_REPORT_DESC_SIZE
-  #define USBD_CUSTOM_HID_REPORT_DESC_SIZE   163U
+#define USBD_CUSTOM_HID_REPORT_DESC_SIZE             163U
 #endif /* USBD_CUSTOM_HID_REPORT_DESC_SIZE */
 
 #define CUSTOM_HID_DESCRIPTOR_TYPE                   0x21U
@@ -88,17 +89,16 @@ typedef enum
 {
   CUSTOM_HID_IDLE = 0U,
   CUSTOM_HID_BUSY,
-}
+} CUSTOM_HID_StateTypeDef;
-CUSTOM_HID_StateTypeDef;
 
 typedef struct _USBD_CUSTOM_HID_Itf
 {
   uint8_t *pReport;
-  int8_t (* Init)          (void);
+  int8_t (* Init)(void);
-  int8_t (* DeInit)        (void);
+  int8_t (* DeInit)(void);
-  int8_t (* OutEvent)      (uint8_t event_idx, uint8_t state);
+  int8_t (* OutEvent)(uint8_t event_idx, uint8_t state);
 
-}USBD_CUSTOM_HID_ItfTypeDef;
+} USBD_CUSTOM_HID_ItfTypeDef;
 
 typedef struct
 {
@@ -108,8 +108,7 @@ typedef struct
   uint32_t AltSetting;
   uint32_t IsReportAvailable;
   CUSTOM_HID_StateTypeDef state;
-}
+} USBD_CUSTOM_HID_HandleTypeDef;
-USBD_CUSTOM_HID_HandleTypeDef;
 /**
   * @}
   */
@@ -137,13 +136,12 @@ extern USBD_ClassTypeDef  USBD_CUSTOM_HID;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t USBD_CUSTOM_HID_SendReport (USBD_HandleTypeDef *pdev,
+uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef *pdev,
-                                 uint8_t *report,
+                                   uint8_t *report, uint16_t len);
-                                 uint16_t len);
 
+uint8_t USBD_CUSTOM_HID_ReceivePacket(USBD_HandleTypeDef *pdev);
 
-
+uint8_t USBD_CUSTOM_HID_RegisterInterface(USBD_HandleTypeDef *pdev,
-uint8_t  USBD_CUSTOM_HID_RegisterInterface  (USBD_HandleTypeDef   *pdev,
                                           USBD_CUSTOM_HID_ItfTypeDef *fops);
 
 /**

Class/CustomHID/Inc/usbd_customhid_if_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_CUSTOMHID_IF_TEMPLATE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/

Class/CustomHID/Src/usbd_customhid.c

@@ -32,15 +32,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_customhid.h"
@@ -84,28 +84,19 @@
   * @{
   */
 
+static uint8_t USBD_CUSTOM_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_CUSTOM_HID_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_CUSTOM_HID_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
 
-static uint8_t  USBD_CUSTOM_HID_Init (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
-                               uint8_t cfgidx);
+static uint8_t USBD_CUSTOM_HID_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef  *pdev);
 
-static uint8_t  USBD_CUSTOM_HID_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t *USBD_CUSTOM_HID_GetFSCfgDesc(uint16_t *length);
-                                 uint8_t cfgidx);
+static uint8_t *USBD_CUSTOM_HID_GetHSCfgDesc(uint16_t *length);
+static uint8_t *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc(uint16_t *length);
+static uint8_t *USBD_CUSTOM_HID_GetDeviceQualifierDesc(uint16_t *length);
 
-static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req);
-
-static uint8_t  *USBD_CUSTOM_HID_GetFSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CUSTOM_HID_GetHSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_CUSTOM_HID_GetDeviceQualifierDesc (uint16_t *length);
-
-static uint8_t  USBD_CUSTOM_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_CUSTOM_HID_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum);
-static uint8_t  USBD_CUSTOM_HID_EP0_RxReady (USBD_HandleTypeDef  *pdev);
 /**
   * @}
   */
@@ -140,50 +131,49 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgFSDesc[USB_CUSTOM_HID_CONFIG_DES
   USB_CUSTOM_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xC0,                                               /* bmAttributes: bus powered */
-  0xC0,         /*bmAttributes: bus powered */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x02,         /*bNumEndpoints*/
+  0x02,                                               /* bNumEndpoints*/
-  0x03,         /*bInterfaceClass: CUSTOM_HID*/
+  0x03,                                               /* bInterfaceClass: CUSTOM_HID */
-  0x00,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x00,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x00,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x00,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0x00,                                               /* iInterface: Index of string descriptor */
   /******************** Descriptor of CUSTOM_HID *************************/
   /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
+  0x09,                                               /* bLength: CUSTOM_HID Descriptor size */
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
+  CUSTOM_HID_DESCRIPTOR_TYPE,                         /* bDescriptorType: CUSTOM_HID */
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
+  0x11,                                               /* bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of CUSTOM_HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  USBD_CUSTOM_HID_REPORT_DESC_SIZE,                   /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Custom HID endpoints ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
 
-  CUSTOM_HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Byte max */
   0x00,
-  CUSTOM_HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
+  CUSTOM_HID_FS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
 
   0x07,                                               /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
+  CUSTOM_HID_EPOUT_ADDR,                              /* bEndpointAddress: Endpoint Address (OUT) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
   CUSTOM_HID_EPOUT_SIZE,                              /* wMaxPacketSize: 2 Bytes max  */
   0x00,
@@ -199,50 +189,49 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgHSDesc[USB_CUSTOM_HID_CONFIG_DES
   USB_CUSTOM_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xC0,                                               /* bmAttributes: bus powered */
-  0xC0,         /*bmAttributes: bus powered */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size */
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x02,         /*bNumEndpoints*/
+  0x02,                                               /* bNumEndpoints */
-  0x03,         /*bInterfaceClass: CUSTOM_HID*/
+  0x03,                                               /* bInterfaceClass: CUSTOM_HID */
-  0x00,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x00,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x00,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x00,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0,                                                  /* iInterface: Index of string descriptor */
   /******************** Descriptor of CUSTOM_HID *************************/
   /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
+  0x09,                                               /* bLength: CUSTOM_HID Descriptor size */
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
+  CUSTOM_HID_DESCRIPTOR_TYPE,                         /* bDescriptorType: CUSTOM_HID */
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
+  0x11,                                               /* bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of CUSTOM_HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  USBD_CUSTOM_HID_REPORT_DESC_SIZE,                   /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Custom HID endpoints ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
 
-  CUSTOM_HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Byte max */
   0x00,
-  CUSTOM_HID_HS_BINTERVAL,          /*bInterval: Polling Interval */
+  CUSTOM_HID_HS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
 
   0x07,                                               /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
+  CUSTOM_HID_EPOUT_ADDR,                              /* bEndpointAddress: Endpoint Address (OUT) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
   CUSTOM_HID_EPOUT_SIZE,                              /* wMaxPacketSize: 2 Bytes max  */
   0x00,
@@ -258,50 +247,49 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_OtherSpeedCfgDesc[USB_CUSTOM_HID_CO
   USB_CUSTOM_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xC0,                                               /* bmAttributes: bus powered */
-  0xC0,         /*bmAttributes: bus powered */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size */
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x02,         /*bNumEndpoints*/
+  0x02,                                               /* bNumEndpoints */
-  0x03,         /*bInterfaceClass: CUSTOM_HID*/
+  0x03,                                               /* bInterfaceClass: CUSTOM_HID */
-  0x00,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x00,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x00,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x00,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0,                                                  /* iInterface: Index of string descriptor */
   /******************** Descriptor of CUSTOM_HID *************************/
   /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
+  0x09,                                               /* bLength: CUSTOM_HID Descriptor size */
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
+  CUSTOM_HID_DESCRIPTOR_TYPE,                         /* bDescriptorType: CUSTOM_HID */
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
+  0x11,                                               /* bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of CUSTOM_HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  USBD_CUSTOM_HID_REPORT_DESC_SIZE,                   /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Custom HID endpoints ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
 
-  CUSTOM_HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Byte max */
   0x00,
-  CUSTOM_HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
+  CUSTOM_HID_FS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
 
   0x07,                                               /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
+  CUSTOM_HID_EPOUT_ADDR,                              /* bEndpointAddress: Endpoint Address (OUT) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
   CUSTOM_HID_EPOUT_SIZE,                              /* wMaxPacketSize: 2 Bytes max */
   0x00,
@@ -313,14 +301,14 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_OtherSpeedCfgDesc[USB_CUSTOM_HID_CO
 __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_Desc[USB_CUSTOM_HID_DESC_SIZ] __ALIGN_END =
 {
   /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
+  0x09,                                               /* bLength: CUSTOM_HID Descriptor size */
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
+  CUSTOM_HID_DESCRIPTOR_TYPE,                         /* bDescriptorType: CUSTOM_HID */
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
+  0x11,                                               /* bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of CUSTOM_HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  USBD_CUSTOM_HID_REPORT_DESC_SIZE,                   /* wItemLength: Total length of Report descriptor */
   0x00,
 };
 
@@ -354,43 +342,53 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_DeviceQualifierDesc[USB_LEN_DEV_QUA
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_CUSTOM_HID_Init (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                               uint8_t cfgidx)
 {
-  uint8_t ret = 0U;
+  UNUSED(cfgidx);
   USBD_CUSTOM_HID_HandleTypeDef *hhid;
 
+  hhid = USBD_malloc(sizeof(USBD_CUSTOM_HID_HandleTypeDef));
+
+  if (hhid == NULL)
+  {
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
+  }
+
+  pdev->pClassData = (void *)hhid;
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
+  {
+    pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].bInterval = CUSTOM_HID_HS_BINTERVAL;
+    pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].bInterval = CUSTOM_HID_HS_BINTERVAL;
+  }
+  else   /* LOW and FULL-speed endpoints */
+  {
+    pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].bInterval = CUSTOM_HID_FS_BINTERVAL;
+    pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].bInterval = CUSTOM_HID_FS_BINTERVAL;
+  }
+
   /* Open EP IN */
-  USBD_LL_OpenEP(pdev, CUSTOM_HID_EPIN_ADDR, USBD_EP_TYPE_INTR,
+  (void)USBD_LL_OpenEP(pdev, CUSTOM_HID_EPIN_ADDR, USBD_EP_TYPE_INTR,
                        CUSTOM_HID_EPIN_SIZE);
 
   pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].is_used = 1U;
 
   /* Open EP OUT */
-  USBD_LL_OpenEP(pdev, CUSTOM_HID_EPOUT_ADDR, USBD_EP_TYPE_INTR,
+  (void)USBD_LL_OpenEP(pdev, CUSTOM_HID_EPOUT_ADDR, USBD_EP_TYPE_INTR,
                        CUSTOM_HID_EPOUT_SIZE);
 
   pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].is_used = 1U;
 
-  pdev->pClassData = USBD_malloc(sizeof (USBD_CUSTOM_HID_HandleTypeDef));
-
-  if(pdev->pClassData == NULL)
-  {
-    ret = 1U;
-  }
-  else
-  {
-    hhid = (USBD_CUSTOM_HID_HandleTypeDef*) pdev->pClassData;
-
   hhid->state = CUSTOM_HID_IDLE;
+
   ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->Init();
 
   /* Prepare Out endpoint to receive 1st packet */
-    USBD_LL_PrepareReceive(pdev, CUSTOM_HID_EPOUT_ADDR, hhid->Report_buf,
+  (void)USBD_LL_PrepareReceive(pdev, CUSTOM_HID_EPOUT_ADDR, hhid->Report_buf,
                                USBD_CUSTOMHID_OUTREPORT_BUF_SIZE);
-  }
 
-  return ret;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -400,25 +398,29 @@ static uint8_t  USBD_CUSTOM_HID_Init (USBD_HandleTypeDef *pdev,
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_CUSTOM_HID_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                                 uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+
   /* Close CUSTOM_HID EP IN */
-  USBD_LL_CloseEP(pdev, CUSTOM_HID_EPIN_ADDR);
+  (void)USBD_LL_CloseEP(pdev, CUSTOM_HID_EPIN_ADDR);
   pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].is_used = 0U;
+  pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].bInterval = 0U;
 
   /* Close CUSTOM_HID EP OUT */
-  USBD_LL_CloseEP(pdev, CUSTOM_HID_EPOUT_ADDR);
+  (void)USBD_LL_CloseEP(pdev, CUSTOM_HID_EPOUT_ADDR);
   pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].is_used = 0U;
+  pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].bInterval = 0U;
 
   /* FRee allocated memory */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData != NULL)
   {
     ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->DeInit();
     USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -428,18 +430,18 @@ static uint8_t  USBD_CUSTOM_HID_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_Setup(USBD_HandleTypeDef *pdev,
                                      USBD_SetupReqTypedef *req)
 {
-  USBD_CUSTOM_HID_HandleTypeDef *hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_CUSTOM_HID_HandleTypeDef *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
   uint16_t len = 0U;
   uint8_t  *pbuf = NULL;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-  case USB_REQ_TYPE_CLASS :
+  case USB_REQ_TYPE_CLASS:
     switch (req->bRequest)
     {
     case CUSTOM_HID_REQ_SET_PROTOCOL:
@@ -447,7 +449,7 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     case CUSTOM_HID_REQ_GET_PROTOCOL:
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->Protocol, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->Protocol, 1U);
       break;
 
     case CUSTOM_HID_REQ_SET_IDLE:
@@ -455,16 +457,16 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     case CUSTOM_HID_REQ_GET_IDLE:
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->IdleState, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->IdleState, 1U);
       break;
 
     case CUSTOM_HID_REQ_SET_REPORT:
       hhid->IsReportAvailable = 1U;
-      USBD_CtlPrepareRx (pdev, hhid->Report_buf, req->wLength);
+      (void)USBD_CtlPrepareRx(pdev, hhid->Report_buf, req->wLength);
       break;
 
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -476,70 +478,73 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     case USB_REQ_GET_DESCRIPTOR:
-      if( req->wValue >> 8 == CUSTOM_HID_REPORT_DESC)
+      if ((req->wValue >> 8) == CUSTOM_HID_REPORT_DESC)
       {
-        len = MIN(USBD_CUSTOM_HID_REPORT_DESC_SIZE , req->wLength);
+        len = MIN(USBD_CUSTOM_HID_REPORT_DESC_SIZE, req->wLength);
         pbuf = ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->pReport;
       }
       else
       {
-        if( req->wValue >> 8 == CUSTOM_HID_DESCRIPTOR_TYPE)
+        if ((req->wValue >> 8) == CUSTOM_HID_DESCRIPTOR_TYPE)
         {
           pbuf = USBD_CUSTOM_HID_Desc;
-          len = MIN(USB_CUSTOM_HID_DESC_SIZ , req->wLength);
+          len = MIN(USB_CUSTOM_HID_DESC_SIZ, req->wLength);
         }
       }
 
-      USBD_CtlSendData (pdev, pbuf, len);
+      (void)USBD_CtlSendData(pdev, pbuf, len);
       break;
 
-    case USB_REQ_GET_INTERFACE :
+    case USB_REQ_GET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->AltSetting, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->AltSetting, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
-    case USB_REQ_SET_INTERFACE :
+    case USB_REQ_SET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
         hhid->AltSetting = (uint8_t)(req->wValue);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -549,25 +554,31 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
   * @param  buff: pointer to report
   * @retval status
   */
-uint8_t USBD_CUSTOM_HID_SendReport (USBD_HandleTypeDef  *pdev,
+uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef *pdev,
-                                    uint8_t *report,
+                                   uint8_t *report, uint16_t len)
-                                    uint16_t len)
 {
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_CUSTOM_HID_HandleTypeDef *hhid;
 
-  if (pdev->dev_state == USBD_STATE_CONFIGURED )
+  if (pdev->pClassData == NULL)
   {
-    if(hhid->state == CUSTOM_HID_IDLE)
+    return (uint8_t)USBD_FAIL;
+  }
+
+  hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+
+  if (pdev->dev_state == USBD_STATE_CONFIGURED)
+  {
+    if (hhid->state == CUSTOM_HID_IDLE)
     {
       hhid->state = CUSTOM_HID_BUSY;
-      USBD_LL_Transmit (pdev, CUSTOM_HID_EPIN_ADDR, report, len);
+      (void)USBD_LL_Transmit(pdev, CUSTOM_HID_EPIN_ADDR, report, len);
     }
     else
     {
-      return USBD_BUSY;
+      return (uint8_t)USBD_BUSY;
     }
   }
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -577,9 +588,10 @@ uint8_t USBD_CUSTOM_HID_SendReport (USBD_HandleTypeDef  *pdev,
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CUSTOM_HID_GetFSCfgDesc (uint16_t *length)
+static uint8_t *USBD_CUSTOM_HID_GetFSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CUSTOM_HID_CfgFSDesc);
+  *length = (uint16_t)sizeof(USBD_CUSTOM_HID_CfgFSDesc);
+
   return USBD_CUSTOM_HID_CfgFSDesc;
 }
 
@@ -590,9 +602,10 @@ static uint8_t  *USBD_CUSTOM_HID_GetFSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CUSTOM_HID_GetHSCfgDesc (uint16_t *length)
+static uint8_t *USBD_CUSTOM_HID_GetHSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CUSTOM_HID_CfgHSDesc);
+  *length = (uint16_t)sizeof(USBD_CUSTOM_HID_CfgHSDesc);
+
   return USBD_CUSTOM_HID_CfgHSDesc;
 }
 
@@ -603,9 +616,10 @@ static uint8_t  *USBD_CUSTOM_HID_GetHSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc (uint16_t *length)
+static uint8_t *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CUSTOM_HID_OtherSpeedCfgDesc);
+  *length = (uint16_t)sizeof(USBD_CUSTOM_HID_OtherSpeedCfgDesc);
+
   return USBD_CUSTOM_HID_OtherSpeedCfgDesc;
 }
 
@@ -616,14 +630,15 @@ static uint8_t  *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc (uint16_t *length)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_CUSTOM_HID_DataIn (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                                        uint8_t epnum)
 {
+  UNUSED(epnum);
+
   /* Ensure that the FIFO is empty before a new transfer, this condition could
   be caused by  a new transfer before the end of the previous transfer */
   ((USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData)->state = CUSTOM_HID_IDLE;
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -633,21 +648,52 @@ static uint8_t  USBD_CUSTOM_HID_DataIn (USBD_HandleTypeDef *pdev,
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_CUSTOM_HID_DataOut (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_CUSTOM_HID_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                                          uint8_t epnum)
 {
+  UNUSED(epnum);
+  USBD_CUSTOM_HID_HandleTypeDef *hhid;
 
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+  if (pdev->pClassData == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
+  hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+
+  /* USB data will be immediately processed, this allow next USB traffic being
+  NAKed till the end of the application processing */
   ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->OutEvent(hhid->Report_buf[0],
                                                             hhid->Report_buf[1]);
 
-  USBD_LL_PrepareReceive(pdev, CUSTOM_HID_EPOUT_ADDR , hhid->Report_buf,
+  return (uint8_t)USBD_OK;
+}
+
+
+/**
+  * @brief  USBD_CUSTOM_HID_ReceivePacket
+  *         prepare OUT Endpoint for reception
+  * @param  pdev: device instance
+  * @retval status
+  */
+uint8_t USBD_CUSTOM_HID_ReceivePacket(USBD_HandleTypeDef *pdev)
+{
+  USBD_CUSTOM_HID_HandleTypeDef *hhid;
+
+  if (pdev->pClassData == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
+  hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+
+  /* Resume USB Out process */
+  (void)USBD_LL_PrepareReceive(pdev, CUSTOM_HID_EPOUT_ADDR, hhid->Report_buf,
                                USBD_CUSTOMHID_OUTREPORT_BUF_SIZE);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
+
 /**
   * @brief  USBD_CUSTOM_HID_EP0_RxReady
   *         Handles control request data.
@@ -656,7 +702,7 @@ static uint8_t  USBD_CUSTOM_HID_DataOut (USBD_HandleTypeDef *pdev,
   */
 static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_CUSTOM_HID_HandleTypeDef *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
 
   if (hhid->IsReportAvailable == 1U)
   {
@@ -665,7 +711,7 @@ static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
     hhid->IsReportAvailable = 0U;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -674,9 +720,10 @@ static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-static uint8_t  *USBD_CUSTOM_HID_GetDeviceQualifierDesc (uint16_t *length)
+static uint8_t *USBD_CUSTOM_HID_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_CUSTOM_HID_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_CUSTOM_HID_DeviceQualifierDesc);
+
   return USBD_CUSTOM_HID_DeviceQualifierDesc;
 }
 
@@ -686,18 +733,17 @@ static uint8_t  *USBD_CUSTOM_HID_GetDeviceQualifierDesc (uint16_t *length)
   * @param  fops: CUSTOMHID Interface callback
   * @retval status
   */
-uint8_t  USBD_CUSTOM_HID_RegisterInterface  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CUSTOM_HID_RegisterInterface(USBD_HandleTypeDef *pdev,
                                           USBD_CUSTOM_HID_ItfTypeDef *fops)
 {
-  uint8_t  ret = USBD_FAIL;
+  if (fops == NULL)
-
-  if(fops != NULL)
   {
-    pdev->pUserData= fops;
+    return (uint8_t)USBD_FAIL;
-    ret = USBD_OK;
   }
 
-  return ret;
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 /**
   * @}

Class/CustomHID/Src/usbd_customhid_if_template.c

@@ -14,15 +14,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_customhid_if_template.h"
@@ -31,9 +31,9 @@
 /* Private macro -------------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
 
-static int8_t TEMPLATE_CUSTOM_HID_Init     (void);
+static int8_t TEMPLATE_CUSTOM_HID_Init(void);
-static int8_t TEMPLATE_CUSTOM_HID_DeInit   (void);
+static int8_t TEMPLATE_CUSTOM_HID_DeInit(void);
-static int8_t TEMPLATE_CUSTOM_HID_OutEvent (uint8_t event_idx, uint8_t state);
+static int8_t TEMPLATE_CUSTOM_HID_OutEvent(uint8_t event_idx, uint8_t state);
 /* Private variables ---------------------------------------------------------*/
 USBD_CUSTOM_HID_ItfTypeDef USBD_CustomHID_template_fops =
 {
@@ -53,7 +53,6 @@ USBD_CUSTOM_HID_ItfTypeDef USBD_CustomHID_template_fops =
   */
 static int8_t TEMPLATE_CUSTOM_HID_Init(void)
 {
-
   return (0);
 }
 
@@ -79,8 +78,13 @@ static int8_t TEMPLATE_CUSTOM_HID_DeInit(void)
   * @param  state: event state
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
-static int8_t TEMPLATE_CUSTOM_HID_OutEvent  (uint8_t event_idx, uint8_t state)
+static int8_t TEMPLATE_CUSTOM_HID_OutEvent(uint8_t event_idx, uint8_t state)
 {
+  UNUSED(event_idx);
+  UNUSED(state);
+
+    /* Start next USB packet transfer once data processing is completed */
+  USBD_CUSTOM_HID_ReceivePacket(&USBD_Device);
 
   return (0);
 }

Class/DFU/Inc/usbd_dfu.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_DFU_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -115,13 +115,13 @@
 /* Other defines                                  */
 /**************************************************/
 /* Bit Detach capable = bit 3 in bmAttributes field */
-#define DFU_DETACH_MASK                (uint8_t)(1 << 4)
+#define DFU_DETACH_MASK                (1U << 4)
 #define DFU_STATUS_DEPTH               6U
 
 typedef enum
 {
   DFU_DETACH = 0U,
-  DFU_DNLOAD ,
+  DFU_DNLOAD,
   DFU_UPLOAD,
   DFU_GETSTATUS,
   DFU_CLRSTATUS,
@@ -144,9 +144,9 @@ typedef  void (*pFunction)(void);
                                       USBD_IDX_INTERFACE_STR + (n) + 1U /* iInterface: Index of string descriptor */ \
 
 #define TRANSFER_SIZE_BYTES(size)      ((uint8_t)(size)), /* XFERSIZEB0 */\
-                                       ((uint8_t)(size >> 8)) /* XFERSIZEB1 */
+                                       ((uint8_t)((size) >> 8)) /* XFERSIZEB1 */
 
-#define IS_PROTECTED_AREA(add)         (uint8_t)(((add >= 0x08000000) && (add < (APP_DEFAULT_ADD)))? 1:0)
+#define IS_PROTECTED_AREA(add)         (uint8_t)((((add) >= 0x08000000) && ((add) < (APP_DEFAULT_ADD)))? 1:0)
 
 /**
   * @}
@@ -163,7 +163,7 @@ typedef struct
   {
     uint32_t d32[USBD_DFU_XFER_SIZE / 4U];
     uint8_t d8[USBD_DFU_XFER_SIZE];
-  }buffer;
+  } buffer;
 
   uint32_t wblock_num;
   uint32_t wlength;
@@ -174,20 +174,18 @@ typedef struct
   uint8_t ReservedForAlign[2];
   uint8_t dev_state;
   uint8_t manif_state;
-}
+} USBD_DFU_HandleTypeDef;
-USBD_DFU_HandleTypeDef;
 
 typedef struct
 {
-  const uint8_t* pStrDesc;
+  const uint8_t *pStrDesc;
-  uint16_t (* Init)     (void);
+  uint16_t (* Init)(void);
-  uint16_t (* DeInit)   (void);
+  uint16_t (* DeInit)(void);
-  uint16_t (* Erase)    (uint32_t Add);
+  uint16_t (* Erase)(uint32_t Add);
-  uint16_t (* Write)    (uint8_t *src, uint8_t *dest, uint32_t Len);
+  uint16_t (* Write)(uint8_t *src, uint8_t *dest, uint32_t Len);
-  uint8_t* (* Read)     (uint8_t *src, uint8_t *dest, uint32_t Len);
+  uint8_t *(* Read)(uint8_t *src, uint8_t *dest, uint32_t Len);
   uint16_t (* GetStatus)(uint32_t Add, uint8_t cmd, uint8_t *buff);
-}
+} USBD_DFU_MediaTypeDef;
-USBD_DFU_MediaTypeDef;
 /**
   * @}
   */
@@ -215,7 +213,7 @@ extern USBD_ClassTypeDef  USBD_DFU;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t  USBD_DFU_RegisterMedia    (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_DFU_RegisterMedia(USBD_HandleTypeDef *pdev,
                                USBD_DFU_MediaTypeDef *fops);
 /**
   * @}

Class/DFU/Inc/usbd_dfu_media_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_DFU_MEDIA_TEMPLATE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/

Class/DFU/Src/usbd_dfu.c

@@ -42,15 +42,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_dfu.h"
@@ -93,60 +93,33 @@
   */
 
 
-
-
 /** @defgroup USBD_DFU_Private_FunctionPrototypes
   * @{
   */
 
+static uint8_t USBD_DFU_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_DFU_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_DFU_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static uint8_t USBD_DFU_EP0_RxReady(USBD_HandleTypeDef *pdev);
+static uint8_t USBD_DFU_EP0_TxReady(USBD_HandleTypeDef *pdev);
+static uint8_t USBD_DFU_SOF(USBD_HandleTypeDef *pdev);
 
-static uint8_t  USBD_DFU_Init (USBD_HandleTypeDef *pdev,
+static uint8_t *USBD_DFU_GetCfgDesc(uint16_t *length);
-                               uint8_t cfgidx);
+static uint8_t *USBD_DFU_GetDeviceQualifierDesc(uint16_t *length);
 
-static uint8_t  USBD_DFU_DeInit (USBD_HandleTypeDef *pdev,
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
-                                 uint8_t cfgidx);
+static uint8_t *USBD_DFU_GetUsrStringDesc(USBD_HandleTypeDef *pdev,
-
+                                          uint8_t index, uint16_t *length);
-static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req);
-
-static uint8_t  *USBD_DFU_GetCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_DFU_GetDeviceQualifierDesc (uint16_t *length);
-
-static uint8_t  USBD_DFU_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_DFU_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_DFU_EP0_RxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_DFU_SOF (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_DFU_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_DFU_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-#if (USBD_SUPPORT_USER_STRING == 1U)
-static uint8_t* USBD_DFU_GetUsrStringDesc ( USBD_HandleTypeDef *pdev, uint8_t index , uint16_t *length);
 #endif
 
-static void DFU_Detach    (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static void DFU_Detach(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static void DFU_Download  (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static void DFU_GetStatus(USBD_HandleTypeDef *pdev);
-static void DFU_Upload    (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static void DFU_ClearStatus(USBD_HandleTypeDef *pdev);
-
+static void DFU_GetState(USBD_HandleTypeDef *pdev);
-static void DFU_GetStatus (USBD_HandleTypeDef *pdev);
+static void DFU_Abort(USBD_HandleTypeDef *pdev);
-
+static void DFU_Leave(USBD_HandleTypeDef *pdev);
-static void DFU_ClearStatus (USBD_HandleTypeDef *pdev);
-
-static void DFU_GetState  (USBD_HandleTypeDef *pdev);
-
-static void DFU_Abort     (USBD_HandleTypeDef *pdev);
-
-static void DFU_Leave  (USBD_HandleTypeDef *pdev);
-
 
 /**
   * @}
@@ -163,16 +136,16 @@ USBD_ClassTypeDef  USBD_DFU =
   USBD_DFU_Setup,
   USBD_DFU_EP0_TxReady,
   USBD_DFU_EP0_RxReady,
-  USBD_DFU_DataIn,
+  NULL,
-  USBD_DFU_DataOut,
+  NULL,
   USBD_DFU_SOF,
-  USBD_DFU_IsoINIncomplete,
+  NULL,
-  USBD_DFU_IsoOutIncomplete,
+  NULL,
   USBD_DFU_GetCfgDesc,
   USBD_DFU_GetCfgDesc,
   USBD_DFU_GetCfgDesc,
   USBD_DFU_GetDeviceQualifierDesc,
-#if (USBD_SUPPORT_USER_STRING == 1U)
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
   USBD_DFU_GetUsrStringDesc
 #endif
 };
@@ -185,11 +158,11 @@ __ALIGN_BEGIN static uint8_t USBD_DFU_CfgDesc[USB_DFU_CONFIG_DESC_SIZ] __ALIGN_E
   USB_DFU_CONFIG_DESC_SIZ,
                                                        /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                                /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                                /* bConfigurationValue: Configuration value */
-  0x02,         /*iConfiguration: Index of string descriptor describing the configuration*/
+  0x02,                                                /* iConfiguration: Index of string descriptor describing the configuration */
-  0xC0,         /*bmAttributes: bus powered and Supprts Remote Wakeup */
+  0xC0,                                                /* bmAttributes: bus powered and Supprts Remote Wakeup */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x32,                                                /* MaxPower 100 mA: this current is used for detecting Vbus */
   /* 09 */
 
   /**********  Descriptor of DFU interface 0 Alternate setting 0 **************/
@@ -225,21 +198,21 @@ __ALIGN_BEGIN static uint8_t USBD_DFU_CfgDesc[USB_DFU_CONFIG_DESC_SIZ] __ALIGN_E
 #endif /* (USBD_DFU_MAX_ITF_NUM > 6) */
 
   /******************** DFU Functional Descriptor********************/
-  0x09,   /*blength = 9 Bytes*/
+  0x09,                                                /* blength = 9 Bytes */
-  DFU_DESCRIPTOR_TYPE,   /* DFU Functional Descriptor*/
+  DFU_DESCRIPTOR_TYPE,                                 /* DFU Functional Descriptor */
-  0x0B,   /*bmAttribute
+  0x0B,                                                /* bmAttribute:
                                                           bitCanDnload             = 1      (bit 0)
                                                           bitCanUpload             = 1      (bit 1)
                                                           bitManifestationTolerant = 0      (bit 2)
                                                           bitWillDetach            = 1      (bit 3)
                                                           Reserved                          (bit4-6)
-                bitAcceleratedST         = 0      (bit 7)*/
+                                                          bitAcceleratedST         = 0      (bit 7) */
-  0xFF,   /*DetachTimeOut= 255 ms*/
+  0xFF,                                                /* DetachTimeOut= 255 ms*/
   0x00,
-  /*WARNING: In DMA mode the multiple MPS packets feature is still not supported
+  /* WARNING: In DMA mode the multiple MPS packets feature is still not supported
    ==> In this case, when using DMA USBD_DFU_XFER_SIZE should be set to 64 in usbd_conf.h */
-  TRANSFER_SIZE_BYTES(USBD_DFU_XFER_SIZE),       /* TransferSize = 1024 Byte*/
+  TRANSFER_SIZE_BYTES(USBD_DFU_XFER_SIZE),       /* TransferSize = 1024 Byte */
-  0x1A,                                /* bcdDFUVersion*/
+  0x1A,                                /* bcdDFUVersion */
   0x01
   /***********************************************************/
   /* 9*/
@@ -275,21 +248,22 @@ __ALIGN_BEGIN static uint8_t USBD_DFU_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_DFU_Init (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_DFU_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                               uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+
   USBD_DFU_HandleTypeDef *hdfu;
 
   /* Allocate Audio structure */
-  pdev->pClassData = USBD_malloc(sizeof (USBD_DFU_HandleTypeDef));
+  hdfu = USBD_malloc(sizeof(USBD_DFU_HandleTypeDef));
 
-  if(pdev->pClassData == NULL)
+  if (hdfu == NULL)
   {
-    return USBD_FAIL;
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
   }
-  else
+
-  {
+  pdev->pClassData = (void *)hdfu;
-    hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   hdfu->alt_setting = 0U;
   hdfu->data_ptr = USBD_DFU_APP_DEFAULT_ADD;
@@ -309,10 +283,10 @@ static uint8_t  USBD_DFU_Init (USBD_HandleTypeDef *pdev,
   /* Initialize Hardware layer */
   if (((USBD_DFU_MediaTypeDef *)pdev->pUserData)->Init() != USBD_OK)
   {
-      return USBD_FAIL;
+    return (uint8_t)USBD_FAIL;
   }
-  }
+
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -322,12 +296,17 @@ static uint8_t  USBD_DFU_Init (USBD_HandleTypeDef *pdev,
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_DFU_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_DFU_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                                 uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
   USBD_DFU_HandleTypeDef *hdfu;
-  hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
+  if (pdev->pClassData == NULL)
+  {
+    return (uint8_t)USBD_EMEM;
+  }
+
+  hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
   hdfu->wblock_num = 0U;
   hdfu->wlength = 0U;
 
@@ -335,16 +314,12 @@ static uint8_t  USBD_DFU_DeInit (USBD_HandleTypeDef *pdev,
   hdfu->dev_status[0] = DFU_ERROR_NONE;
   hdfu->dev_status[4] = DFU_STATE_IDLE;
 
-  /* DeInit  physical Interface components */
+  /* DeInit  physical Interface components and Hardware Layer */
-  if(pdev->pClassData != NULL)
-  {
-    /* De-Initialize Hardware layer */
   ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->DeInit();
   USBD_free(pdev->pClassData);
   pdev->pClassData = NULL;
-  }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -354,16 +329,13 @@ static uint8_t  USBD_DFU_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_DFU_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                                USBD_SetupReqTypedef *req)
 {
-  USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-  uint8_t *pbuf = 0U;
+  USBD_StatusTypeDef ret = USBD_OK;
+  uint8_t *pbuf = NULL;
   uint16_t len = 0U;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
-
-  hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -399,7 +371,7 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -411,33 +383,33 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     case USB_REQ_GET_DESCRIPTOR:
-      if( (req->wValue >> 8) == DFU_DESCRIPTOR_TYPE)
+      if ((req->wValue >> 8) == DFU_DESCRIPTOR_TYPE)
       {
         pbuf = USBD_DFU_CfgDesc + (9U * (USBD_DFU_MAX_ITF_NUM + 1U));
-        len = MIN(USB_DFU_DESC_SIZ , req->wLength);
+        len = MIN(USB_DFU_DESC_SIZ, req->wLength);
       }
 
-      USBD_CtlSendData (pdev, pbuf, len);
+      (void)USBD_CtlSendData(pdev, pbuf, len);
       break;
 
     case USB_REQ_GET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&hdfu->alt_setting, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)hdfu->alt_setting, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
@@ -451,32 +423,35 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
         }
         else
         {
-          USBD_CtlError (pdev, req);
+          USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
         }
       }
       else
       {
         /* Call the error management function (command will be nacked */
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 
@@ -487,25 +462,13 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_DFU_GetCfgDesc (uint16_t *length)
+static uint8_t *USBD_DFU_GetCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_DFU_CfgDesc);
+  *length = (uint16_t)sizeof(USBD_DFU_CfgDesc);
+
   return USBD_DFU_CfgDesc;
 }
 
-/**
-  * @brief  USBD_DFU_DataIn
-  *         handle data IN Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_DFU_DataIn (USBD_HandleTypeDef *pdev,
-                              uint8_t epnum)
-{
-
-  return USBD_OK;
-}
 
 /**
   * @brief  USBD_DFU_EP0_RxReady
@@ -513,10 +476,11 @@ static uint8_t  USBD_DFU_DataIn (USBD_HandleTypeDef *pdev,
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_DFU_EP0_RxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_DFU_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_DFU_EP0_TxReady
@@ -524,40 +488,49 @@ static uint8_t  USBD_DFU_EP0_RxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
+static uint8_t  USBD_DFU_EP0_TxReady(USBD_HandleTypeDef *pdev)
 {
- uint32_t addr;
   USBD_SetupReqTypedef req;
- USBD_DFU_HandleTypeDef   *hdfu;
+  uint32_t addr;
-
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
+  USBD_DFU_MediaTypeDef *DfuInterface = (USBD_DFU_MediaTypeDef *)pdev->pUserData;
 
   if (hdfu->dev_state == DFU_STATE_DNLOAD_BUSY)
   {
     /* Decode the Special Command*/
     if (hdfu->wblock_num == 0U)
     {
-      if ((hdfu->buffer.d8[0] == DFU_CMD_GETCOMMANDS) && (hdfu->wlength == 1U))
+      if(hdfu->wlength == 1U)
       {
-
+        if (hdfu->buffer.d8[0] == DFU_CMD_GETCOMMANDS)
+        {
+          /* nothink to do */
         }
-      else if ((hdfu->buffer.d8[0] == DFU_CMD_SETADDRESSPOINTER) && (hdfu->wlength == 5U))
+      }
+      else if (hdfu->wlength == 5U)
+      {
+        if (hdfu->buffer.d8[0] == DFU_CMD_SETADDRESSPOINTER)
         {
           hdfu->data_ptr = hdfu->buffer.d8[1];
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[2] << 8;
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[3] << 16;
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[4] << 24;
         }
-      else if ((hdfu->buffer.d8[0] == DFU_CMD_ERASE) && (hdfu->wlength == 5U))
+        else if (hdfu->buffer.d8[0] == DFU_CMD_ERASE)
         {
           hdfu->data_ptr = hdfu->buffer.d8[1];
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[2] << 8;
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[3] << 16;
           hdfu->data_ptr += (uint32_t)hdfu->buffer.d8[4] << 24;
 
-        if (((USBD_DFU_MediaTypeDef *)pdev->pUserData)->Erase(hdfu->data_ptr) != USBD_OK)
+          if (DfuInterface->Erase(hdfu->data_ptr) != USBD_OK)
           {
-          return USBD_FAIL;
+            return (uint8_t)USBD_FAIL;
+          }
+        }
+        else
+        {
+          /* .. */
         }
       }
       else
@@ -568,7 +541,7 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
         /* Call the error management function (command will be nacked) */
         req.bmRequest = 0U;
         req.wLength = 1U;
-        USBD_CtlError (pdev, &req);
+        USBD_CtlError(pdev, &req);
       }
     }
     /* Regular Download Command */
@@ -580,10 +553,9 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
         addr = ((hdfu->wblock_num - 2U) * USBD_DFU_XFER_SIZE) + hdfu->data_ptr;
 
         /* Preform the write operation */
-        if (((USBD_DFU_MediaTypeDef *)pdev->pUserData)->Write(hdfu->buffer.d8,
+        if (DfuInterface->Write(hdfu->buffer.d8, (uint8_t *)addr, hdfu->wlength) != USBD_OK)
-                                     (uint8_t *)addr, hdfu->wlength) != USBD_OK)
         {
-          return USBD_FAIL;
+          return (uint8_t)USBD_FAIL;
         }
       }
     }
@@ -599,18 +571,18 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
     hdfu->dev_status[2] = 0U;
     hdfu->dev_status[3] = 0U;
     hdfu->dev_status[4] = hdfu->dev_state;
-    return USBD_OK;
   }
-  else
+  else if (hdfu->dev_state == DFU_STATE_MANIFEST)/* Manifestation in progress */
-  {
-    if (hdfu->dev_state == DFU_STATE_MANIFEST)/* Manifestation in progress */
   {
     /* Start leaving DFU mode */
     DFU_Leave(pdev);
   }
+  else
+  {
+    /* .. */
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_DFU_SOF
@@ -618,48 +590,13 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_DFU_SOF (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_DFU_SOF(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
-/**
-  * @brief  USBD_DFU_IsoINIncomplete
-  *         handle data ISO IN Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_DFU_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
 
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_DFU_IsoOutIncomplete
-  *         handle data ISO OUT Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_DFU_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_DFU_DataOut
-  *         handle data OUT Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_DFU_DataOut (USBD_HandleTypeDef *pdev,
-                              uint8_t epnum)
-{
-
-  return USBD_OK;
-}
 
 /**
 * @brief  DeviceQualifierDescriptor
@@ -667,9 +604,10 @@ static uint8_t  USBD_DFU_DataOut (USBD_HandleTypeDef *pdev,
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-static uint8_t  *USBD_DFU_GetDeviceQualifierDesc (uint16_t *length)
+static uint8_t *USBD_DFU_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_DFU_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_DFU_DeviceQualifierDesc);
+
   return USBD_DFU_DeviceQualifierDesc;
 }
 
@@ -681,19 +619,21 @@ static uint8_t  *USBD_DFU_GetDeviceQualifierDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to the descriptor table or NULL if the descriptor is not supported.
   */
-#if (USBD_SUPPORT_USER_STRING == 1U)
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
-static uint8_t* USBD_DFU_GetUsrStringDesc (USBD_HandleTypeDef *pdev, uint8_t index , uint16_t *length)
+static uint8_t *USBD_DFU_GetUsrStringDesc(USBD_HandleTypeDef *pdev, uint8_t index, uint16_t *length)
 {
   static uint8_t USBD_StrDesc[255];
+  USBD_DFU_MediaTypeDef *DfuInterface = (USBD_DFU_MediaTypeDef *)pdev->pUserData;
+
   /* Check if the requested string interface is supported */
   if (index <= (USBD_IDX_INTERFACE_STR + USBD_DFU_MAX_ITF_NUM))
   {
-    USBD_GetString ((uint8_t *)((USBD_DFU_MediaTypeDef *)pdev->pUserData)->pStrDesc, USBD_StrDesc, length);
+    USBD_GetString((uint8_t *)DfuInterface->pStrDesc, USBD_StrDesc, length);
     return USBD_StrDesc;
   }
-  /* Not supported Interface Descriptor index */
   else
   {
+    /* Not supported Interface Descriptor index */
     return NULL;
   }
 }
@@ -704,14 +644,17 @@ static uint8_t* USBD_DFU_GetUsrStringDesc (USBD_HandleTypeDef *pdev, uint8_t ind
 * @param  fops: storage callback
 * @retval status
 */
-uint8_t  USBD_DFU_RegisterMedia    (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_DFU_RegisterMedia(USBD_HandleTypeDef *pdev,
                                USBD_DFU_MediaTypeDef *fops)
 {
-  if(fops != NULL)
+  if (fops == NULL)
   {
-    pdev->pUserData= fops;
+    return (uint8_t)USBD_FAIL;
   }
-  return 0U;
+
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 
 /******************************************************************************
@@ -726,13 +669,13 @@ uint8_t  USBD_DFU_RegisterMedia    (USBD_HandleTypeDef   *pdev,
   */
 static void DFU_Detach(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
 
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
+  if ((hdfu->dev_state == DFU_STATE_IDLE) ||
-
+      (hdfu->dev_state == DFU_STATE_DNLOAD_SYNC) ||
-  if (hdfu->dev_state == DFU_STATE_IDLE || hdfu->dev_state == DFU_STATE_DNLOAD_SYNC
+      (hdfu->dev_state == DFU_STATE_DNLOAD_IDLE) ||
-      || hdfu->dev_state == DFU_STATE_DNLOAD_IDLE || hdfu->dev_state == DFU_STATE_MANIFEST_SYNC
+      (hdfu->dev_state == DFU_STATE_MANIFEST_SYNC) ||
-        || hdfu->dev_state == DFU_STATE_UPLOAD_IDLE )
+      (hdfu->dev_state == DFU_STATE_UPLOAD_IDLE))
   {
     /* Update the state machine */
     hdfu->dev_state = DFU_STATE_IDLE;
@@ -747,16 +690,16 @@ static void DFU_Detach(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   }
 
   /* Check the detach capability in the DFU functional descriptor */
-  if ((USBD_DFU_CfgDesc[12U + (9U * USBD_DFU_MAX_ITF_NUM)]) & DFU_DETACH_MASK)
+  if (((USBD_DFU_CfgDesc[12U + (9U * USBD_DFU_MAX_ITF_NUM)]) & DFU_DETACH_MASK) != 0U)
   {
     /* Perform an Attach-Detach operation on USB bus */
-    USBD_Stop (pdev);
+    (void)USBD_Stop(pdev);
-    USBD_Start (pdev);
+    (void)USBD_Start(pdev);
   }
   else
   {
     /* Wait for the period of time specified in Detach request */
-    USBD_Delay ((uint32_t)req->wValue);
+    USBD_Delay((uint32_t)req->wValue);
   }
 }
 
@@ -769,9 +712,7 @@ static void DFU_Detach(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   */
 static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   /* Data setup request */
   if (req->wLength > 0U)
@@ -787,21 +728,20 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       hdfu->dev_status[4] = hdfu->dev_state;
 
       /* Prepare the reception of the buffer over EP0 */
-      USBD_CtlPrepareRx (pdev, (uint8_t*)hdfu->buffer.d8,
+      (void)USBD_CtlPrepareRx(pdev, (uint8_t *)hdfu->buffer.d8, hdfu->wlength);
-                         (uint16_t)hdfu->wlength);
     }
     /* Unsupported state */
     else
     {
       /* Call the error management function (command will be nacked */
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
     }
   }
   /* 0 Data DNLOAD request */
   else
   {
     /* End of DNLOAD operation*/
-    if (hdfu->dev_state == DFU_STATE_DNLOAD_IDLE || hdfu->dev_state == DFU_STATE_IDLE )
+    if ((hdfu->dev_state == DFU_STATE_DNLOAD_IDLE) || (hdfu->dev_state == DFU_STATE_IDLE))
     {
       hdfu->manif_state = DFU_MANIFEST_IN_PROGRESS;
       hdfu->dev_state = DFU_STATE_MANIFEST_SYNC;
@@ -813,7 +753,7 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     else
     {
       /* Call the error management function (command will be nacked */
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
     }
   }
 }
@@ -827,12 +767,10 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   */
 static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
+  USBD_DFU_MediaTypeDef *DfuInterface = (USBD_DFU_MediaTypeDef *)pdev->pUserData;
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
+  uint8_t *phaddr;
-
+  uint32_t addr;
-  uint8_t *phaddr = NULL;
-  uint32_t addr = 0U;
 
   /* Data setup request */
   if (req->wLength > 0U)
@@ -847,7 +785,7 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       if (hdfu->wblock_num == 0U)
       {
         /* Update the state machine */
-        hdfu->dev_state = (hdfu->wlength > 3U)? DFU_STATE_IDLE:DFU_STATE_UPLOAD_IDLE;
+        hdfu->dev_state = (hdfu->wlength > 3U) ? DFU_STATE_IDLE : DFU_STATE_UPLOAD_IDLE;
 
         hdfu->dev_status[1] = 0U;
         hdfu->dev_status[2] = 0U;
@@ -860,7 +798,7 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
         hdfu->buffer.d8[2] = DFU_CMD_ERASE;
 
         /* Send the status data over EP0 */
-        USBD_CtlSendData (pdev, (uint8_t *)(&(hdfu->buffer.d8[0])), 3U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)(&(hdfu->buffer.d8[0])), 3U);
       }
       else if (hdfu->wblock_num > 1U)
       {
@@ -871,13 +809,13 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
         hdfu->dev_status[3] = 0U;
         hdfu->dev_status[4] = hdfu->dev_state;
 
-        addr = ((hdfu->wblock_num - 2U) * USBD_DFU_XFER_SIZE) + hdfu->data_ptr;  /* Change is Accelerated*/
+        addr = ((hdfu->wblock_num - 2U) * USBD_DFU_XFER_SIZE) + hdfu->data_ptr;
 
         /* Return the physical address where data are stored */
-        phaddr = ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->Read((uint8_t *)addr, hdfu->buffer.d8, hdfu->wlength);
+        phaddr = DfuInterface->Read((uint8_t *)addr, hdfu->buffer.d8, hdfu->wlength);
 
         /* Send the status data over EP0 */
-        USBD_CtlSendData (pdev, phaddr, (uint16_t)hdfu->wlength);
+        (void)USBD_CtlSendData(pdev, phaddr, hdfu->wlength);
       }
       else  /* unsupported hdfu->wblock_num */
       {
@@ -889,7 +827,7 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
         hdfu->dev_status[4] = hdfu->dev_state;
 
         /* Call the error management function (command will be nacked */
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
       }
     }
     /* Unsupported state */
@@ -897,8 +835,9 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     {
       hdfu->wlength = 0U;
       hdfu->wblock_num = 0U;
+
       /* Call the error management function (command will be nacked */
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
     }
   }
   /* No Data setup request */
@@ -921,9 +860,8 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   */
 static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
+  USBD_DFU_MediaTypeDef *DfuInterface = (USBD_DFU_MediaTypeDef *)pdev->pUserData;
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   switch (hdfu->dev_state)
   {
@@ -939,11 +877,11 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
 
       if ((hdfu->wblock_num == 0U) && (hdfu->buffer.d8[0] == DFU_CMD_ERASE))
       {
-        ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->GetStatus(hdfu->data_ptr, DFU_MEDIA_ERASE, hdfu->dev_status);
+        DfuInterface->GetStatus(hdfu->data_ptr, DFU_MEDIA_ERASE, hdfu->dev_status);
       }
       else
       {
-        ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->GetStatus(hdfu->data_ptr, DFU_MEDIA_PROGRAM, hdfu->dev_status);
+        DfuInterface->GetStatus(hdfu->data_ptr, DFU_MEDIA_PROGRAM, hdfu->dev_status);
       }
     }
     else  /* (hdfu->wlength==0)*/
@@ -957,7 +895,7 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
     }
     break;
 
-  case   DFU_STATE_MANIFEST_SYNC :
+  case DFU_STATE_MANIFEST_SYNC:
     if (hdfu->manif_state == DFU_MANIFEST_IN_PROGRESS)
     {
       hdfu->dev_state = DFU_STATE_MANIFEST;
@@ -970,7 +908,7 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
     else
     {
       if ((hdfu->manif_state == DFU_MANIFEST_COMPLETE) &&
-         ((USBD_DFU_CfgDesc[(11U + (9U * USBD_DFU_MAX_ITF_NUM))]) & 0x04U))
+          (((USBD_DFU_CfgDesc[(11U + (9U * USBD_DFU_MAX_ITF_NUM))]) & 0x04U) != 0U))
       {
         hdfu->dev_state = DFU_STATE_IDLE;
 
@@ -982,12 +920,12 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
     }
     break;
 
-  default :
+  default:
     break;
   }
 
   /* Send the status data over EP0 */
-  USBD_CtlSendData (pdev, (uint8_t *)(&(hdfu->dev_status[0])), 6U);
+  (void)USBD_CtlSendData(pdev, (uint8_t *)(&(hdfu->dev_status[0])), 6U);
 }
 
 /**
@@ -998,29 +936,28 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
   */
 static void DFU_ClearStatus(USBD_HandleTypeDef *pdev)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   if (hdfu->dev_state == DFU_STATE_ERROR)
   {
     hdfu->dev_state = DFU_STATE_IDLE;
-    hdfu->dev_status[0] = DFU_ERROR_NONE;/*bStatus*/
+    hdfu->dev_status[0] = DFU_ERROR_NONE; /*bStatus*/
     hdfu->dev_status[1] = 0U;
     hdfu->dev_status[2] = 0U;
     hdfu->dev_status[3] = 0U; /*bwPollTimeout=0ms*/
-    hdfu->dev_status[4] = hdfu->dev_state;/*bState*/
+    hdfu->dev_status[4] = hdfu->dev_state; /*bState*/
-    hdfu->dev_status[5] = 0U;/*iString*/
+    hdfu->dev_status[5] = 0U; /*iString*/
   }
   else
-  {   /*State Error*/
+  {
+    /*State Error*/
     hdfu->dev_state = DFU_STATE_ERROR;
-    hdfu->dev_status[0] = DFU_ERROR_UNKNOWN;/*bStatus*/
+    hdfu->dev_status[0] = DFU_ERROR_UNKNOWN; /*bStatus*/
     hdfu->dev_status[1] = 0U;
     hdfu->dev_status[2] = 0U;
     hdfu->dev_status[3] = 0U; /*bwPollTimeout=0ms*/
-    hdfu->dev_status[4] = hdfu->dev_state;/*bState*/
+    hdfu->dev_status[4] = hdfu->dev_state; /*bState*/
-    hdfu->dev_status[5] = 0U;/*iString*/
+    hdfu->dev_status[5] = 0U; /*iString*/
   }
 }
 
@@ -1032,12 +969,10 @@ static void DFU_ClearStatus(USBD_HandleTypeDef *pdev)
   */
 static void DFU_GetState(USBD_HandleTypeDef *pdev)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   /* Return the current state of the DFU interface */
-  USBD_CtlSendData (pdev, &hdfu->dev_state, 1U);
+  (void)USBD_CtlSendData(pdev, &hdfu->dev_state, 1U);
 }
 
 /**
@@ -1048,13 +983,14 @@ static void DFU_GetState(USBD_HandleTypeDef *pdev)
   */
 static void DFU_Abort(USBD_HandleTypeDef *pdev)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
 
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
-  if (hdfu->dev_state == DFU_STATE_IDLE || hdfu->dev_state == DFU_STATE_DNLOAD_SYNC
+  if ((hdfu->dev_state == DFU_STATE_IDLE) ||
-      || hdfu->dev_state == DFU_STATE_DNLOAD_IDLE || hdfu->dev_state == DFU_STATE_MANIFEST_SYNC
+      (hdfu->dev_state == DFU_STATE_DNLOAD_SYNC) ||
-        || hdfu->dev_state == DFU_STATE_UPLOAD_IDLE )
+      (hdfu->dev_state == DFU_STATE_DNLOAD_IDLE) ||
+      (hdfu->dev_state == DFU_STATE_MANIFEST_SYNC) ||
+      (hdfu->dev_state == DFU_STATE_UPLOAD_IDLE))
   {
     hdfu->dev_state = DFU_STATE_IDLE;
     hdfu->dev_status[0] = DFU_ERROR_NONE;
@@ -1077,13 +1013,11 @@ static void DFU_Abort(USBD_HandleTypeDef *pdev)
   */
 static void DFU_Leave(USBD_HandleTypeDef *pdev)
 {
- USBD_DFU_HandleTypeDef   *hdfu;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
-
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
 
   hdfu->manif_state = DFU_MANIFEST_COMPLETE;
 
-  if ((USBD_DFU_CfgDesc[(11U + (9U * USBD_DFU_MAX_ITF_NUM))]) & 0x04U)
+  if (((USBD_DFU_CfgDesc[(11U + (9U * USBD_DFU_MAX_ITF_NUM))]) & 0x04U) != 0U)
   {
     hdfu->dev_state = DFU_STATE_MANIFEST_SYNC;
 
@@ -1095,7 +1029,6 @@ static void DFU_Leave(USBD_HandleTypeDef *pdev)
   }
   else
   {
-
     hdfu->dev_state = DFU_STATE_MANIFEST_WAIT_RESET;
 
     hdfu->dev_status[1] = 0U;
@@ -1104,16 +1037,12 @@ static void DFU_Leave(USBD_HandleTypeDef *pdev)
     hdfu->dev_status[4] = hdfu->dev_state;
 
     /* Disconnect the USB device */
-    USBD_Stop (pdev);
+    (void)USBD_Stop(pdev);
-
-    /* DeInitilialize the MAL(Media Access Layer) */
-    ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->DeInit();
 
     /* Generate system reset to allow jumping to the user code */
     NVIC_SystemReset();
 
-    /* This instruction will not be reached (system reset) */
+    /* The next instructions will not be reached (system reset) */
-    for(;;){}
   }
 }
 

Class/DFU/Src/usbd_dfu_media_template.c

@@ -12,15 +12,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_dfu_media_template.h"
@@ -34,11 +34,11 @@
 /* Extern function prototypes ------------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 uint16_t MEM_If_Init(void);
-uint16_t MEM_If_Erase (uint32_t Add);
+uint16_t MEM_If_Erase(uint32_t Add);
-uint16_t MEM_If_Write (uint8_t *src, uint8_t *dest, uint32_t Len);
+uint16_t MEM_If_Write(uint8_t *src, uint8_t *dest, uint32_t Len);
-uint8_t *MEM_If_Read  (uint8_t *src, uint8_t *dest, uint32_t Len);
+uint8_t *MEM_If_Read(uint8_t *src, uint8_t *dest, uint32_t Len);
 uint16_t MEM_If_DeInit(void);
-uint16_t MEM_If_GetStatus (uint32_t Add, uint8_t Cmd, uint8_t *buffer);
+uint16_t MEM_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t *buffer);
 
 USBD_DFU_MediaTypeDef USBD_DFU_MEDIA_Template_fops =
 {
@@ -103,10 +103,10 @@ uint16_t MEM_If_Write(uint8_t *src, uint8_t *dest, uint32_t Len)
   * @param  Len: Number of data to be read (in bytes).
   * @retval Pointer to the physical address where data should be read.
   */
-uint8_t *MEM_If_Read (uint8_t *src, uint8_t *dest, uint32_t Len)
+uint8_t *MEM_If_Read(uint8_t *src, uint8_t *dest, uint32_t Len)
 {
   /* Return a valid address to avoid HardFault */
-  return  (uint8_t*)(0);
+  return (uint8_t *)(0);
 }
 
 /**
@@ -116,7 +116,7 @@ uint8_t *MEM_If_Read (uint8_t *src, uint8_t *dest, uint32_t Len)
   * @param  cmd: Number of data to be read (in bytes).
   * @retval Pointer to the physical address where data should be read.
   */
-uint16_t MEM_If_GetStatus (uint32_t Add, uint8_t Cmd, uint8_t *buffer)
+uint16_t MEM_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t *buffer)
 {
   switch (Cmd)
   {

Class/HID/Inc/usbd_hid.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_HID_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -52,11 +52,11 @@
 #define HID_REPORT_DESC                            0x22U
 
 #ifndef HID_HS_BINTERVAL
-  #define HID_HS_BINTERVAL            0x07U
+#define HID_HS_BINTERVAL                           0x07U
 #endif /* HID_HS_BINTERVAL */
 
 #ifndef HID_FS_BINTERVAL
-  #define HID_FS_BINTERVAL            0x0AU
+#define HID_FS_BINTERVAL                           0x0AU
 #endif /* HID_FS_BINTERVAL */
 
 #define HID_REQ_SET_PROTOCOL                       0x0BU
@@ -79,8 +79,7 @@ typedef enum
 {
   HID_IDLE = 0,
   HID_BUSY,
-}
+} HID_StateTypeDef;
-HID_StateTypeDef;
 
 
 typedef struct
@@ -89,8 +88,7 @@ typedef struct
   uint32_t IdleState;
   uint32_t AltSetting;
   HID_StateTypeDef state;
-}
+} USBD_HID_HandleTypeDef;
-USBD_HID_HandleTypeDef;
 /**
   * @}
   */
@@ -118,11 +116,8 @@ extern USBD_ClassTypeDef  USBD_HID;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t USBD_HID_SendReport (USBD_HandleTypeDef *pdev,
+uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev, uint8_t *report,uint16_t len);
-                                 uint8_t *report,
+uint32_t USBD_HID_GetPollingInterval(USBD_HandleTypeDef *pdev);
-                                 uint16_t len);
-
-uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev);
 
 /**
   * @}

Class/HID/Src/usbd_hid.c

@@ -33,15 +33,15 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_hid.h"
@@ -83,31 +83,20 @@
   */
 
 
-
-
 /** @defgroup USBD_HID_Private_FunctionPrototypes
   * @{
   */
 
+static uint8_t USBD_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_HID_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_HID_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static uint8_t USBD_HID_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
 
-static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev,
+static uint8_t *USBD_HID_GetFSCfgDesc(uint16_t *length);
-                               uint8_t cfgidx);
+static uint8_t *USBD_HID_GetHSCfgDesc(uint16_t *length);
+static uint8_t *USBD_HID_GetOtherSpeedCfgDesc(uint16_t *length);
+static uint8_t *USBD_HID_GetDeviceQualifierDesc(uint16_t *length);
 
-static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev,
-                                 uint8_t cfgidx);
-
-static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req);
-
-static uint8_t  *USBD_HID_GetFSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_HID_GetHSCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_HID_GetOtherSpeedCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length);
-
-static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
 /**
   * @}
   */
@@ -116,16 +105,15 @@ static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
   * @{
   */
 
-USBD_ClassTypeDef  USBD_HID =
+USBD_ClassTypeDef USBD_HID = {
-{
   USBD_HID_Init,
   USBD_HID_DeInit,
   USBD_HID_Setup,
-  NULL, /*EP0_TxSent*/
+  NULL,              /* EP0_TxSent */
-  NULL, /*EP0_RxReady*/
+  NULL,              /* EP0_RxReady */
-  USBD_HID_DataIn, /*DataIn*/
+  USBD_HID_DataIn,   /* DataIn */
-  NULL, /*DataOut*/
+  NULL,              /* DataOut */
-  NULL, /*SOF */
+  NULL,              /* SOF */
   NULL,
   NULL,
   USBD_HID_GetHSCfgDesc,
@@ -135,174 +123,166 @@ USBD_ClassTypeDef  USBD_HID =
 };
 
 /* USB HID device FS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_CfgFSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_HID_CfgFSDesc[USB_HID_CONFIG_DESC_SIZ] __ALIGN_END = {
-{
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
   USB_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xE0,                                               /* bmAttributes: bus powered and Support Remote Wake-up */
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size */
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x01,         /*bNumEndpoints*/
+  0x01,                                               /* bNumEndpoints */
-  0x03,         /*bInterfaceClass: HID*/
+  0x03,                                               /* bInterfaceClass: HID */
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x01,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x02,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0,                                                  /* iInterface: Index of string descriptor */
   /******************** Descriptor of Joystick Mouse HID ********************/
   /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
+  0x09,                                               /* bLength: HID Descriptor size */
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
+  HID_DESCRIPTOR_TYPE,                                /* bDescriptorType: HID */
-  0x11,         /*bcdHID: HID Class Spec release number*/
+  0x11,                                               /* bcdHID: HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  HID_MOUSE_REPORT_DESC_SIZE,                         /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Mouse endpoint ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType:*/
 
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Byte max */
   0x00,
-  HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
+  HID_FS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
 };
 
 /* USB HID device HS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_CfgHSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_HID_CfgHSDesc[USB_HID_CONFIG_DESC_SIZ] __ALIGN_END = {
-{
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
   USB_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xE0,                                               /* bmAttributes: bus powered and Support Remote Wake-up */
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size */
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x01,         /*bNumEndpoints*/
+  0x01,                                               /* bNumEndpoints */
-  0x03,         /*bInterfaceClass: HID*/
+  0x03,                                               /* bInterfaceClass: HID */
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x01,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x02,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0,                                                  /* iInterface: Index of string descriptor */
   /******************** Descriptor of Joystick Mouse HID ********************/
   /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
+  0x09,                                               /* bLength: HID Descriptor size */
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
+  HID_DESCRIPTOR_TYPE,                                /* bDescriptorType: HID */
-  0x11,         /*bcdHID: HID Class Spec release number*/
+  0x11,                                               /* bcdHID: HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  HID_MOUSE_REPORT_DESC_SIZE,                         /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Mouse endpoint ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
 
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Byte max */
   0x00,
-  HID_HS_BINTERVAL,          /*bInterval: Polling Interval */
+  HID_HS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
 };
 
 /* USB HID device Other Speed Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_OtherSpeedCfgDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_HID_OtherSpeedCfgDesc[USB_HID_CONFIG_DESC_SIZ] __ALIGN_END = {
-{
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
   USB_HID_CONFIG_DESC_SIZ,
                                                       /* wTotalLength: Bytes returned */
   0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
+  0x01,                                               /* bNumInterfaces: 1 interface */
-  0x01,         /*bConfigurationValue: Configuration value*/
+  0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
-  the configuration*/
+  0xE0,                                               /* bmAttributes: bus powered and Support Remote Wake-up */
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
+  0x32,                                               /* MaxPower 100 mA: this current is used for detecting Vbus */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
+  0x09,                                               /* bLength: Interface Descriptor size */
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
+  USB_DESC_TYPE_INTERFACE,                            /* bDescriptorType: Interface descriptor type */
-  0x00,         /*bInterfaceNumber: Number of Interface*/
+  0x00,                                               /* bInterfaceNumber: Number of Interface */
-  0x00,         /*bAlternateSetting: Alternate setting*/
+  0x00,                                               /* bAlternateSetting: Alternate setting */
-  0x01,         /*bNumEndpoints*/
+  0x01,                                               /* bNumEndpoints */
-  0x03,         /*bInterfaceClass: HID*/
+  0x03,                                               /* bInterfaceClass: HID */
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
+  0x01,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
+  0x02,                                               /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
-  0,            /*iInterface: Index of string descriptor*/
+  0,                                                  /* iInterface: Index of string descriptor */
   /******************** Descriptor of Joystick Mouse HID ********************/
   /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
+  0x09,                                               /* bLength: HID Descriptor size */
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
+  HID_DESCRIPTOR_TYPE,                                /* bDescriptorType: HID */
-  0x11,         /*bcdHID: HID Class Spec release number*/
+  0x11,                                               /* bcdHID: HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  HID_MOUSE_REPORT_DESC_SIZE,                         /* wItemLength: Total length of Report descriptor */
   0x00,
   /******************** Descriptor of Mouse endpoint ********************/
   /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
+  0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType: */
 
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
+  HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
-  0x03,          /*bmAttributes: Interrupt endpoint*/
+  0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Byte max */
   0x00,
-  HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
+  HID_FS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
 };
 
 
 /* USB HID device Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_Desc[USB_HID_DESC_SIZ]  __ALIGN_END  =
+__ALIGN_BEGIN static uint8_t USBD_HID_Desc[USB_HID_DESC_SIZ] __ALIGN_END = {
-{
   /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
+  0x09,                                               /* bLength: HID Descriptor size */
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
+  HID_DESCRIPTOR_TYPE,                                /* bDescriptorType: HID */
-  0x11,         /*bcdHID: HID Class Spec release number*/
+  0x11,                                               /* bcdHID: HID Class Spec release number */
   0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
+  0x00,                                               /* bCountryCode: Hardware target country */
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
+  0x01,                                               /* bNumDescriptors: Number of HID class descriptors to follow */
-  0x22,         /*bDescriptorType*/
+  0x22,                                               /* bDescriptorType */
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  HID_MOUSE_REPORT_DESC_SIZE,                         /* wItemLength: Total length of Report descriptor */
   0x00,
 };
 
 /* USB Standard Device Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END = {
-{
   USB_LEN_DEV_QUALIFIER_DESC,
   USB_DESC_TYPE_DEVICE_QUALIFIER,
   0x00,
@@ -315,8 +295,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_
   0x00,
 };
 
-__ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE] __ALIGN_END = {
-{
   0x05,   0x01,
   0x09,   0x02,
   0xA1,   0x01,
@@ -380,46 +359,64 @@ __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  _
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+static uint8_t USBD_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  /* Open EP IN */
+  UNUSED(cfgidx);
-  USBD_LL_OpenEP(pdev, HID_EPIN_ADDR, USBD_EP_TYPE_INTR, HID_EPIN_SIZE);
-  pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 1U;
 
-  pdev->pClassData = USBD_malloc(sizeof (USBD_HID_HandleTypeDef));
+  USBD_HID_HandleTypeDef *hhid;
 
-  if (pdev->pClassData == NULL)
+  hhid = USBD_malloc(sizeof(USBD_HID_HandleTypeDef));
+
+  if (hhid == NULL)
   {
-    return USBD_FAIL;
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
   }
 
-  ((USBD_HID_HandleTypeDef *)pdev->pClassData)->state = HID_IDLE;
+  pdev->pClassData = (void *)hhid;
 
-  return USBD_OK;
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
+  {
+    pdev->ep_in[HID_EPIN_ADDR & 0xFU].bInterval = HID_HS_BINTERVAL;
+  }
+  else   /* LOW and FULL-speed endpoints */
+  {
+    pdev->ep_in[HID_EPIN_ADDR & 0xFU].bInterval = HID_FS_BINTERVAL;
+  }
+
+    /* Open EP IN */
+  (void)USBD_LL_OpenEP(pdev, HID_EPIN_ADDR, USBD_EP_TYPE_INTR, HID_EPIN_SIZE);
+  pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 1U;
+
+  hhid->state = HID_IDLE;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
-  * @brief  USBD_HID_Init
+  * @brief  USBD_HID_DeInit
   *         DeInitialize the HID layer
   * @param  pdev: device instance
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_HID_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                                 uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+
   /* Close HID EPs */
-  USBD_LL_CloseEP(pdev, HID_EPIN_ADDR);
+  (void)USBD_LL_CloseEP(pdev, HID_EPIN_ADDR);
   pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 0U;
+  pdev->ep_in[HID_EPIN_ADDR & 0xFU].bInterval = 0U;
 
   /* FRee allocated memory */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData != NULL)
   {
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -429,14 +426,13 @@ static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_HID_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                                USBD_SetupReqTypedef *req)
 {
-  USBD_HID_HandleTypeDef *hhid = (USBD_HID_HandleTypeDef*) pdev->pClassData;
+  USBD_HID_HandleTypeDef *hhid = (USBD_HID_HandleTypeDef *)pdev->pClassData;
-  uint16_t len = 0U;
-  uint8_t *pbuf = NULL;
-  uint16_t status_info = 0U;
   USBD_StatusTypeDef ret = USBD_OK;
+  uint16_t len;
+  uint8_t *pbuf;
+  uint16_t status_info = 0U;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -448,7 +444,7 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     case HID_REQ_GET_PROTOCOL:
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->Protocol, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->Protocol, 1U);
       break;
 
     case HID_REQ_SET_IDLE:
@@ -456,11 +452,11 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
       break;
 
     case HID_REQ_GET_IDLE:
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->IdleState, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->IdleState, 1U);
       break;
 
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -471,73 +467,76 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     case USB_REQ_GET_DESCRIPTOR:
-      if(req->wValue >> 8 == HID_REPORT_DESC)
+      if ((req->wValue >> 8) == HID_REPORT_DESC)
       {
-        len = MIN(HID_MOUSE_REPORT_DESC_SIZE , req->wLength);
+        len = MIN(HID_MOUSE_REPORT_DESC_SIZE, req->wLength);
         pbuf = HID_MOUSE_ReportDesc;
       }
-      else if(req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
+      else if ((req->wValue >> 8) == HID_DESCRIPTOR_TYPE)
       {
         pbuf = USBD_HID_Desc;
         len = MIN(USB_HID_DESC_SIZ, req->wLength);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
         break;
       }
-      USBD_CtlSendData (pdev, pbuf, len);
+      (void)USBD_CtlSendData(pdev, pbuf, len);
       break;
 
     case USB_REQ_GET_INTERFACE :
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&hhid->AltSetting, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&hhid->AltSetting, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
-    case USB_REQ_SET_INTERFACE :
+    case USB_REQ_SET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
         hhid->AltSetting = (uint8_t)(req->wValue);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
+    case USB_REQ_CLEAR_FEATURE:
+      break;
+
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -547,24 +546,20 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
   * @param  buff: pointer to report
   * @retval status
   */
-uint8_t USBD_HID_SendReport     (USBD_HandleTypeDef  *pdev,
+uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev, uint8_t *report, uint16_t len)
-                                 uint8_t *report,
-                                 uint16_t len)
 {
-  USBD_HID_HandleTypeDef     *hhid = (USBD_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_HID_HandleTypeDef *hhid = (USBD_HID_HandleTypeDef *)pdev->pClassData;
 
-  if (pdev->dev_state == USBD_STATE_CONFIGURED )
+  if (pdev->dev_state == USBD_STATE_CONFIGURED)
   {
-    if(hhid->state == HID_IDLE)
+    if (hhid->state == HID_IDLE)
     {
       hhid->state = HID_BUSY;
-      USBD_LL_Transmit (pdev,
+      (void)USBD_LL_Transmit(pdev, HID_EPIN_ADDR, report, len);
-                        HID_EPIN_ADDR,
-                        report,
-                        len);
     }
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -573,17 +568,17 @@ uint8_t USBD_HID_SendReport     (USBD_HandleTypeDef  *pdev,
   * @param  pdev: device instance
   * @retval polling interval
   */
-uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev)
+uint32_t USBD_HID_GetPollingInterval(USBD_HandleTypeDef *pdev)
 {
-  uint32_t polling_interval = 0U;
+  uint32_t polling_interval;
 
   /* HIGH-speed endpoints */
-  if(pdev->dev_speed == USBD_SPEED_HIGH)
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
   {
     /* Sets the data transfer polling interval for high speed transfers.
      Values between 1..16 are allowed. Values correspond to interval
      of 2 ^ (bInterval-1). This option (8 ms, corresponds to HID_HS_BINTERVAL */
-    polling_interval = (((1U <<(HID_HS_BINTERVAL - 1U))) / 8U);
+    polling_interval = (((1U << (HID_HS_BINTERVAL - 1U))) / 8U);
   }
   else   /* LOW and FULL-speed endpoints */
   {
@@ -602,9 +597,10 @@ uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_HID_GetFSCfgDesc (uint16_t *length)
+static uint8_t *USBD_HID_GetFSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_HID_CfgFSDesc);
+  *length = (uint16_t)sizeof(USBD_HID_CfgFSDesc);
+
   return USBD_HID_CfgFSDesc;
 }
 
@@ -615,9 +611,10 @@ static uint8_t  *USBD_HID_GetFSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_HID_GetHSCfgDesc (uint16_t *length)
+static uint8_t *USBD_HID_GetHSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_HID_CfgHSDesc);
+  *length = (uint16_t)sizeof(USBD_HID_CfgHSDesc);
+
   return USBD_HID_CfgHSDesc;
 }
 
@@ -628,9 +625,10 @@ static uint8_t  *USBD_HID_GetHSCfgDesc (uint16_t *length)
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_HID_GetOtherSpeedCfgDesc (uint16_t *length)
+static uint8_t *USBD_HID_GetOtherSpeedCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_HID_OtherSpeedCfgDesc);
+  *length = (uint16_t)sizeof(USBD_HID_OtherSpeedCfgDesc);
+
   return USBD_HID_OtherSpeedCfgDesc;
 }
 
@@ -641,14 +639,14 @@ static uint8_t  *USBD_HID_GetOtherSpeedCfgDesc (uint16_t *length)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_HID_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
-
+  UNUSED(epnum);
   /* Ensure that the FIFO is empty before a new transfer, this condition could
   be caused by  a new transfer before the end of the previous transfer */
   ((USBD_HID_HandleTypeDef *)pdev->pClassData)->state = HID_IDLE;
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 
@@ -658,9 +656,10 @@ static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev,
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length)
+static uint8_t *USBD_HID_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_HID_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_HID_DeviceQualifierDesc);
+
   return USBD_HID_DeviceQualifierDesc;
 }
 

Class/MSC/Inc/usbd_msc.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_MSC_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -68,16 +68,16 @@
   */
 typedef struct _USBD_STORAGE
 {
-  int8_t (* Init) (uint8_t lun);
+  int8_t (* Init)(uint8_t lun);
-  int8_t (* GetCapacity) (uint8_t lun, uint32_t *block_num, uint16_t *block_size);
+  int8_t (* GetCapacity)(uint8_t lun, uint32_t *block_num, uint16_t *block_size);
-  int8_t (* IsReady) (uint8_t lun);
+  int8_t (* IsReady)(uint8_t lun);
-  int8_t (* IsWriteProtected) (uint8_t lun);
+  int8_t (* IsWriteProtected)(uint8_t lun);
-  int8_t (* Read) (uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
+  int8_t (* Read)(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
   int8_t (* Write)(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
   int8_t (* GetMaxLun)(void);
   int8_t *pInquiry;
 
-}USBD_StorageTypeDef;
+} USBD_StorageTypeDef;
 
 
 typedef struct
@@ -86,7 +86,7 @@ typedef struct
   uint32_t                 interface;
   uint8_t                  bot_state;
   uint8_t                  bot_status;
-  uint16_t                 bot_data_length;
+  uint32_t                 bot_data_length;
   uint8_t                  bot_data[MSC_MEDIA_PACKET];
   USBD_MSC_BOT_CBWTypeDef  cbw;
   USBD_MSC_BOT_CSWTypeDef  csw;
@@ -94,6 +94,7 @@ typedef struct
   USBD_SCSI_SenseTypeDef   scsi_sense [SENSE_LIST_DEEPTH];
   uint8_t                  scsi_sense_head;
   uint8_t                  scsi_sense_tail;
+  uint8_t                  scsi_medium_state;
 
   uint16_t                 scsi_blk_size;
   uint32_t                 scsi_blk_nbr;
@@ -107,7 +108,7 @@ USBD_MSC_BOT_HandleTypeDef;
 extern USBD_ClassTypeDef  USBD_MSC;
 #define USBD_MSC_CLASS    &USBD_MSC
 
-uint8_t  USBD_MSC_RegisterStorage  (USBD_HandleTypeDef   *pdev,
+uint8_t  USBD_MSC_RegisterStorage(USBD_HandleTypeDef   *pdev,
                                   USBD_StorageTypeDef *fops);
 /**
   * @}

Class/MSC/Inc/usbd_msc_bot.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_MSC_BOT_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -116,19 +116,19 @@ USBD_MSC_BOT_CSWTypeDef;
 /** @defgroup USBD_CORE_Exported_FunctionsPrototypes
   * @{
   */
-void MSC_BOT_Init (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_Init(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_Reset(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_DeInit(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
+void MSC_BOT_DataIn(USBD_HandleTypeDef  *pdev,
                     uint8_t epnum);
 
-void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
+void MSC_BOT_DataOut(USBD_HandleTypeDef  *pdev,
                      uint8_t epnum);
 
-void MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
+void MSC_BOT_SendCSW(USBD_HandleTypeDef  *pdev,
                      uint8_t CSW_Status);
 
-void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev,
+void  MSC_BOT_CplClrFeature(USBD_HandleTypeDef  *pdev,
                             uint8_t epnum);
 /**
   * @}

Class/MSC/Inc/usbd_msc_data.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_MSC_DATA_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -40,10 +40,11 @@
 /** @defgroup USB_INFO_Exported_Defines
   * @{
   */
-#define MODE_SENSE6_LEN                    8U
+#define MODE_SENSE6_LEN                    0x17U
-#define MODE_SENSE10_LEN                   8U
+#define MODE_SENSE10_LEN                   0x1BU
-#define LENGTH_INQUIRY_PAGE00              7U
+#define LENGTH_INQUIRY_PAGE00              0x06U
-#define LENGTH_FORMAT_CAPACITIES           20U
+#define LENGTH_INQUIRY_PAGE80              0x08U
+#define LENGTH_FORMAT_CAPACITIES           0x14U
 
 /**
   * @}
@@ -70,9 +71,10 @@
 /** @defgroup USBD_INFO_Exported_Variables
   * @{
   */
-extern const uint8_t MSC_Page00_Inquiry_Data[];
+extern uint8_t MSC_Page00_Inquiry_Data[LENGTH_INQUIRY_PAGE00];
-extern const uint8_t MSC_Mode_Sense6_data[];
+extern uint8_t MSC_Page80_Inquiry_Data[LENGTH_INQUIRY_PAGE80];
-extern const uint8_t MSC_Mode_Sense10_data[] ;
+extern uint8_t MSC_Mode_Sense6_data[MODE_SENSE6_LEN];
+extern uint8_t MSC_Mode_Sense10_data[MODE_SENSE10_LEN];
 
 /**
   * @}

Class/MSC/Inc/usbd_msc_scsi.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_MSC_SCSI_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -103,20 +103,13 @@
 
 #define READ_FORMAT_CAPACITY_DATA_LEN               0x0CU
 #define READ_CAPACITY10_DATA_LEN                    0x08U
-#define MODE_SENSE10_DATA_LEN                       0x08U
-#define MODE_SENSE6_DATA_LEN                        0x04U
 #define REQUEST_SENSE_DATA_LEN                      0x12U
 #define STANDARD_INQUIRY_DATA_LEN                   0x24U
 #define BLKVFY                                      0x04U
 
-extern  uint8_t Page00_Inquiry_Data[];
+#define SCSI_MEDIUM_UNLOCKED                        0x00U
-extern  uint8_t Standard_Inquiry_Data[];
+#define SCSI_MEDIUM_LOCKED                          0x01U
-extern  uint8_t Standard_Inquiry_Data2[];
+#define SCSI_MEDIUM_EJECTED                         0x02U
-extern  uint8_t Mode_Sense6_data[];
-extern  uint8_t Mode_Sense10_data[];
-extern  uint8_t Scsi_Sense_Data[];
-extern  uint8_t ReadCapacity10_Data[];
-extern  uint8_t ReadFormatCapacity_Data [];
 /**
   * @}
   */
@@ -126,15 +119,18 @@ extern  uint8_t ReadFormatCapacity_Data [];
   * @{
   */
 
-typedef struct _SENSE_ITEM {
+typedef struct _SENSE_ITEM
-  char Skey;
+{
-  union {
+  uint8_t Skey;
-    struct _ASCs {
+  union
-      char ASC;
+  {
-      char ASCQ;
+    struct _ASCs
-    }b;
+    {
       uint8_t ASC;
-    char *pData;
+      uint8_t ASCQ;
+    } b;
+    uint8_t ASC;
+    uint8_t *pData;
   } w;
 } USBD_SCSI_SenseTypeDef;
 /**

Class/MSC/Inc/usbd_msc_storage_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_MSC_STORAGE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/

Class/MSC/Src/usbd_msc.c

@@ -27,16 +27,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
+- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_msc.h"
@@ -80,30 +80,16 @@
 /** @defgroup MSC_CORE_Private_FunctionPrototypes
   * @{
   */
-uint8_t  USBD_MSC_Init (USBD_HandleTypeDef *pdev,
+uint8_t USBD_MSC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-                            uint8_t cfgidx);
+uint8_t USBD_MSC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-
+uint8_t USBD_MSC_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-uint8_t  USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
+uint8_t USBD_MSC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
-                              uint8_t cfgidx);
+uint8_t USBD_MSC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev,
-                             USBD_SetupReqTypedef *req);
-
-uint8_t  USBD_MSC_DataIn (USBD_HandleTypeDef *pdev,
-                              uint8_t epnum);
-
-
-uint8_t  USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
-                               uint8_t epnum);
-
-uint8_t  *USBD_MSC_GetHSCfgDesc (uint16_t *length);
-
-uint8_t  *USBD_MSC_GetFSCfgDesc (uint16_t *length);
-
-uint8_t  *USBD_MSC_GetOtherSpeedCfgDesc (uint16_t *length);
-
-uint8_t  *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length);
 
+uint8_t *USBD_MSC_GetHSCfgDesc(uint16_t *length);
+uint8_t *USBD_MSC_GetFSCfgDesc(uint16_t *length);
+uint8_t *USBD_MSC_GetOtherSpeedCfgDesc(uint16_t *length);
+uint8_t *USBD_MSC_GetDeviceQualifierDescriptor(uint16_t *length);
 
 /**
   * @}
@@ -135,9 +121,8 @@ USBD_ClassTypeDef  USBD_MSC =
 
 /* USB Mass storage device Configuration Descriptor */
 /*   All Descriptors (Configuration, Interface, Endpoint, Class, Vendor */
-__ALIGN_BEGIN uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
 {
-
   0x09,                                            /* bLength: Configuation Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                     /* bDescriptorType: Configuration */
   USB_MSC_CONFIG_DESC_SIZ,
@@ -154,34 +139,33 @@ __ALIGN_BEGIN uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
   0x04,                                            /* bDescriptorType: */
   0x00,                                            /* bInterfaceNumber: Number of Interface */
   0x00,                                            /* bAlternateSetting: Alternate setting */
-  0x02,   /* bNumEndpoints*/
+  0x02,                                            /* bNumEndpoints */
   0x08,                                            /* bInterfaceClass: MSC Class */
-  0x06,   /* bInterfaceSubClass : SCSI transparent*/
+  0x06,                                            /* bInterfaceSubClass : SCSI transparent */
   0x50,                                            /* nInterfaceProtocol */
   0x05,                                            /* iInterface: */
   /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
+  0x07,                                            /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                            /* Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
+  MSC_EPIN_ADDR,                                   /* Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                            /* Bulk endpoint type */
   LOBYTE(MSC_MAX_HS_PACKET),
   HIBYTE(MSC_MAX_HS_PACKET),
-  0x00,   /*Polling interval in milliseconds */
+  0x00,                                            /* Polling interval in milliseconds */
 
-  0x07,   /*Endpoint descriptor length = 7 */
+  0x07,                                            /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                            /* Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
+  MSC_EPOUT_ADDR,                                  /* Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                            /* Bulk endpoint type */
   LOBYTE(MSC_MAX_HS_PACKET),
   HIBYTE(MSC_MAX_HS_PACKET),
-  0x00     /*Polling interval in milliseconds*/
+  0x00                                             /* Polling interval in milliseconds */
 };
 
 /* USB Mass storage device Configuration Descriptor */
 /* All Descriptors (Configuration, Interface, Endpoint, Class, Vendor */
-uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
 {
-
   0x09,                                            /* bLength: Configuation Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                     /* bDescriptorType: Configuration */
   USB_MSC_CONFIG_DESC_SIZ,
@@ -204,26 +188,25 @@ uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
   0x50,                                            /* nInterfaceProtocol */
   0x05,                                            /* iInterface: */
   /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
+  0x07,                                            /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                            /* Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
+  MSC_EPIN_ADDR,                                   /* Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                            /* Bulk endpoint type */
   LOBYTE(MSC_MAX_FS_PACKET),
   HIBYTE(MSC_MAX_FS_PACKET),
-  0x00,   /*Polling interval in milliseconds */
+  0x00,                                            /* Polling interval in milliseconds */
 
-  0x07,   /*Endpoint descriptor length = 7 */
+  0x07,                                            /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                            /* Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
+  MSC_EPOUT_ADDR,                                  /* Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                            /* Bulk endpoint type */
   LOBYTE(MSC_MAX_FS_PACKET),
   HIBYTE(MSC_MAX_FS_PACKET),
-  0x00     /*Polling interval in milliseconds*/
+  0x00                                             /* Polling interval in milliseconds */
 };
 
-__ALIGN_BEGIN uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ]   __ALIGN_END  =
+__ALIGN_BEGIN static uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ]   __ALIGN_END  =
 {
-
   0x09,                                           /* bLength: Configuation Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
   USB_MSC_CONFIG_DESC_SIZ,
@@ -240,31 +223,31 @@ __ALIGN_BEGIN uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ]   __AL
   0x04,                                           /* bDescriptorType: */
   0x00,                                           /* bInterfaceNumber: Number of Interface */
   0x00,                                           /* bAlternateSetting: Alternate setting */
-  0x02,   /* bNumEndpoints*/
+  0x02,                                           /* bNumEndpoints */
   0x08,                                           /* bInterfaceClass: MSC Class */
-  0x06,   /* bInterfaceSubClass : SCSI transparent command set*/
+  0x06,                                           /* bInterfaceSubClass : SCSI transparent command set */
   0x50,                                           /* nInterfaceProtocol */
   0x05,                                           /* iInterface: */
   /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
+  0x07,                                           /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                           /* Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
+  MSC_EPIN_ADDR,                                  /* Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                           /* Bulk endpoint type */
   0x40,
   0x00,
-  0x00,   /*Polling interval in milliseconds */
+  0x00,                                           /* Polling interval in milliseconds */
 
-  0x07,   /*Endpoint descriptor length = 7 */
+  0x07,                                           /* Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
+  0x05,                                           /* Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
+  MSC_EPOUT_ADDR,                                 /* Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
+  0x02,                                           /* Bulk endpoint type */
   0x40,
   0x00,
-  0x00     /*Polling interval in milliseconds*/
+  0x00                                            /* Polling interval in milliseconds */
 };
 
 /* USB Standard Device Descriptor */
-__ALIGN_BEGIN  uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
+__ALIGN_BEGIN static uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
 {
   USB_LEN_DEV_QUALIFIER_DESC,
   USB_DESC_TYPE_DEVICE_QUALIFIER,
@@ -293,39 +276,46 @@ __ALIGN_BEGIN  uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]
   * @param  cfgidx: configuration index
   * @retval status
   */
-uint8_t  USBD_MSC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+uint8_t USBD_MSC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  if(pdev->dev_speed == USBD_SPEED_HIGH)
+  UNUSED(cfgidx);
+  USBD_MSC_BOT_HandleTypeDef *hmsc;
+
+  hmsc = USBD_malloc(sizeof(USBD_MSC_BOT_HandleTypeDef));
+
+  if (hmsc == NULL)
+  {
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
+  }
+
+  pdev->pClassData = (void *)hmsc;
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
   {
     /* Open EP OUT */
-    USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_HS_PACKET);
+    (void)USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_HS_PACKET);
     pdev->ep_out[MSC_EPOUT_ADDR & 0xFU].is_used = 1U;
 
     /* Open EP IN */
-    USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_HS_PACKET);
+    (void)USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_HS_PACKET);
     pdev->ep_in[MSC_EPIN_ADDR & 0xFU].is_used = 1U;
   }
   else
   {
     /* Open EP OUT */
-    USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_FS_PACKET);
+    (void)USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_FS_PACKET);
     pdev->ep_out[MSC_EPOUT_ADDR & 0xFU].is_used = 1U;
 
     /* Open EP IN */
-    USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_FS_PACKET);
+    (void)USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK, MSC_MAX_FS_PACKET);
     pdev->ep_in[MSC_EPIN_ADDR & 0xFU].is_used = 1U;
   }
-  pdev->pClassData = USBD_malloc(sizeof (USBD_MSC_BOT_HandleTypeDef));
-
-  if(pdev->pClassData == NULL)
-  {
-    return USBD_FAIL;
-  }
 
   /* Init the BOT  layer */
   MSC_BOT_Init(pdev);
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -335,27 +325,29 @@ uint8_t  USBD_MSC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   * @param  cfgidx: configuration index
   * @retval status
   */
-uint8_t  USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
+uint8_t USBD_MSC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                              uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+
   /* Close MSC EPs */
-  USBD_LL_CloseEP(pdev, MSC_EPOUT_ADDR);
+  (void)USBD_LL_CloseEP(pdev, MSC_EPOUT_ADDR);
   pdev->ep_out[MSC_EPOUT_ADDR & 0xFU].is_used = 0U;
 
   /* Close EP IN */
-  USBD_LL_CloseEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_CloseEP(pdev, MSC_EPIN_ADDR);
   pdev->ep_in[MSC_EPIN_ADDR & 0xFU].is_used = 0U;
 
   /* De-Init the BOT layer */
   MSC_BOT_DeInit(pdev);
 
   /* Free MSC Class Resources */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData != NULL)
   {
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 /**
 * @brief  USBD_MSC_Setup
@@ -364,25 +356,24 @@ uint8_t  USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
 * @param  req: USB request
 * @retval status
 */
-uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+uint8_t USBD_MSC_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef*) pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
   uint16_t status_info = 0U;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-
     /* Class request */
   case USB_REQ_TYPE_CLASS:
     switch (req->bRequest)
     {
     case BOT_GET_MAX_LUN:
-      if((req->wValue  == 0U) && (req->wLength == 1U) &&
+      if ((req->wValue  == 0U) && (req->wLength == 1U) &&
           ((req->bmRequest & 0x80U) == 0x80U))
       {
         hmsc->max_lun = (uint32_t)((USBD_StorageTypeDef *)pdev->pUserData)->GetMaxLun();
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&hmsc->max_lun, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&hmsc->max_lun, 1U);
       }
       else
       {
@@ -392,20 +383,20 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       break;
 
     case BOT_RESET :
-      if((req->wValue  == 0U) && (req->wLength == 0U) &&
+      if ((req->wValue  == 0U) && (req->wLength == 0U) &&
           ((req->bmRequest & 0x80U) != 0x80U))
       {
         MSC_BOT_Reset(pdev);
       }
       else
       {
-        USBD_CtlError(pdev , req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     default:
-      USBD_CtlError(pdev , req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -417,11 +408,11 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     case USB_REQ_GET_STATUS:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&status_info, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&status_info, 2U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
@@ -429,11 +420,11 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     case USB_REQ_GET_INTERFACE:
       if (pdev->dev_state == USBD_STATE_CONFIGURED)
       {
-        USBD_CtlSendData (pdev, (uint8_t *)(void *)&hmsc->interface, 1U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&hmsc->interface, 1U);
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
@@ -445,71 +436,39 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       }
       else
       {
-        USBD_CtlError (pdev, req);
+        USBD_CtlError(pdev, req);
         ret = USBD_FAIL;
       }
       break;
 
     case USB_REQ_CLEAR_FEATURE:
-
+      if (pdev->dev_state == USBD_STATE_CONFIGURED)
-      /* Flush the FIFO and Clear the stall status */
-      USBD_LL_FlushEP(pdev, (uint8_t)req->wIndex);
-
-      /* Reactivate the EP */
-      USBD_LL_CloseEP (pdev , (uint8_t)req->wIndex);
-      if((((uint8_t)req->wIndex) & 0x80U) == 0x80U)
       {
-        pdev->ep_in[(uint8_t)req->wIndex & 0xFU].is_used = 0U;
+        if (req->wValue == USB_FEATURE_EP_HALT)
-        if(pdev->dev_speed == USBD_SPEED_HIGH)
         {
-          /* Open EP IN */
+          /* Flush the FIFO */
-          USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK,
+          (void)USBD_LL_FlushEP(pdev, (uint8_t)req->wIndex);
-                         MSC_MAX_HS_PACKET);
-        }
-        else
-        {
-          /* Open EP IN */
-          USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK,
-                         MSC_MAX_FS_PACKET);
-        }
-        pdev->ep_in[MSC_EPIN_ADDR & 0xFU].is_used = 1U;
-      }
-      else
-      {
-        pdev->ep_out[(uint8_t)req->wIndex & 0xFU].is_used = 0U;
-        if(pdev->dev_speed == USBD_SPEED_HIGH)
-        {
-          /* Open EP OUT */
-          USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK,
-                         MSC_MAX_HS_PACKET);
-        }
-        else
-        {
-          /* Open EP OUT */
-          USBD_LL_OpenEP(pdev, MSC_EPOUT_ADDR, USBD_EP_TYPE_BULK,
-                         MSC_MAX_FS_PACKET);
-        }
-        pdev->ep_out[MSC_EPOUT_ADDR & 0xFU].is_used = 1U;
-      }
 
           /* Handle BOT error */
           MSC_BOT_CplClrFeature(pdev, (uint8_t)req->wIndex);
+        }
+      }
       break;
 
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -519,11 +478,11 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 * @param  epnum: endpoint index
 * @retval status
 */
-uint8_t  USBD_MSC_DataIn (USBD_HandleTypeDef *pdev,
+uint8_t USBD_MSC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
-  MSC_BOT_DataIn(pdev , epnum);
+  MSC_BOT_DataIn(pdev, epnum);
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -533,11 +492,11 @@ uint8_t  USBD_MSC_DataIn (USBD_HandleTypeDef *pdev,
 * @param  epnum: endpoint index
 * @retval status
 */
-uint8_t  USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
+uint8_t USBD_MSC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                               uint8_t epnum)
 {
-  MSC_BOT_DataOut(pdev , epnum);
+  MSC_BOT_DataOut(pdev, epnum);
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -546,9 +505,10 @@ uint8_t  USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_MSC_GetHSCfgDesc (uint16_t *length)
+uint8_t *USBD_MSC_GetHSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_MSC_CfgHSDesc);
+  *length = (uint16_t)sizeof(USBD_MSC_CfgHSDesc);
+
   return USBD_MSC_CfgHSDesc;
 }
 
@@ -558,9 +518,10 @@ uint8_t  *USBD_MSC_GetHSCfgDesc (uint16_t *length)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_MSC_GetFSCfgDesc (uint16_t *length)
+uint8_t *USBD_MSC_GetFSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_MSC_CfgFSDesc);
+  *length = (uint16_t)sizeof(USBD_MSC_CfgFSDesc);
+
   return USBD_MSC_CfgFSDesc;
 }
 
@@ -570,9 +531,10 @@ uint8_t  *USBD_MSC_GetFSCfgDesc (uint16_t *length)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_MSC_GetOtherSpeedCfgDesc (uint16_t *length)
+uint8_t *USBD_MSC_GetOtherSpeedCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_MSC_OtherSpeedCfgDesc);
+  *length = (uint16_t)sizeof(USBD_MSC_OtherSpeedCfgDesc);
+
   return USBD_MSC_OtherSpeedCfgDesc;
 }
 /**
@@ -581,9 +543,10 @@ uint8_t  *USBD_MSC_GetOtherSpeedCfgDesc (uint16_t *length)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length)
+uint8_t *USBD_MSC_GetDeviceQualifierDescriptor(uint16_t *length)
 {
-  *length = sizeof (USBD_MSC_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_MSC_DeviceQualifierDesc);
+
   return USBD_MSC_DeviceQualifierDesc;
 }
 
@@ -592,14 +555,16 @@ uint8_t  *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length)
 * @param  fops: storage callback
 * @retval status
 */
-uint8_t  USBD_MSC_RegisterStorage  (USBD_HandleTypeDef   *pdev,
+uint8_t USBD_MSC_RegisterStorage(USBD_HandleTypeDef *pdev, USBD_StorageTypeDef *fops)
-                                    USBD_StorageTypeDef *fops)
 {
-  if(fops != NULL)
+  if (fops == NULL)
   {
-    pdev->pUserData = fops;
+    return (uint8_t)USBD_FAIL;
   }
-  return USBD_OK;
+
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**

Class/MSC/Src/usbd_msc_bot.c

@@ -12,16 +12,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
+- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_msc_bot.h"
@@ -76,11 +76,8 @@
 /** @defgroup MSC_BOT_Private_FunctionPrototypes
   * @{
   */
-static void MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev);
+static void MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf, uint32_t len);
-
+static void MSC_BOT_CBW_Decode(USBD_HandleTypeDef *pdev);
-static void MSC_BOT_SendData (USBD_HandleTypeDef *pdev, uint8_t* pbuf,
-                              uint16_t len);
-
 static void MSC_BOT_Abort(USBD_HandleTypeDef *pdev);
 /**
   * @}
@@ -92,30 +89,30 @@ static void MSC_BOT_Abort(USBD_HandleTypeDef  *pdev);
   */
 
 
-
 /**
 * @brief  MSC_BOT_Init
 *         Initialize the BOT Process
 * @param  pdev: device instance
 * @retval None
 */
-void MSC_BOT_Init (USBD_HandleTypeDef  *pdev)
+void MSC_BOT_Init(USBD_HandleTypeDef *pdev)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   hmsc->bot_state = USBD_BOT_IDLE;
   hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
 
   hmsc->scsi_sense_tail = 0U;
   hmsc->scsi_sense_head = 0U;
+  hmsc->scsi_medium_state = SCSI_MEDIUM_UNLOCKED;
 
   ((USBD_StorageTypeDef *)pdev->pUserData)->Init(0U);
 
-  USBD_LL_FlushEP(pdev, MSC_EPOUT_ADDR);
+  (void)USBD_LL_FlushEP(pdev, MSC_EPOUT_ADDR);
-  USBD_LL_FlushEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_FlushEP(pdev, MSC_EPIN_ADDR);
 
   /* Prapare EP to Receive First BOT Cmd */
-  USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
+  (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)&hmsc->cbw,
                                USBD_BOT_CBW_LENGTH);
 }
 
@@ -125,15 +122,18 @@ void MSC_BOT_Init (USBD_HandleTypeDef  *pdev)
 * @param  pdev: device instance
 * @retval  None
 */
-void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev)
+void MSC_BOT_Reset(USBD_HandleTypeDef *pdev)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   hmsc->bot_state  = USBD_BOT_IDLE;
   hmsc->bot_status = USBD_BOT_STATUS_RECOVERY;
 
+  (void)USBD_LL_ClearStallEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_ClearStallEP(pdev, MSC_EPOUT_ADDR);
+
   /* Prapare EP to Receive First BOT Cmd */
-  USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
+  (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)&hmsc->cbw,
                                USBD_BOT_CBW_LENGTH);
 }
 
@@ -143,9 +143,9 @@ void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev)
 * @param  pdev: device instance
 * @retval None
 */
-void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)
+void MSC_BOT_DeInit(USBD_HandleTypeDef  *pdev)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
   hmsc->bot_state = USBD_BOT_IDLE;
 }
 
@@ -156,26 +156,24 @@ void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)
 * @param  epnum: endpoint index
 * @retval None
 */
-void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
+void MSC_BOT_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                     uint8_t epnum)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  UNUSED(epnum);
+
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   switch (hmsc->bot_state)
   {
   case USBD_BOT_DATA_IN:
-    if(SCSI_ProcessCmd(pdev,
+    if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
-                        hmsc->cbw.bLUN,
-                        &hmsc->cbw.CB[0]) < 0)
     {
-      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+      MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
     }
     break;
 
   case USBD_BOT_SEND_DATA:
   case USBD_BOT_LAST_DATA_IN:
-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);
+    MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
-
     break;
 
   default:
@@ -189,10 +187,11 @@ void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
 * @param  epnum: endpoint index
 * @retval None
 */
-void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
+void MSC_BOT_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                      uint8_t epnum)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  UNUSED(epnum);
+
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   switch (hmsc->bot_state)
   {
@@ -201,14 +200,10 @@ void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
       break;
 
     case USBD_BOT_DATA_OUT:
-
+      if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
-    if(SCSI_ProcessCmd(pdev,
-                        hmsc->cbw.bLUN,
-                        &hmsc->cbw.CB[0]) < 0)
       {
-      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
       }
-
       break;
 
     default:
@@ -222,19 +217,18 @@ void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
 * @param  pdev: device instance
 * @retval None
 */
-static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
+static void  MSC_BOT_CBW_Decode(USBD_HandleTypeDef *pdev)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   hmsc->csw.dTag = hmsc->cbw.dTag;
   hmsc->csw.dDataResidue = hmsc->cbw.dDataLength;
 
-  if ((USBD_LL_GetRxDataSize (pdev ,MSC_EPOUT_ADDR) != USBD_BOT_CBW_LENGTH) ||
+  if ((USBD_LL_GetRxDataSize(pdev, MSC_EPOUT_ADDR) != USBD_BOT_CBW_LENGTH) ||
       (hmsc->cbw.dSignature != USBD_BOT_CBW_SIGNATURE) ||
-        (hmsc->cbw.bLUN > 1U) ||
+      (hmsc->cbw.bLUN > 1U) || (hmsc->cbw.bCBLength < 1U) ||
-          (hmsc->cbw.bCBLength < 1U) || (hmsc->cbw.bCBLength > 16U))
+      (hmsc->cbw.bCBLength > 16U))
   {
-
     SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
 
     hmsc->bot_status = USBD_BOT_STATUS_ERROR;
@@ -242,18 +236,18 @@ static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
   }
   else
   {
-    if(SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
+    if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
     {
-      if(hmsc->bot_state == USBD_BOT_NO_DATA)
+      if (hmsc->bot_state == USBD_BOT_NO_DATA)
       {
-        MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
       }
       else
       {
         MSC_BOT_Abort(pdev);
       }
     }
-    /*Burst xfer handled internally*/
+    /* Burst xfer handled internally */
     else if ((hmsc->bot_state != USBD_BOT_DATA_IN) &&
              (hmsc->bot_state != USBD_BOT_DATA_OUT) &&
              (hmsc->bot_state != USBD_BOT_LAST_DATA_IN))
@@ -264,7 +258,7 @@ static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
       }
       else if (hmsc->bot_data_length == 0U)
       {
-        MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);
+        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
       }
       else
       {
@@ -286,18 +280,17 @@ static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
 * @param  len: Data Length
 * @retval None
 */
-static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t* pbuf,
+static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf, uint32_t len)
-                              uint16_t len)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
-  uint16_t length = (uint16_t)MIN(hmsc->cbw.dDataLength, len);
+  uint32_t length = MIN(hmsc->cbw.dDataLength, len);
 
   hmsc->csw.dDataResidue -= len;
   hmsc->csw.bStatus = USBD_CSW_CMD_PASSED;
   hmsc->bot_state = USBD_BOT_SEND_DATA;
 
-  USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, pbuf, length);
+  (void)USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, pbuf, length);
 }
 
 /**
@@ -307,20 +300,19 @@ static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t* pbuf,
 * @param  status : CSW status
 * @retval None
 */
-void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
+void  MSC_BOT_SendCSW(USBD_HandleTypeDef *pdev, uint8_t CSW_Status)
-                              uint8_t CSW_Status)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   hmsc->csw.dSignature = USBD_BOT_CSW_SIGNATURE;
   hmsc->csw.bStatus = CSW_Status;
   hmsc->bot_state = USBD_BOT_IDLE;
 
-  USBD_LL_Transmit (pdev, MSC_EPIN_ADDR, (uint8_t *)(void *)&hmsc->csw,
+  (void)USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, (uint8_t *)&hmsc->csw,
                          USBD_BOT_CSW_LENGTH);
 
   /* Prepare EP to Receive next Cmd */
-  USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
+  (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)&hmsc->cbw,
                                USBD_BOT_CBW_LENGTH);
 }
 
@@ -331,23 +323,23 @@ void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
 * @retval status
 */
 
-static void  MSC_BOT_Abort (USBD_HandleTypeDef  *pdev)
+static void  MSC_BOT_Abort(USBD_HandleTypeDef *pdev)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
   if ((hmsc->cbw.bmFlags == 0U) &&
       (hmsc->cbw.dDataLength != 0U) &&
       (hmsc->bot_status == USBD_BOT_STATUS_NORMAL))
   {
-    USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR );
+    (void)USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
   }
 
-  USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
 
-  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR)
+  if (hmsc->bot_status == USBD_BOT_STATUS_ERROR)
   {
-    USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
+    (void)USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
-                            USBD_BOT_CBW_LENGTH);
+    (void)USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
   }
 }
 
@@ -359,18 +351,18 @@ static void  MSC_BOT_Abort (USBD_HandleTypeDef  *pdev)
 * @retval None
 */
 
-void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev, uint8_t epnum)
+void  MSC_BOT_CplClrFeature(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
-  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR)/* Bad CBW Signature */
+  if (hmsc->bot_status == USBD_BOT_STATUS_ERROR) /* Bad CBW Signature */
   {
-    USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
+    (void)USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
-    hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
+    (void)USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
   }
-  else if(((epnum & 0x80U) == 0x80U) && (hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))
+  else if (((epnum & 0x80U) == 0x80U) && (hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))
   {
-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+    MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
   }
   else
   {

Class/MSC/Src/usbd_msc_data.c

@@ -12,16 +12,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
+- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_msc_data.h"
@@ -65,19 +65,48 @@
   * @{
   */
 
-
 /* USB Mass storage Page 0 Inquiry Data */
-const uint8_t  MSC_Page00_Inquiry_Data[] = {
+uint8_t MSC_Page00_Inquiry_Data[LENGTH_INQUIRY_PAGE00] =
+{
   0x00,
   0x00,
   0x00,
   (LENGTH_INQUIRY_PAGE00 - 4U),
   0x00,
-	0x80,
+  0x80
-	0x83
 };
+
+/* USB Mass storage VPD Page 0x80 Inquiry Data for Unit Serial Number */
+uint8_t MSC_Page80_Inquiry_Data[LENGTH_INQUIRY_PAGE80] =
+{
+  0x00,
+  0x80,
+  0x00,
+  LENGTH_INQUIRY_PAGE80,
+  0x20,     /* Put Product Serial number */
+  0x20,
+  0x20,
+  0x20
+ };
+
 /* USB Mass storage sense 6 Data */
-const uint8_t  MSC_Mode_Sense6_data[] = {
+uint8_t MSC_Mode_Sense6_data[MODE_SENSE6_LEN] =
+{
+  0x22,
+  0x00,
+  0x00,
+  0x00,
+  0x08,
+  0x12,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
   0x00,
   0x00,
   0x00,
@@ -87,10 +116,32 @@ const uint8_t  MSC_Mode_Sense6_data[] = {
   0x00,
   0x00
 };
+
+
 /* USB Mass storage sense 10  Data */
-const uint8_t  MSC_Mode_Sense10_data[] = {
+uint8_t MSC_Mode_Sense10_data[MODE_SENSE10_LEN] =
+{
+  0x00,
+  0x26,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x08,
+  0x12,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
   0x00,
-	0x06,
   0x00,
   0x00,
   0x00,

Class/MSC/Src/usbd_msc_storage_template.c

@@ -12,16 +12,16 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
 
-  /* BSPDependencies
+/* BSPDependencies
-  - "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-  - "stm32xxxxx_{eval}{discovery}_io.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
-  - "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
+- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-  EndBSPDependencies */
+EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_msc_storage_template.h"
@@ -35,34 +35,30 @@
 /* Extern function prototypes ------------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 
-#define STORAGE_LUN_NBR                  1
+#define STORAGE_LUN_NBR                  1U
-#define STORAGE_BLK_NBR                  0x10000
+#define STORAGE_BLK_NBR                  0x10000U
-#define STORAGE_BLK_SIZ                  0x200
+#define STORAGE_BLK_SIZ                  0x200U
 
-int8_t STORAGE_Init (uint8_t lun);
+int8_t STORAGE_Init(uint8_t lun);
 
-int8_t STORAGE_GetCapacity (uint8_t lun,
+int8_t STORAGE_GetCapacity(uint8_t lun, uint32_t *block_num,
-                           uint32_t *block_num,
                            uint16_t *block_size);
 
-int8_t  STORAGE_IsReady (uint8_t lun);
+int8_t  STORAGE_IsReady(uint8_t lun);
 
-int8_t  STORAGE_IsWriteProtected (uint8_t lun);
+int8_t  STORAGE_IsWriteProtected(uint8_t lun);
 
-int8_t STORAGE_Read (uint8_t lun,
+int8_t STORAGE_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr,
-                        uint8_t *buf,
-                        uint32_t blk_addr,
                     uint16_t blk_len);
 
-int8_t STORAGE_Write (uint8_t lun,
+int8_t STORAGE_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr,
-                        uint8_t *buf,
-                        uint32_t blk_addr,
                      uint16_t blk_len);
 
-int8_t STORAGE_GetMaxLun (void);
+int8_t STORAGE_GetMaxLun(void);
 
 /* USB Mass storage Standard Inquiry Data */
-int8_t  STORAGE_Inquirydata[] = {//36
+int8_t  STORAGE_Inquirydata[] =  /* 36 */
+{
 
   /* LUN 0 */
   0x00,
@@ -76,7 +72,7 @@ int8_t  STORAGE_Inquirydata[] = {//36
   'S', 'T', 'M', ' ', ' ', ' ', ' ', ' ', /* Manufacturer : 8 bytes */
   'P', 'r', 'o', 'd', 'u', 'c', 't', ' ', /* Product      : 16 Bytes */
   ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
-  '0', '.', '0' ,'1',                     /* Version      : 4 Bytes */
+  '0', '.', '0', '1',                     /* Version      : 4 Bytes */
 };
 
 USBD_StorageTypeDef USBD_MSC_Template_fops =
@@ -98,7 +94,7 @@ USBD_StorageTypeDef USBD_MSC_Template_fops =
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t STORAGE_Init (uint8_t lun)
+int8_t STORAGE_Init(uint8_t lun)
 {
   return (0);
 }
@@ -110,7 +106,7 @@ int8_t STORAGE_Init (uint8_t lun)
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t STORAGE_GetCapacity (uint8_t lun, uint32_t *block_num, uint16_t *block_size)
+int8_t STORAGE_GetCapacity(uint8_t lun, uint32_t *block_num, uint16_t *block_size)
 {
   *block_num  = STORAGE_BLK_NBR;
   *block_size = STORAGE_BLK_SIZ;
@@ -124,7 +120,7 @@ int8_t STORAGE_GetCapacity (uint8_t lun, uint32_t *block_num, uint16_t *block_si
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t  STORAGE_IsReady (uint8_t lun)
+int8_t  STORAGE_IsReady(uint8_t lun)
 {
   return (0);
 }
@@ -136,7 +132,7 @@ int8_t  STORAGE_IsReady (uint8_t lun)
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t  STORAGE_IsWriteProtected (uint8_t lun)
+int8_t  STORAGE_IsWriteProtected(uint8_t lun)
 {
   return  0;
 }
@@ -148,10 +144,8 @@ int8_t  STORAGE_IsWriteProtected (uint8_t lun)
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t STORAGE_Read (uint8_t lun,
+int8_t STORAGE_Read(uint8_t lun, uint8_t *buf,
-                 uint8_t *buf,
+                    uint32_t blk_addr, uint16_t blk_len)
-                 uint32_t blk_addr,
-                 uint16_t blk_len)
 {
   return 0;
 }
@@ -162,10 +156,8 @@ int8_t STORAGE_Read (uint8_t lun,
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t STORAGE_Write (uint8_t lun,
+int8_t STORAGE_Write(uint8_t lun, uint8_t *buf,
-                  uint8_t *buf,
+                     uint32_t blk_addr, uint16_t blk_len)
-                  uint32_t blk_addr,
-                  uint16_t blk_len)
 {
   return (0);
 }
@@ -176,7 +168,7 @@ int8_t STORAGE_Write (uint8_t lun,
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-int8_t STORAGE_GetMaxLun (void)
+int8_t STORAGE_GetMaxLun(void)
 {
   return (STORAGE_LUN_NBR - 1);
 }

Class/Template/Inc/usbd_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_TEMPLATE_CORE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -41,10 +41,10 @@
 /** @defgroup USBD_TEMPLATE_Exported_Defines
   * @{
   */
-#define TEMPLATE_EPIN_ADDR                 0x81
+#define TEMPLATE_EPIN_ADDR                 0x81U
-#define TEMPLATE_EPIN_SIZE                 0x10
+#define TEMPLATE_EPIN_SIZE                 0x10U
 
-#define USB_TEMPLATE_CONFIG_DESC_SIZ       64
+#define USB_TEMPLATE_CONFIG_DESC_SIZ       64U
 
 /**
   * @}

Class/Template/Src/usbd_template.c

@@ -30,7 +30,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -83,33 +83,19 @@
   */
 
 
-static uint8_t  USBD_TEMPLATE_Init (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-                               uint8_t cfgidx);
+static uint8_t USBD_TEMPLATE_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-
+static uint8_t USBD_TEMPLATE_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static uint8_t  USBD_TEMPLATE_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
-                                 uint8_t cfgidx);
+static uint8_t USBD_TEMPLATE_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
-
+static uint8_t USBD_TEMPLATE_EP0_RxReady(USBD_HandleTypeDef *pdev);
-static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_EP0_TxReady(USBD_HandleTypeDef *pdev);
-                                USBD_SetupReqTypedef *req);
+static uint8_t USBD_TEMPLATE_SOF(USBD_HandleTypeDef *pdev);
-
+static uint8_t USBD_TEMPLATE_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
-static uint8_t  *USBD_TEMPLATE_GetCfgDesc (uint16_t *length);
+static uint8_t USBD_TEMPLATE_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  *USBD_TEMPLATE_GetDeviceQualifierDesc (uint16_t *length);
-
-static uint8_t  USBD_TEMPLATE_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_TEMPLATE_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_TEMPLATE_EP0_RxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_TEMPLATE_EP0_TxReady (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_TEMPLATE_SOF (USBD_HandleTypeDef *pdev);
-
-static uint8_t  USBD_TEMPLATE_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
-
-static uint8_t  USBD_TEMPLATE_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
 
+static uint8_t *USBD_TEMPLATE_GetCfgDesc(uint16_t *length);
+static uint8_t *USBD_TEMPLATE_GetDeviceQualifierDesc(uint16_t *length);
 /**
   * @}
   */
@@ -137,10 +123,10 @@ USBD_ClassTypeDef  USBD_TEMPLATE_ClassDriver =
 };
 
 #if defined ( __ICCARM__ ) /*!< IAR Compiler */
-  #pragma data_alignment=4
+#pragma data_alignment=4
 #endif
 /* USB TEMPLATE device Configuration Descriptor */
-static uint8_t USBD_TEMPLATE_CfgDesc[USB_TEMPLATE_CONFIG_DESC_SIZ] =
+__ALIGN_BEGIN static uint8_t USBD_TEMPLATE_CfgDesc[USB_TEMPLATE_CONFIG_DESC_SIZ] __ALIGN_END =
 {
   0x09, /* bLength: Configuation Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION, /* bDescriptorType: Configuration */
@@ -159,10 +145,10 @@ static uint8_t USBD_TEMPLATE_CfgDesc[USB_TEMPLATE_CONFIG_DESC_SIZ] =
 };
 
 #if defined ( __ICCARM__ ) /*!< IAR Compiler */
-  #pragma data_alignment=4
+#pragma data_alignment=4
 #endif
 /* USB Standard Device Descriptor */
-static uint8_t USBD_TEMPLATE_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] =
+__ALIGN_BEGIN static uint8_t USBD_TEMPLATE_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
 {
   USB_LEN_DEV_QUALIFIER_DESC,
   USB_DESC_TYPE_DEVICE_QUALIFIER,
@@ -191,13 +177,10 @@ static uint8_t USBD_TEMPLATE_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] =
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_Init (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                               uint8_t cfgidx)
 {
-  uint8_t ret = 0;
 
-
+  return (uint8_t)USBD_OK;
-  return ret;
 }
 
 /**
@@ -207,11 +190,10 @@ static uint8_t  USBD_TEMPLATE_Init (USBD_HandleTypeDef *pdev,
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_DeInit (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-                                 uint8_t cfgidx)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -221,7 +203,7 @@ static uint8_t  USBD_TEMPLATE_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_Setup(USBD_HandleTypeDef *pdev,
                                    USBD_SetupReqTypedef *req)
 {
   USBD_StatusTypeDef ret = USBD_OK;
@@ -232,7 +214,7 @@ static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
     switch (req->bRequest)
     {
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
@@ -242,19 +224,19 @@ static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
     switch (req->bRequest)
     {
     default:
-      USBD_CtlError (pdev, req);
+      USBD_CtlError(pdev, req);
       ret = USBD_FAIL;
       break;
     }
     break;
 
   default:
-    USBD_CtlError (pdev, req);
+    USBD_CtlError(pdev, req);
     ret = USBD_FAIL;
     break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 
@@ -264,9 +246,9 @@ static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
-static uint8_t  *USBD_TEMPLATE_GetCfgDesc (uint16_t *length)
+static uint8_t *USBD_TEMPLATE_GetCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_TEMPLATE_CfgDesc);
+  *length = (uint16_t)sizeof(USBD_TEMPLATE_CfgDesc);
   return USBD_TEMPLATE_CfgDesc;
 }
 
@@ -276,9 +258,9 @@ static uint8_t  *USBD_TEMPLATE_GetCfgDesc (uint16_t *length)
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_TEMPLATE_DeviceQualifierDescriptor (uint16_t *length)
+uint8_t *USBD_TEMPLATE_DeviceQualifierDescriptor(uint16_t *length)
 {
-  *length = sizeof (USBD_TEMPLATE_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_TEMPLATE_DeviceQualifierDesc);
   return USBD_TEMPLATE_DeviceQualifierDesc;
 }
 
@@ -290,11 +272,10 @@ uint8_t  *USBD_TEMPLATE_DeviceQualifierDescriptor (uint16_t *length)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_DataIn (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -303,10 +284,10 @@ static uint8_t  USBD_TEMPLATE_DataIn (USBD_HandleTypeDef *pdev,
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_EP0_RxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_TEMPLATE_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_TEMPLATE_EP0_TxReady
@@ -314,10 +295,10 @@ static uint8_t  USBD_TEMPLATE_EP0_RxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_EP0_TxReady (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_TEMPLATE_EP0_TxReady(USBD_HandleTypeDef *pdev)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_TEMPLATE_SOF
@@ -325,10 +306,10 @@ static uint8_t  USBD_TEMPLATE_EP0_TxReady (USBD_HandleTypeDef *pdev)
   * @param  pdev: device instance
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_SOF (USBD_HandleTypeDef *pdev)
+static uint8_t USBD_TEMPLATE_SOF(USBD_HandleTypeDef *pdev)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_TEMPLATE_IsoINIncomplete
@@ -337,10 +318,10 @@ static uint8_t  USBD_TEMPLATE_SOF (USBD_HandleTypeDef *pdev)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_TEMPLATE_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_TEMPLATE_IsoOutIncomplete
@@ -349,10 +330,10 @@ static uint8_t  USBD_TEMPLATE_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum)
+static uint8_t USBD_TEMPLATE_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_TEMPLATE_DataOut
@@ -361,11 +342,10 @@ static uint8_t  USBD_TEMPLATE_IsoOutIncomplete (USBD_HandleTypeDef *pdev, uint8_
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_DataOut (USBD_HandleTypeDef *pdev,
+static uint8_t USBD_TEMPLATE_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-                              uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -374,9 +354,10 @@ static uint8_t  USBD_TEMPLATE_DataOut (USBD_HandleTypeDef *pdev,
 * @param  length : pointer data length
 * @retval pointer to descriptor buffer
 */
-uint8_t  *USBD_TEMPLATE_GetDeviceQualifierDesc (uint16_t *length)
+uint8_t *USBD_TEMPLATE_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_TEMPLATE_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_TEMPLATE_DeviceQualifierDesc);
+
   return USBD_TEMPLATE_DeviceQualifierDesc;
 }
 

Core/Inc/usbd_conf_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_CONF_TEMPLATE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -47,32 +47,40 @@
 #define USBD_MAX_NUM_INTERFACES                1U
 #define USBD_MAX_NUM_CONFIGURATION             1U
 #define USBD_MAX_STR_DESC_SIZ                  0x100U
-#define USBD_SUPPORT_USER_STRING              0U
 #define USBD_SELF_POWERED                      1U
 #define USBD_DEBUG_LEVEL                       2U
 
+/* ECM, RNDIS, DFU Class Config */
+#define USBD_SUPPORT_USER_STRING_DESC          1U
+
+/* BillBoard Class Config */
+#define USBD_CLASS_USER_STRING_DESC            1U
+#define USBD_CLASS_BOS_ENABLED                 1U
+#define USB_BB_MAX_NUM_ALT_MODE                0x2U
+
 /* MSC Class Config */
 #define MSC_MEDIA_PACKET                       8192U
 
 /* CDC Class Config */
 #define USBD_CDC_INTERVAL                      2000U
 
- /* DFU Class Config */
+/* DFU Class Config */
 #define USBD_DFU_MAX_ITF_NUM                   1U
 #define USBD_DFU_XFERS_IZE                     1024U
 
- /* AUDIO Class Config */
+/* AUDIO Class Config */
 #define USBD_AUDIO_FREQ                        22100U
 
 /** @defgroup USBD_Exported_Macros
   * @{
   */
 
- /* Memory management macros */
+/* Memory management macros */
 #define USBD_malloc               malloc
 #define USBD_free                 free
 #define USBD_memset               memset
 #define USBD_memcpy               memcpy
+#define USBD_Delay                HAL_Delay
 
 /* DEBUG macros */
 #if (USBD_DEBUG_LEVEL > 0U)

Core/Inc/usbd_core.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_CORE_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -84,17 +84,17 @@
   */
 USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id);
 USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef USBD_Start  (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_Start(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef USBD_Stop   (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_Stop(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass);
 
-USBD_StatusTypeDef USBD_RunTestMode (USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_RunTestMode(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
 USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
 
 USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);
-USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev, uint8_t epnum, uint8_t *pdata);
-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum, uint8_t *pdata);
 
 USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef *pdev, USBD_SpeedTypeDef speed);
@@ -109,33 +109,30 @@ USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev);
 USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef *pdev);
 
 /* USBD Low Level Driver */
-USBD_StatusTypeDef  USBD_LL_Init (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_DeInit (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_Stop (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_OpenEP  (USBD_HandleTypeDef *pdev,
-                                      uint8_t  ep_addr,
-                                      uint8_t  ep_type,
-                                      uint16_t ep_mps);
 
-USBD_StatusTypeDef  USBD_LL_CloseEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-USBD_StatusTypeDef  USBD_LL_FlushEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+                                  uint8_t ep_type, uint16_t ep_mps);
-USBD_StatusTypeDef  USBD_LL_StallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-USBD_StatusTypeDef  USBD_LL_ClearStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-uint8_t             USBD_LL_IsStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-USBD_StatusTypeDef  USBD_LL_SetUSBAddress (USBD_HandleTypeDef *pdev, uint8_t dev_addr);
-USBD_StatusTypeDef  USBD_LL_Transmit (USBD_HandleTypeDef *pdev,
-                                      uint8_t  ep_addr,
-                                      uint8_t  *pbuf,
-                                      uint16_t  size);
 
-USBD_StatusTypeDef  USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint8_t  ep_addr,
+USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint8_t  *pbuf,
+USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint16_t  size);
+USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr);
 
-uint32_t USBD_LL_GetRxDataSize  (USBD_HandleTypeDef *pdev, uint8_t  ep_addr);
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-void  USBD_LL_Delay (uint32_t Delay);
+                                    uint8_t *pbuf, uint32_t size);
+
+USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+                                          uint8_t *pbuf, uint32_t size);
+
+uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t  ep_addr);
+
+void  USBD_LL_Delay(uint32_t Delay);
 
 /**
   * @}

Core/Inc/usbd_ctlreq.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USB_REQUEST_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -73,16 +73,14 @@
   * @{
   */
 
-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdDevReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdItfReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-USBD_StatusTypeDef  USBD_StdEPReq  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
 
+void USBD_CtlError(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata);
+void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len);
 
-void USBD_CtlError  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef *req);
-
-void USBD_ParseSetupRequest (USBD_SetupReqTypedef *req, uint8_t *pdata);
-
-void USBD_GetString         (uint8_t *desc, uint8_t *unicode, uint16_t *len);
 /**
   * @}
   */

Core/Inc/usbd_def.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_DEF_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -61,9 +61,13 @@
 #define USBD_SELF_POWERED                               1U
 #endif /*USBD_SELF_POWERED */
 
-#ifndef USBD_SUPPORT_USER_STRING
+#ifndef USBD_SUPPORT_USER_STRING_DESC
-#define USBD_SUPPORT_USER_STRING                        0U
+#define USBD_SUPPORT_USER_STRING_DESC                   0U
-#endif /* USBD_SUPPORT_USER_STRING */
+#endif /* USBD_SUPPORT_USER_STRING_DESC */
+
+#ifndef USBD_CLASS_USER_STRING_DESC
+#define USBD_CLASS_USER_STRING_DESC                     0U
+#endif /* USBD_CLASS_USER_STRING_DESC */
 
 #define  USB_LEN_DEV_QUALIFIER_DESC                     0x0AU
 #define  USB_LEN_DEV_DESC                               0x12U
@@ -158,37 +162,58 @@
 
 typedef  struct  usb_setup_req
 {
-
   uint8_t   bmRequest;
   uint8_t   bRequest;
   uint16_t  wValue;
   uint16_t  wIndex;
   uint16_t  wLength;
-}USBD_SetupReqTypedef;
+} USBD_SetupReqTypedef;
+
+typedef struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint8_t   wDescriptorLengthLow;
+  uint8_t   wDescriptorLengthHigh;
+  uint8_t   bNumInterfaces;
+  uint8_t   bConfigurationValue;
+  uint8_t   iConfiguration;
+  uint8_t   bmAttributes;
+  uint8_t   bMaxPower;
+} USBD_ConfigDescTypedef;
+
+typedef struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint16_t  wTotalLength;
+  uint8_t   bNumDeviceCaps;
+} USBD_BosDescTypedef;
+
 
 struct _USBD_HandleTypeDef;
 
 typedef struct _Device_cb
 {
-  uint8_t  (*Init)             (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);
+  uint8_t (*Init)(struct _USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-  uint8_t  (*DeInit)           (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);
+  uint8_t (*DeInit)(struct _USBD_HandleTypeDef *pdev, uint8_t cfgidx);
   /* Control Endpoints*/
-  uint8_t  (*Setup)            (struct _USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req);
+  uint8_t (*Setup)(struct _USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef  *req);
-  uint8_t  (*EP0_TxSent)       (struct _USBD_HandleTypeDef *pdev );
+  uint8_t (*EP0_TxSent)(struct _USBD_HandleTypeDef *pdev);
-  uint8_t  (*EP0_RxReady)      (struct _USBD_HandleTypeDef *pdev );
+  uint8_t (*EP0_RxReady)(struct _USBD_HandleTypeDef *pdev);
   /* Class Specific Endpoints*/
-  uint8_t  (*DataIn)           (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+  uint8_t (*DataIn)(struct _USBD_HandleTypeDef *pdev, uint8_t epnum);
-  uint8_t  (*DataOut)          (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+  uint8_t (*DataOut)(struct _USBD_HandleTypeDef *pdev, uint8_t epnum);
-  uint8_t  (*SOF)              (struct _USBD_HandleTypeDef *pdev);
+  uint8_t (*SOF)(struct _USBD_HandleTypeDef *pdev);
-  uint8_t  (*IsoINIncomplete)  (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+  uint8_t (*IsoINIncomplete)(struct _USBD_HandleTypeDef *pdev, uint8_t epnum);
-  uint8_t  (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+  uint8_t (*IsoOUTIncomplete)(struct _USBD_HandleTypeDef *pdev, uint8_t epnum);
 
   uint8_t  *(*GetHSConfigDescriptor)(uint16_t *length);
   uint8_t  *(*GetFSConfigDescriptor)(uint16_t *length);
   uint8_t  *(*GetOtherSpeedConfigDescriptor)(uint16_t *length);
   uint8_t  *(*GetDeviceQualifierDescriptor)(uint16_t *length);
-#if (USBD_SUPPORT_USER_STRING == 1U)
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
-  uint8_t  *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index,  uint16_t *length);
+  uint8_t  *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev, uint8_t index,  uint16_t *length);
 #endif
 
 } USBD_ClassTypeDef;
@@ -199,27 +224,32 @@ typedef enum
   USBD_SPEED_HIGH  = 0U,
   USBD_SPEED_FULL  = 1U,
   USBD_SPEED_LOW   = 2U,
-}USBD_SpeedTypeDef;
+} USBD_SpeedTypeDef;
 
 /* Following USB Device status */
-typedef enum {
+typedef enum
+{
   USBD_OK = 0U,
   USBD_BUSY,
+  USBD_EMEM,
   USBD_FAIL,
-}USBD_StatusTypeDef;
+} USBD_StatusTypeDef;
 
 /* USB Device descriptors structure */
 typedef struct
 {
-  uint8_t  *(*GetDeviceDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetDeviceDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetLangIDStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetLangIDStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetManufacturerStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetManufacturerStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetProductStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetProductStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetSerialStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetSerialStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetConfigurationStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetConfigurationStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetInterfaceStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetInterfaceStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-#if (USBD_LPM_ENABLED == 1U)
+#if (USBD_CLASS_USER_STRING_DESC == 1)
-  uint8_t  *(*GetBOSDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+  uint8_t *(*GetUserStrDescriptor)(USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length);
+#endif
+#if ((USBD_LPM_ENABLED == 1U) || (USBD_CLASS_BOS_ENABLED == 1))
+  uint8_t *(*GetBOSDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
 #endif
 } USBD_DescriptorsTypeDef;
 
@@ -227,10 +257,11 @@ typedef struct
 typedef struct
 {
   uint32_t status;
-  uint32_t                is_used;
   uint32_t total_length;
   uint32_t rem_length;
   uint32_t maxpacket;
+  uint16_t is_used;
+  uint16_t bInterval;
 } USBD_EndpointTypeDef;
 
 /* USB Device handle structure */
@@ -241,8 +272,8 @@ typedef struct _USBD_HandleTypeDef
   uint32_t                dev_default_config;
   uint32_t                dev_config_status;
   USBD_SpeedTypeDef       dev_speed;
-  USBD_EndpointTypeDef    ep_in[15];
+  USBD_EndpointTypeDef    ep_in[16];
-  USBD_EndpointTypeDef    ep_out[15];
+  USBD_EndpointTypeDef    ep_out[16];
   uint32_t                ep0_state;
   uint32_t                ep0_data_len;
   uint8_t                 dev_state;
@@ -251,6 +282,7 @@ typedef struct _USBD_HandleTypeDef
   uint8_t                 dev_connection_status;
   uint8_t                 dev_test_mode;
   uint32_t                dev_remote_wakeup;
+  uint8_t                 ConfIdx;
 
   USBD_SetupReqTypedef    request;
   USBD_DescriptorsTypeDef *pDesc;
@@ -258,6 +290,8 @@ typedef struct _USBD_HandleTypeDef
   void                    *pClassData;
   void                    *pUserData;
   void                    *pData;
+  void                    *pBosDesc;
+  void                    *pConfDesc;
 } USBD_HandleTypeDef;
 
 /**
@@ -269,40 +303,57 @@ typedef struct _USBD_HandleTypeDef
 /** @defgroup USBD_DEF_Exported_Macros
   * @{
   */
-#define  SWAPBYTE(addr)        (((uint16_t)(*((uint8_t *)(addr)))) + \
+__STATIC_INLINE uint16_t SWAPBYTE(uint8_t *addr)
-                               (((uint16_t)(*(((uint8_t *)(addr)) + 1U))) << 8U))
+{
+  uint16_t _SwapVal, _Byte1, _Byte2;
+  uint8_t *_pbuff = addr;
 
-#define LOBYTE(x)  ((uint8_t)(x & 0x00FFU))
+  _Byte1 = *(uint8_t *)_pbuff;
-#define HIBYTE(x)  ((uint8_t)((x & 0xFF00U) >> 8U))
+  _pbuff++;
+  _Byte2 = *(uint8_t *)_pbuff;
+
+  _SwapVal = (_Byte2 << 8) | _Byte1;
+
+  return _SwapVal;
+}
+
+#define LOBYTE(x)  ((uint8_t)((x) & 0x00FFU))
+#define HIBYTE(x)  ((uint8_t)(((x) & 0xFF00U) >> 8U))
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
 
 #if  defined ( __GNUC__ )
-  #ifndef __weak
+#ifndef __weak
-    #define __weak   __attribute__((weak))
+#define __weak   __attribute__((weak))
-  #endif /* __weak */
+#endif /* __weak */
-  #ifndef __packed
+#ifndef __packed
-    #define __packed __attribute__((__packed__))
+#define __packed __attribute__((__packed__))
-  #endif /* __packed */
+#endif /* __packed */
 #endif /* __GNUC__ */
 
 
 /* In HS mode and when the DMA is used, all variables and data structures dealing
    with the DMA during the transaction process should be 4-bytes aligned */
 
-#if defined   (__GNUC__)        /* GNU Compiler */
+#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
-  #define __ALIGN_END    __attribute__ ((aligned (4)))
+#ifndef __ALIGN_END
-  #define __ALIGN_BEGIN
+#define __ALIGN_END    __attribute__ ((aligned (4U)))
+#endif /* __ALIGN_END */
+#ifndef __ALIGN_BEGIN
+#define __ALIGN_BEGIN
+#endif /* __ALIGN_BEGIN */
 #else
-  #define __ALIGN_END
+#ifndef __ALIGN_END
-  #if defined   (__CC_ARM)      /* ARM Compiler */
+#define __ALIGN_END
-    #define __ALIGN_BEGIN    __align(4)
+#endif /* __ALIGN_END */
-  #elif defined (__ICCARM__)    /* IAR Compiler */
+#ifndef __ALIGN_BEGIN
-    #define __ALIGN_BEGIN
+#if defined   (__CC_ARM)      /* ARM Compiler */
-  #elif defined  (__TASKING__)  /* TASKING Compiler */
+#define __ALIGN_BEGIN    __align(4U)
-    #define __ALIGN_BEGIN    __align(4)
+#elif defined (__ICCARM__)    /* IAR Compiler */
-  #endif /* __CC_ARM */
+#define __ALIGN_BEGIN
+#endif /* __CC_ARM */
+#endif /* __ALIGN_BEGIN */
 #endif /* __GNUC__ */
 
 

Core/Inc/usbd_desc_template.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -26,11 +26,33 @@
 
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
-#define         DEVICE_ID1          (0x1FFF7A10)
+#define         DEVICE_ID1          (UID_BASE)
-#define         DEVICE_ID2          (0x1FFF7A14)
+#define         DEVICE_ID2          (UID_BASE + 0x4U)
-#define         DEVICE_ID3          (0x1FFF7A18)
+#define         DEVICE_ID3          (UID_BASE + 0x8U)
 
-#define  USB_SIZ_STRING_SERIAL       0x1A
+/*
+ * USB Billboard Class USER string desc Defines Template
+ * index should start form 0x10 to avoid using the reserved device string desc indexes
+ */
+#if (USBD_CLASS_USER_STRING_DESC == 1)
+#define USBD_BB_IF_STRING_INDEX         0x10U
+#define USBD_BB_URL_STRING_INDEX        0x11U
+#define USBD_BB_ALTMODE0_STRING_INDEX   0x12U
+#define USBD_BB_ALTMODE1_STRING_INDEX   0x13U
+/* Add Specific USER string Desc */
+#define USBD_BB_IF_STR_DESC           (uint8_t *)"STM32 BillBoard Interface"
+#define USBD_BB_URL_STR_DESC          (uint8_t *)"www.st.com"
+#define USBD_BB_ALTMODE0_STR_DESC     (uint8_t *)"STM32 Alternate0 Mode"
+#define USBD_BB_ALTMODE1_STR_DESC     (uint8_t *)"STM32 Alternate1 Mode"
+#endif
+
+#define  USB_SIZ_STRING_SERIAL       0x1AU
+
+#if (USBD_LPM_ENABLED == 1)
+#define  USB_SIZ_BOS_DESC            0x0CU
+#elif (USBD_CLASS_BOS_ENABLED == 1)
+#define  USB_SIZ_BOS_DESC            0x5DU
+#endif
 
 /* Exported macro ------------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */

Core/Inc/usbd_ioreq.h

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -22,7 +22,7 @@
 #define __USBD_IOREQ_H
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -77,27 +77,22 @@
   * @{
   */
 
-USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
+                                    uint8_t *pbuf, uint32_t len);
-                               uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlContinueSendData(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
+                                            uint8_t *pbuf, uint32_t len);
-                               uint16_t len);
 
-USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
+                                     uint8_t *pbuf, uint32_t len);
-                               uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
-                              uint8_t *pbuf,
+                                      uint8_t *pbuf, uint32_t len);
-                              uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_CtlSendStatus(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_CtlReceiveStatus(USBD_HandleTypeDef *pdev);
 
-USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev);
+uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-
-uint32_t  USBD_GetRxCount (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
 
 /**
   * @}

Core/Src/usbd_conf_template.c

@@ -3,8 +3,8 @@
   * @file    usbd_conf_template.c
   * @author  MCD Application Team
   * @brief   USB Device configuration and interface file
-  *          This template should be copied to the user folder, renamed and customized
+  *          This template should be copied to the user folder,
-  *          following user needs.
+  *          renamed and customized following user needs.
   ******************************************************************************
   * @attention
   *
@@ -14,7 +14,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -34,6 +34,8 @@
   */
 USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -44,6 +46,8 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -54,6 +58,8 @@ USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -64,6 +70,8 @@ USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -75,11 +83,14 @@ USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
   * @param  ep_mps: Endpoint Max Packet Size
   * @retval USBD Status
   */
-USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-                                  uint8_t ep_addr,
+                                  uint8_t ep_type, uint16_t ep_mps)
-                                  uint8_t ep_type,
-                                  uint16_t ep_mps)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(ep_type);
+  UNUSED(ep_mps);
+
   return USBD_OK;
 }
 
@@ -91,6 +102,9 @@ USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev,
   */
 USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
   return USBD_OK;
 }
 
@@ -102,6 +116,9 @@ USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   */
 USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
   return USBD_OK;
 }
 
@@ -113,6 +130,9 @@ USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   */
 USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
   return USBD_OK;
 }
 
@@ -122,8 +142,12 @@ USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   * @param  ep_addr: Endpoint Number
   * @retval USBD Status
   */
-USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev,
+                                        uint8_t ep_addr)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
   return USBD_OK;
 }
 
@@ -135,7 +159,10 @@ USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_add
   */
 uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
-   return 0;
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
+  return 0U;
 }
 
 /**
@@ -144,8 +171,12 @@ uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   * @param  ep_addr: Endpoint Number
   * @retval USBD Status
   */
-USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr)
+USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev,
+                                         uint8_t dev_addr)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
   return USBD_OK;
 }
 
@@ -157,11 +188,14 @@ USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_a
   * @param  size: Data size
   * @retval USBD Status
   */
-USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-                                    uint8_t ep_addr,
+                                    uint8_t *pbuf, uint32_t size)
-                                    uint8_t *pbuf,
-                                    uint16_t size)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(pbuf);
+  UNUSED(size);
+
   return USBD_OK;
 }
 
@@ -174,10 +208,14 @@ USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev,
   * @retval USBD Status
   */
 USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
-                                          uint8_t ep_addr,
+                                          uint8_t ep_addr, uint8_t *pbuf,
-                                          uint8_t *pbuf,
+                                          uint32_t size)
-                                          uint16_t size)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(pbuf);
+  UNUSED(size);
+
   return USBD_OK;
 }
 
@@ -189,7 +227,10 @@ USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
   */
 uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
-  return 0;
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
+  return 0U;
 }
 
 /**
@@ -199,6 +240,7 @@ uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   */
 void USBD_LL_Delay(uint32_t Delay)
 {
+  UNUSED(Delay);
 }
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
 

Core/Src/usbd_core.c

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -33,6 +33,7 @@
 /** @defgroup USBD_CORE_Private_TypesDefinitions
 * @{
 */
+
 /**
 * @}
 */
@@ -50,13 +51,12 @@
 /** @defgroup USBD_CORE_Private_Macros
 * @{
 */
+
 /**
 * @}
 */
 
 
-
-
 /** @defgroup USBD_CORE_Private_FunctionPrototypes
 * @{
 */
@@ -73,6 +73,7 @@
 * @}
 */
 
+
 /** @defgroup USBD_CORE_Private_Functions
 * @{
 */
@@ -85,10 +86,13 @@
 * @param  id: Low level core index
 * @retval None
 */
-USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id)
+USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev,
+                             USBD_DescriptorsTypeDef *pdesc, uint8_t id)
 {
+  USBD_StatusTypeDef ret;
+
   /* Check whether the USB Host handle is valid */
-  if(pdev == NULL)
+  if (pdev == NULL)
   {
 #if (USBD_DEBUG_LEVEL > 1U)
     USBD_ErrLog("Invalid Device handle");
@@ -96,14 +100,19 @@ USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *
     return USBD_FAIL;
   }
 
-  /* Unlink previous class*/
+  /* Unlink previous class */
-  if(pdev->pClass != NULL)
+  if (pdev->pClass != NULL)
   {
     pdev->pClass = NULL;
   }
 
+  if (pdev->pConfDesc != NULL)
+  {
+    pdev->pConfDesc = NULL;
+  }
+
   /* Assign USBD Descriptors */
-  if(pdesc != NULL)
+  if (pdesc != NULL)
   {
     pdev->pDesc = pdesc;
   }
@@ -111,10 +120,11 @@ USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *
   /* Set Device initial State */
   pdev->dev_state = USBD_STATE_DEFAULT;
   pdev->id = id;
-  /* Initialize low level driver */
-  USBD_LL_Init(pdev);
 
-  return USBD_OK;
+  /* Initialize low level driver */
+  ret = USBD_LL_Init(pdev);
+
+  return ret;
 }
 
 /**
@@ -125,19 +135,34 @@ USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *
 */
 USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)
 {
+  USBD_StatusTypeDef ret;
+
   /* Set Default State */
   pdev->dev_state = USBD_STATE_DEFAULT;
 
   /* Free Class Resources */
+  if (pdev->pClass != NULL)
+  {
     pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  }
+
+  if (pdev->pConfDesc != NULL)
+  {
+    pdev->pConfDesc = NULL;
+  }
 
   /* Stop the low level driver  */
-  USBD_LL_Stop(pdev);
+  ret = USBD_LL_Stop(pdev);
+
+  if (ret != USBD_OK)
+  {
+    return ret;
+  }
 
   /* Initialize low level driver */
-  USBD_LL_DeInit(pdev);
+  ret = USBD_LL_DeInit(pdev);
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
@@ -149,22 +174,28 @@ USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass)
 {
-  USBD_StatusTypeDef   status = USBD_OK;
+  uint16_t len = 0U;
-  if(pclass != 0)
+
-  {
+  if (pclass == NULL)
-    /* link the class to the USB Device handle */
-    pdev->pClass = pclass;
-    status = USBD_OK;
-  }
-  else
   {
 #if (USBD_DEBUG_LEVEL > 1U)
     USBD_ErrLog("Invalid Class handle");
 #endif
-    status = USBD_FAIL;
+    return USBD_FAIL;
   }
 
-  return status;
+  /* link the class to the USB Device handle */
+  pdev->pClass = pclass;
+
+  /* Get Device Configuration Descriptor */
+#ifdef USE_USB_FS
+  pdev->pConfDesc = (void *)pdev->pClass->GetFSConfigDescriptor(&len);
+#else /* USE_USB_HS */
+  pdev->pConfDesc = (void *)pdev->pClass->GetHSConfigDescriptor(&len);
+#endif /* USE_USB_FS */
+
+
+  return USBD_OK;
 }
 
 /**
@@ -173,13 +204,10 @@ USBD_StatusTypeDef  USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeD
   * @param  pdev: Device Handle
   * @retval USBD Status
   */
-USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)
+USBD_StatusTypeDef USBD_Start(USBD_HandleTypeDef *pdev)
 {
-
   /* Start the low level driver  */
-  USBD_LL_Start(pdev);
+  return USBD_LL_Start(pdev);
-
-  return USBD_OK;
 }
 
 /**
@@ -188,15 +216,25 @@ USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)
   * @param  pdev: Device Handle
   * @retval USBD Status
   */
-USBD_StatusTypeDef  USBD_Stop   (USBD_HandleTypeDef *pdev)
+USBD_StatusTypeDef USBD_Stop(USBD_HandleTypeDef *pdev)
 {
+  USBD_StatusTypeDef ret;
+
   /* Free Class Resources */
+  if (pdev->pClass != NULL)
+  {
     pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  }
+
+  if (pdev->pConfDesc != NULL)
+  {
+    pdev->pConfDesc = NULL;
+  }
 
   /* Stop the low level driver */
-  USBD_LL_Stop(pdev);
+  ret = USBD_LL_Stop(pdev);
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
@@ -205,7 +243,7 @@ USBD_StatusTypeDef  USBD_Stop   (USBD_HandleTypeDef *pdev)
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef  USBD_RunTestMode (USBD_HandleTypeDef  *pdev)
+USBD_StatusTypeDef USBD_RunTestMode(USBD_HandleTypeDef  *pdev)
 {
   /* Prevent unused argument compilation warning */
   UNUSED(pdev);
@@ -225,13 +263,10 @@ USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx
 {
   USBD_StatusTypeDef ret = USBD_FAIL;
 
-  if(pdev->pClass != NULL)
+  if (pdev->pClass != NULL)
   {
-    /* Set configuration  and Start the Class*/
+    /* Set configuration and Start the Class */
-    if(pdev->pClass->Init(pdev, cfgidx) == 0U)
+    ret = (USBD_StatusTypeDef)pdev->pClass->Init(pdev, cfgidx);
-    {
-      ret = USBD_OK;
-    }
   }
 
   return ret;
@@ -246,8 +281,12 @@ USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx
 */
 USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  /* Clear configuration  and De-initialize the Class process*/
+  /* Clear configuration and De-initialize the Class process */
+  if (pdev->pClass != NULL)
+  {
     pdev->pClass->DeInit(pdev, cfgidx);
+  }
+
   return USBD_OK;
 }
 
@@ -260,6 +299,8 @@ USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx
 */
 USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
 {
+  USBD_StatusTypeDef ret;
+
   USBD_ParseSetupRequest(&pdev->request, psetup);
 
   pdev->ep0_state = USBD_EP0_SETUP;
@@ -269,23 +310,23 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
   switch (pdev->request.bmRequest & 0x1FU)
   {
     case USB_REQ_RECIPIENT_DEVICE:
-    USBD_StdDevReq (pdev, &pdev->request);
+      ret = USBD_StdDevReq(pdev, &pdev->request);
       break;
 
     case USB_REQ_RECIPIENT_INTERFACE:
-    USBD_StdItfReq(pdev, &pdev->request);
+      ret = USBD_StdItfReq(pdev, &pdev->request);
       break;
 
     case USB_REQ_RECIPIENT_ENDPOINT:
-    USBD_StdEPReq(pdev, &pdev->request);
+      ret = USBD_StdEPReq(pdev, &pdev->request);
       break;
 
     default:
-    USBD_LL_StallEP(pdev, (pdev->request.bmRequest & 0x80U));
+      ret = USBD_LL_StallEP(pdev, (pdev->request.bmRequest & 0x80U));
       break;
   }
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
@@ -299,47 +340,53 @@ USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
                                         uint8_t epnum, uint8_t *pdata)
 {
   USBD_EndpointTypeDef *pep;
+  USBD_StatusTypeDef ret;
 
-  if(epnum == 0U)
+  if (epnum == 0U)
   {
     pep = &pdev->ep_out[0];
 
-    if ( pdev->ep0_state == USBD_EP0_DATA_OUT)
+    if (pdev->ep0_state == USBD_EP0_DATA_OUT)
     {
-      if(pep->rem_length > pep->maxpacket)
+      if (pep->rem_length > pep->maxpacket)
       {
         pep->rem_length -= pep->maxpacket;
 
-        USBD_CtlContinueRx (pdev,
+        (void)USBD_CtlContinueRx(pdev, pdata, MIN(pep->rem_length, pep->maxpacket));
-                            pdata,
-                            (uint16_t)MIN(pep->rem_length, pep->maxpacket));
       }
       else
       {
-        if((pdev->pClass->EP0_RxReady != NULL)&&
+        if ((pdev->pClass->EP0_RxReady != NULL) &&
             (pdev->dev_state == USBD_STATE_CONFIGURED))
         {
           pdev->pClass->EP0_RxReady(pdev);
         }
-        USBD_CtlSendStatus(pdev);
+        (void)USBD_CtlSendStatus(pdev);
       }
     }
     else
     {
+#if 0
       if (pdev->ep0_state == USBD_EP0_STATUS_OUT)
       {
         /*
          * STATUS PHASE completed, update ep0_state to idle
          */
         pdev->ep0_state = USBD_EP0_IDLE;
-        USBD_LL_StallEP(pdev, 0U);
+        (void)USBD_LL_StallEP(pdev, 0U);
+      }
+#endif
     }
   }
-  }
+  else if ((pdev->pClass->DataOut != NULL) &&
-  else if((pdev->pClass->DataOut != NULL) &&
            (pdev->dev_state == USBD_STATE_CONFIGURED))
   {
-    pdev->pClass->DataOut(pdev, epnum);
+    ret = (USBD_StatusTypeDef)pdev->pClass->DataOut(pdev, epnum);
+
+    if (ret != USBD_OK)
+    {
+      return ret;
+    }
   }
   else
   {
@@ -357,69 +404,78 @@ USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
 * @param  epnum: endpoint index
 * @retval status
 */
-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum,
+USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev,
-                                       uint8_t *pdata)
+                                       uint8_t epnum, uint8_t *pdata)
 {
   USBD_EndpointTypeDef *pep;
+  USBD_StatusTypeDef ret;
 
-  if(epnum == 0U)
+  if (epnum == 0U)
   {
     pep = &pdev->ep_in[0];
 
-    if ( pdev->ep0_state == USBD_EP0_DATA_IN)
+    if (pdev->ep0_state == USBD_EP0_DATA_IN)
     {
-      if(pep->rem_length > pep->maxpacket)
+      if (pep->rem_length > pep->maxpacket)
       {
         pep->rem_length -= pep->maxpacket;
 
-        USBD_CtlContinueSendData (pdev, pdata, (uint16_t)pep->rem_length);
+        (void)USBD_CtlContinueSendData(pdev, pdata, pep->rem_length);
 
         /* Prepare endpoint for premature end of transfer */
-        USBD_LL_PrepareReceive (pdev, 0U, NULL, 0U);
+       (void)USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
       }
       else
-      { /* last packet is MPS multiple, so send ZLP packet */
+      {
-        if((pep->total_length % pep->maxpacket == 0U) &&
+        /* last packet is MPS multiple, so send ZLP packet */
+        if ((pep->maxpacket == pep->rem_length) &&
             (pep->total_length >= pep->maxpacket) &&
             (pep->total_length < pdev->ep0_data_len))
         {
-          USBD_CtlContinueSendData(pdev, NULL, 0U);
+          (void)USBD_CtlContinueSendData(pdev, NULL, 0U);
           pdev->ep0_data_len = 0U;
 
           /* Prepare endpoint for premature end of transfer */
-          USBD_LL_PrepareReceive (pdev, 0U, NULL, 0U);
+          (void)USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
         }
         else
         {
-          if((pdev->pClass->EP0_TxSent != NULL)&&
+          if ((pdev->pClass->EP0_TxSent != NULL) &&
               (pdev->dev_state == USBD_STATE_CONFIGURED))
           {
             pdev->pClass->EP0_TxSent(pdev);
           }
-          USBD_LL_StallEP(pdev, 0x80U);
+          (void)USBD_LL_StallEP(pdev, 0x80U);
-          USBD_CtlReceiveStatus(pdev);
+          (void)USBD_CtlReceiveStatus(pdev);
         }
       }
     }
     else
     {
+#if 0
       if ((pdev->ep0_state == USBD_EP0_STATUS_IN) ||
           (pdev->ep0_state == USBD_EP0_IDLE))
       {
-        USBD_LL_StallEP(pdev, 0x80U);
+        (void)USBD_LL_StallEP(pdev, 0x80U);
       }
+#endif
     }
 
     if (pdev->dev_test_mode == 1U)
     {
-      USBD_RunTestMode(pdev);
+      (void)USBD_RunTestMode(pdev);
       pdev->dev_test_mode = 0U;
     }
   }
-  else if((pdev->pClass->DataIn != NULL) &&
+  else if ((pdev->pClass->DataIn != NULL) &&
            (pdev->dev_state == USBD_STATE_CONFIGURED))
   {
-    pdev->pClass->DataIn(pdev, epnum);
+    ret = (USBD_StatusTypeDef)pdev->pClass->DataIn(pdev, epnum);
+
+    if (ret != USBD_OK)
+    {
+      return ret;
+    }
   }
   else
   {
@@ -439,27 +495,28 @@ USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum,
 
 USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef *pdev)
 {
+  /* Upon Reset call user call back */
+  pdev->dev_state = USBD_STATE_DEFAULT;
+  pdev->ep0_state = USBD_EP0_IDLE;
+  pdev->dev_config = 0U;
+  pdev->dev_remote_wakeup = 0U;
+
+  if (pdev->pClassData != NULL)
+  {
+    pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  }
+
     /* Open EP0 OUT */
-  USBD_LL_OpenEP(pdev, 0x00U, USBD_EP_TYPE_CTRL, USB_MAX_EP0_SIZE);
+  (void)USBD_LL_OpenEP(pdev, 0x00U, USBD_EP_TYPE_CTRL, USB_MAX_EP0_SIZE);
   pdev->ep_out[0x00U & 0xFU].is_used = 1U;
 
   pdev->ep_out[0].maxpacket = USB_MAX_EP0_SIZE;
 
   /* Open EP0 IN */
-  USBD_LL_OpenEP(pdev, 0x80U, USBD_EP_TYPE_CTRL, USB_MAX_EP0_SIZE);
+  (void)USBD_LL_OpenEP(pdev, 0x80U, USBD_EP_TYPE_CTRL, USB_MAX_EP0_SIZE);
   pdev->ep_in[0x80U & 0xFU].is_used = 1U;
 
   pdev->ep_in[0].maxpacket = USB_MAX_EP0_SIZE;
-  /* Upon Reset call user call back */
-  pdev->dev_state = USBD_STATE_DEFAULT;
-  pdev->ep0_state = USBD_EP0_IDLE;
-  pdev->dev_config= 0U;
-  pdev->dev_remote_wakeup = 0U;
-
-  if (pdev->pClassData)
-  {
-    pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
-  }
 
   return USBD_OK;
 }
@@ -470,9 +527,11 @@ USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev)
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed)
+USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef *pdev,
+                                    USBD_SpeedTypeDef speed)
 {
   pdev->dev_speed = speed;
+
   return USBD_OK;
 }
 
@@ -487,6 +546,7 @@ USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)
 {
   pdev->dev_old_state = pdev->dev_state;
   pdev->dev_state = USBD_STATE_SUSPENDED;
+
   return USBD_OK;
 }
 
@@ -499,7 +559,11 @@ USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)
 
 USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef *pdev)
 {
+  if (pdev->dev_state == USBD_STATE_SUSPENDED)
+  {
     pdev->dev_state = pdev->dev_old_state;
+  }
+
   return USBD_OK;
 }
 
@@ -512,13 +576,14 @@ USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)
 
 USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef *pdev)
 {
-  if(pdev->dev_state == USBD_STATE_CONFIGURED)
+  if (pdev->dev_state == USBD_STATE_CONFIGURED)
   {
-    if(pdev->pClass->SOF != NULL)
+    if (pdev->pClass->SOF != NULL)
     {
       pdev->pClass->SOF(pdev);
     }
   }
+
   return USBD_OK;
 }
 
@@ -528,7 +593,8 @@ USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev)
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)
+USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef *pdev,
+                                           uint8_t epnum)
 {
   /* Prevent unused arguments compilation warning */
   UNUSED(pdev);
@@ -543,7 +609,8 @@ USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t ep
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)
+USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef *pdev,
+                                            uint8_t epnum)
 {
   /* Prevent unused arguments compilation warning */
   UNUSED(pdev);
@@ -576,7 +643,11 @@ USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev)
 {
   /* Free Class Resources */
   pdev->dev_state = USBD_STATE_DEFAULT;
+
+  if (pdev->pClass != NULL)
+  {
     pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  }
 
   return USBD_OK;
 }

Core/Src/usbd_ctlreq.c

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -35,6 +35,7 @@
 /** @defgroup USBD_REQ_Private_TypesDefinitions
   * @{
   */
+
 /**
   * @}
   */
@@ -52,6 +53,7 @@
 /** @defgroup USBD_REQ_Private_Macros
   * @{
   */
+
 /**
   * @}
   */
@@ -60,6 +62,7 @@
 /** @defgroup USBD_REQ_Private_Variables
   * @{
   */
+
 /**
   * @}
   */
@@ -68,27 +71,13 @@
 /** @defgroup USBD_REQ_Private_FunctionPrototypes
   * @{
   */
-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                               USBD_SetupReqTypedef *req);
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static USBD_StatusTypeDef USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
+static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                            USBD_SetupReqTypedef *req);
+static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static void USBD_SetConfig(USBD_HandleTypeDef *pdev ,
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_GetConfig(USBD_HandleTypeDef *pdev ,
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_GetStatus(USBD_HandleTypeDef *pdev ,
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req);
-
-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req);
-
 static uint8_t USBD_GetLen(uint8_t *buf);
 
 /**
@@ -108,7 +97,7 @@ static uint8_t USBD_GetLen(uint8_t *buf);
 * @param  req: usb request
 * @retval status
 */
-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+USBD_StatusTypeDef USBD_StdDevReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   USBD_StatusTypeDef ret = USBD_OK;
 
@@ -116,41 +105,38 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
   {
   case USB_REQ_TYPE_CLASS:
   case USB_REQ_TYPE_VENDOR:
-    pdev->pClass->Setup(pdev, req);
+    ret = (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
     break;
 
   case USB_REQ_TYPE_STANDARD:
-
     switch (req->bRequest)
     {
     case USB_REQ_GET_DESCRIPTOR:
-
+      USBD_GetDescriptor(pdev, req);
-      USBD_GetDescriptor (pdev, req);
       break;
 
     case USB_REQ_SET_ADDRESS:
-      USBD_SetAddress (pdev, req);
+      USBD_SetAddress(pdev, req);
       break;
 
     case USB_REQ_SET_CONFIGURATION:
-      USBD_SetConfig (pdev, req);
+      ret = USBD_SetConfig(pdev, req);
       break;
 
     case USB_REQ_GET_CONFIGURATION:
-      USBD_GetConfig (pdev, req);
+      USBD_GetConfig(pdev, req);
       break;
 
     case USB_REQ_GET_STATUS:
-      USBD_GetStatus (pdev, req);
+      USBD_GetStatus(pdev, req);
       break;
 
-
     case USB_REQ_SET_FEATURE:
-      USBD_SetFeature (pdev, req);
+      USBD_SetFeature(pdev, req);
       break;
 
     case USB_REQ_CLEAR_FEATURE:
-      USBD_ClrFeature (pdev, req);
+      USBD_ClrFeature(pdev, req);
       break;
 
     default:
@@ -174,7 +160,7 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 * @param  req: usb request
 * @retval status
 */
-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+USBD_StatusTypeDef USBD_StdItfReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   USBD_StatusTypeDef ret = USBD_OK;
 
@@ -191,11 +177,11 @@ USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 
       if (LOBYTE(req->wIndex) <= USBD_MAX_NUM_INTERFACES)
       {
-        ret = (USBD_StatusTypeDef)pdev->pClass->Setup (pdev, req);
+        ret = (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
 
         if ((req->wLength == 0U) && (ret == USBD_OK))
         {
-          USBD_CtlSendStatus(pdev);
+          (void)USBD_CtlSendStatus(pdev);
         }
       }
       else
@@ -215,7 +201,7 @@ USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
     break;
   }
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
@@ -225,43 +211,31 @@ USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 * @param  req: usb request
 * @retval status
 */
-USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-
+  USBD_EndpointTypeDef *pep;
   uint8_t ep_addr;
   USBD_StatusTypeDef ret = USBD_OK;
-  USBD_EndpointTypeDef   *pep;
   ep_addr = LOBYTE(req->wIndex);
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-
   case USB_REQ_TYPE_CLASS:
   case USB_REQ_TYPE_VENDOR:
-    pdev->pClass->Setup (pdev, req);
+    ret = (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
     break;
 
   case USB_REQ_TYPE_STANDARD:
-    /* Check if it is a class request */
-    if ((req->bmRequest & 0x60U) == 0x20U)
-    {
-      ret = (USBD_StatusTypeDef)pdev->pClass->Setup (pdev, req);
-
-      return ret;
-    }
-
     switch (req->bRequest)
     {
-
+    case USB_REQ_SET_FEATURE:
-    case USB_REQ_SET_FEATURE :
-
       switch (pdev->dev_state)
       {
       case USBD_STATE_ADDRESSED:
         if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
         {
-          USBD_LL_StallEP(pdev, ep_addr);
+          (void)USBD_LL_StallEP(pdev, ep_addr);
-          USBD_LL_StallEP(pdev, 0x80U);
+          (void)USBD_LL_StallEP(pdev, 0x80U);
         }
         else
         {
@@ -274,10 +248,10 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
         {
           if ((ep_addr != 0x00U) && (ep_addr != 0x80U) && (req->wLength == 0x00U))
           {
-            USBD_LL_StallEP(pdev, ep_addr);
+            (void)USBD_LL_StallEP(pdev, ep_addr);
           }
         }
-        USBD_CtlSendStatus(pdev);
+        (void)USBD_CtlSendStatus(pdev);
 
         break;
 
@@ -287,15 +261,15 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
       }
       break;
 
-    case USB_REQ_CLEAR_FEATURE :
+    case USB_REQ_CLEAR_FEATURE:
 
       switch (pdev->dev_state)
       {
       case USBD_STATE_ADDRESSED:
         if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
         {
-          USBD_LL_StallEP(pdev, ep_addr);
+          (void)USBD_LL_StallEP(pdev, ep_addr);
-          USBD_LL_StallEP(pdev, 0x80U);
+          (void)USBD_LL_StallEP(pdev, 0x80U);
         }
         else
         {
@@ -308,9 +282,10 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
         {
           if ((ep_addr & 0x7FU) != 0x00U)
           {
-            USBD_LL_ClearStallEP(pdev, ep_addr);
+            (void)USBD_LL_ClearStallEP(pdev, ep_addr);
           }
-          USBD_CtlSendStatus(pdev);
+          (void)USBD_CtlSendStatus(pdev);
+          (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
         }
         break;
 
@@ -329,16 +304,16 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
           USBD_CtlError(pdev, req);
           break;
         }
-        pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0x7FU]:\
+        pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0x7FU] : \
               &pdev->ep_out[ep_addr & 0x7FU];
 
         pep->status = 0x0000U;
 
-          USBD_CtlSendData (pdev, (uint8_t *)(void *)&pep->status, 2U);
+        (void)USBD_CtlSendData(pdev, (uint8_t *)&pep->status, 2U);
         break;
 
       case USBD_STATE_CONFIGURED:
-        if((ep_addr & 0x80U) == 0x80U)
+        if ((ep_addr & 0x80U) == 0x80U)
         {
           if (pdev->ep_in[ep_addr & 0xFU].is_used == 0U)
           {
@@ -355,14 +330,14 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
           }
         }
 
-        pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0x7FU]:\
+        pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0x7FU] : \
               &pdev->ep_out[ep_addr & 0x7FU];
 
           if ((ep_addr == 0x00U) || (ep_addr == 0x80U))
           {
             pep->status = 0x0000U;
           }
-          else if(USBD_LL_IsStallEP(pdev, ep_addr))
+          else if (USBD_LL_IsStallEP(pdev, ep_addr) != 0U)
           {
             pep->status = 0x0001U;
           }
@@ -371,7 +346,7 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
             pep->status = 0x0000U;
           }
 
-          USBD_CtlSendData (pdev, (uint8_t *)(void *)&pep->status, 2U);
+          (void)USBD_CtlSendData(pdev, (uint8_t *)&pep->status, 2U);
           break;
 
       default:
@@ -393,6 +368,8 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
 
   return ret;
 }
+
+
 /**
 * @brief  USBD_GetDescriptor
 *         Handle Get Descriptor requests
@@ -400,18 +377,25 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
 * @param  req: usb request
 * @retval status
 */
-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                               USBD_SetupReqTypedef *req)
 {
-  uint16_t len;
+  uint16_t len = 0U;
-  uint8_t *pbuf;
+  uint8_t *pbuf = NULL;
-
+  uint8_t err = 0U;
 
   switch (req->wValue >> 8)
   {
-#if (USBD_LPM_ENABLED == 1U)
+#if ((USBD_LPM_ENABLED == 1U) || (USBD_CLASS_BOS_ENABLED == 1U))
   case USB_DESC_TYPE_BOS:
+    if (pdev->pDesc->GetBOSDescriptor != NULL)
+    {
       pbuf = pdev->pDesc->GetBOSDescriptor(pdev->dev_speed, &len);
+    }
+    else
+    {
+      USBD_CtlError(pdev, req);
+      err++;
+    }
     break;
 #endif
   case USB_DESC_TYPE_DEVICE:
@@ -419,14 +403,14 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
     break;
 
   case USB_DESC_TYPE_CONFIGURATION:
-    if(pdev->dev_speed == USBD_SPEED_HIGH )
+    if (pdev->dev_speed == USBD_SPEED_HIGH)
     {
-      pbuf   = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(&len);
+      pbuf = pdev->pClass->GetHSConfigDescriptor(&len);
       pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
     }
     else
     {
-      pbuf   = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(&len);
+      pbuf = pdev->pClass->GetFSConfigDescriptor(&len);
       pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
     }
     break;
@@ -435,81 +419,159 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
     switch ((uint8_t)(req->wValue))
     {
     case USBD_IDX_LANGID_STR:
+      if (pdev->pDesc->GetLangIDStrDescriptor != NULL)
+      {
         pbuf = pdev->pDesc->GetLangIDStrDescriptor(pdev->dev_speed, &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
       break;
 
     case USBD_IDX_MFC_STR:
+      if (pdev->pDesc->GetManufacturerStrDescriptor != NULL)
+      {
         pbuf = pdev->pDesc->GetManufacturerStrDescriptor(pdev->dev_speed, &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
       break;
 
     case USBD_IDX_PRODUCT_STR:
+      if (pdev->pDesc->GetProductStrDescriptor != NULL)
+      {
         pbuf = pdev->pDesc->GetProductStrDescriptor(pdev->dev_speed, &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
       break;
 
     case USBD_IDX_SERIAL_STR:
+      if (pdev->pDesc->GetSerialStrDescriptor != NULL)
+      {
         pbuf = pdev->pDesc->GetSerialStrDescriptor(pdev->dev_speed, &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
       break;
 
     case USBD_IDX_CONFIG_STR:
+      if (pdev->pDesc->GetConfigurationStrDescriptor != NULL)
+      {
         pbuf = pdev->pDesc->GetConfigurationStrDescriptor(pdev->dev_speed, &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
       break;
 
     case USBD_IDX_INTERFACE_STR:
-      pbuf = pdev->pDesc->GetInterfaceStrDescriptor(pdev->dev_speed, &len);
+      if (pdev->pDesc->GetInterfaceStrDescriptor != NULL)
-      break;
-
-    default:
-#if (USBD_SUPPORT_USER_STRING == 1U)
-      pbuf = pdev->pClass->GetUsrStrDescriptor(pdev, (req->wValue) , &len);
-      break;
-#else
-       USBD_CtlError(pdev , req);
-      return;
-#endif
-    }
-    break;
-  case USB_DESC_TYPE_DEVICE_QUALIFIER:
-
-    if(pdev->dev_speed == USBD_SPEED_HIGH)
       {
-      pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(&len);
+        pbuf = pdev->pDesc->GetInterfaceStrDescriptor(pdev->dev_speed, &len);
-      break;
       }
       else
       {
-      USBD_CtlError(pdev , req);
+        USBD_CtlError(pdev, req);
-      return;
+        err++;
       }
+      break;
+
+    default:
+#if (USBD_SUPPORT_USER_STRING_DESC == 1U)
+      if (pdev->pClass->GetUsrStrDescriptor != NULL)
+      {
+        pbuf = pdev->pClass->GetUsrStrDescriptor(pdev, (req->wValue), &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
+#elif (USBD_CLASS_USER_STRING_DESC == 1U)
+      if (pdev->pDesc->GetUserStrDescriptor != NULL)
+      {
+        pbuf = pdev->pDesc->GetUserStrDescriptor(pdev->dev_speed, (req->wValue), &len);
+      }
+      else
+      {
+        USBD_CtlError(pdev, req);
+        err++;
+      }
+#else
+      USBD_CtlError(pdev, req);
+      err++;
+#endif
+      break;
+    }
+    break;
+
+  case USB_DESC_TYPE_DEVICE_QUALIFIER:
+    if (pdev->dev_speed == USBD_SPEED_HIGH)
+    {
+      pbuf = pdev->pClass->GetDeviceQualifierDescriptor(&len);
+    }
+    else
+    {
+      USBD_CtlError(pdev, req);
+      err++;
+    }
+    break;
 
   case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
-    if(pdev->dev_speed == USBD_SPEED_HIGH  )
+    if (pdev->dev_speed == USBD_SPEED_HIGH)
     {
-      pbuf   = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(&len);
+      pbuf = pdev->pClass->GetOtherSpeedConfigDescriptor(&len);
       pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;
-      break;
     }
     else
     {
-      USBD_CtlError(pdev , req);
+      USBD_CtlError(pdev, req);
-      return;
+      err++;
     }
+    break;
 
   default:
-     USBD_CtlError(pdev , req);
+    USBD_CtlError(pdev, req);
+    err++;
+    break;
+  }
+
+  if (err != 0U)
+  {
     return;
   }
-
+  else
-  if((len != 0U) && (req->wLength != 0U))
+  {
+    if (req->wLength != 0U)
+    {
+      if (len != 0U)
       {
-
         len = MIN(len, req->wLength);
-
+        (void)USBD_CtlSendData(pdev, pbuf, len);
-    USBD_CtlSendData (pdev, pbuf, len);
       }
-
+      else
-  if(req->wLength == 0U)
       {
-   USBD_CtlSendStatus(pdev);
+        USBD_CtlError(pdev, req);
+      }
+    }
+    else
+    {
+      (void)USBD_CtlSendStatus(pdev);
+    }
   }
 }
 
@@ -520,8 +582,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
 * @param  req: usb request
 * @retval status
 */
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
   uint8_t  dev_addr;
 
@@ -531,13 +592,13 @@ static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
 
     if (pdev->dev_state == USBD_STATE_CONFIGURED)
     {
-      USBD_CtlError(pdev , req);
+      USBD_CtlError(pdev, req);
     }
     else
     {
       pdev->dev_address = dev_addr;
-      USBD_LL_SetUSBAddress(pdev, dev_addr);
+      (void)USBD_LL_SetUSBAddress(pdev, dev_addr);
-      USBD_CtlSendStatus(pdev);
+      (void)USBD_CtlSendStatus(pdev);
 
       if (dev_addr != 0U)
       {
@@ -562,8 +623,9 @@ static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
 * @param  req: usb request
 * @retval status
 */
-static void USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+static USBD_StatusTypeDef USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
+  USBD_StatusTypeDef ret = USBD_OK;
   static uint8_t cfgidx;
 
   cfgidx = (uint8_t)(req->wValue);
@@ -571,26 +633,31 @@ static void USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   if (cfgidx > USBD_MAX_NUM_CONFIGURATION)
   {
     USBD_CtlError(pdev, req);
+    return USBD_FAIL;
   }
-  else
+
-  {
   switch (pdev->dev_state)
   {
   case USBD_STATE_ADDRESSED:
-      if (cfgidx)
+    if (cfgidx != 0U)
     {
       pdev->dev_config = cfgidx;
-        pdev->dev_state = USBD_STATE_CONFIGURED;
+
-        if(USBD_SetClassConfig(pdev, cfgidx) == USBD_FAIL)
+      ret = USBD_SetClassConfig(pdev, cfgidx);
+
+      if (ret != USBD_OK)
       {
         USBD_CtlError(pdev, req);
-          return;
-        }
-        USBD_CtlSendStatus(pdev);
       }
       else
       {
-        USBD_CtlSendStatus(pdev);
+        (void)USBD_CtlSendStatus(pdev);
+        pdev->dev_state = USBD_STATE_CONFIGURED;
+      }
+    }
+    else
+    {
+      (void)USBD_CtlSendStatus(pdev);
     }
     break;
 
@@ -599,35 +666,44 @@ static void USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     {
       pdev->dev_state = USBD_STATE_ADDRESSED;
       pdev->dev_config = cfgidx;
-        USBD_ClrClassConfig(pdev, cfgidx);
+      (void)USBD_ClrClassConfig(pdev, cfgidx);
-        USBD_CtlSendStatus(pdev);
+      (void)USBD_CtlSendStatus(pdev);
     }
     else if (cfgidx != pdev->dev_config)
     {
       /* Clear old configuration */
-        USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
+      (void)USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
 
       /* set new configuration */
       pdev->dev_config = cfgidx;
-        if(USBD_SetClassConfig(pdev, cfgidx) == USBD_FAIL)
+
+      ret = USBD_SetClassConfig(pdev, cfgidx);
+
+      if (ret != USBD_OK)
       {
         USBD_CtlError(pdev, req);
-          return;
+        (void)USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
-        }
+        pdev->dev_state = USBD_STATE_ADDRESSED;
-        USBD_CtlSendStatus(pdev);
       }
       else
       {
-        USBD_CtlSendStatus(pdev);
+        (void)USBD_CtlSendStatus(pdev);
+      }
+    }
+    else
+    {
+      (void)USBD_CtlSendStatus(pdev);
     }
     break;
 
   default:
     USBD_CtlError(pdev, req);
-      USBD_ClrClassConfig(pdev, cfgidx);
+    (void)USBD_ClrClassConfig(pdev, cfgidx);
+    ret = USBD_FAIL;
     break;
   }
-  }
+
+  return ret;
 }
 
 /**
@@ -641,7 +717,7 @@ static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   if (req->wLength != 1U)
   {
-    USBD_CtlError(pdev , req);
+    USBD_CtlError(pdev, req);
   }
   else
   {
@@ -650,15 +726,15 @@ static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     case USBD_STATE_DEFAULT:
     case USBD_STATE_ADDRESSED:
       pdev->dev_default_config = 0U;
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&pdev->dev_default_config, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&pdev->dev_default_config, 1U);
       break;
 
     case USBD_STATE_CONFIGURED:
-      USBD_CtlSendData (pdev, (uint8_t *)(void *)&pdev->dev_config, 1U);
+      (void)USBD_CtlSendData(pdev, (uint8_t *)&pdev->dev_config, 1U);
       break;
 
     default:
-      USBD_CtlError(pdev , req);
+      USBD_CtlError(pdev, req);
       break;
     }
   }
@@ -678,28 +754,28 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   case USBD_STATE_DEFAULT:
   case USBD_STATE_ADDRESSED:
   case USBD_STATE_CONFIGURED:
-    if(req->wLength != 0x2U)
+    if (req->wLength != 0x2U)
     {
       USBD_CtlError(pdev, req);
       break;
     }
 
-#if ( USBD_SELF_POWERED == 1U)
+#if (USBD_SELF_POWERED == 1U)
     pdev->dev_config_status = USB_CONFIG_SELF_POWERED;
 #else
     pdev->dev_config_status = 0U;
 #endif
 
-    if (pdev->dev_remote_wakeup)
+    if (pdev->dev_remote_wakeup != 0U)
     {
       pdev->dev_config_status |= USB_CONFIG_REMOTE_WAKEUP;
     }
 
-    USBD_CtlSendData (pdev, (uint8_t *)(void *)&pdev->dev_config_status, 2U);
+    (void)USBD_CtlSendData(pdev, (uint8_t *)&pdev->dev_config_status, 2U);
     break;
 
-  default :
+  default:
-    USBD_CtlError(pdev , req);
+    USBD_CtlError(pdev, req);
     break;
   }
 }
@@ -712,16 +788,13 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 * @param  req: usb request
 * @retval status
 */
-static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
-
   if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
   {
     pdev->dev_remote_wakeup = 1U;
-    USBD_CtlSendStatus(pdev);
+    (void)USBD_CtlSendStatus(pdev);
   }
-
 }
 
 
@@ -732,8 +805,7 @@ static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
 * @param  req: usb request
 * @retval status
 */
-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
   switch (pdev->dev_state)
   {
@@ -743,12 +815,12 @@ static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
       if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
       {
         pdev->dev_remote_wakeup = 0U;
-      USBD_CtlSendStatus(pdev);
+        (void)USBD_CtlSendStatus(pdev);
       }
       break;
 
-  default :
+    default:
-     USBD_CtlError(pdev , req);
+      USBD_CtlError(pdev, req);
       break;
   }
 }
@@ -763,12 +835,23 @@ static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
 
 void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
 {
-  req->bmRequest     = *(uint8_t *)  (pdata);
+  uint8_t *pbuff = pdata;
-  req->bRequest      = *(uint8_t *)  (pdata +  1);
-  req->wValue        = SWAPBYTE      (pdata +  2);
-  req->wIndex        = SWAPBYTE      (pdata +  4);
-  req->wLength       = SWAPBYTE      (pdata +  6);
 
+  req->bmRequest = *(uint8_t *)(pbuff);
+
+  pbuff++;
+  req->bRequest = *(uint8_t *)(pbuff);
+
+  pbuff++;
+  req->wValue = SWAPBYTE(pbuff);
+
+  pbuff++;
+  pbuff++;
+  req->wIndex = SWAPBYTE(pbuff);
+
+  pbuff++;
+  pbuff++;
+  req->wLength = SWAPBYTE(pbuff);
 }
 
 /**
@@ -779,11 +862,12 @@ void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
 * @retval None
 */
 
-void USBD_CtlError( USBD_HandleTypeDef *pdev ,
+void USBD_CtlError(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
-  USBD_LL_StallEP(pdev , 0x80U);
+  UNUSED(req);
-  USBD_LL_StallEP(pdev , 0U);
+
+  (void)USBD_LL_StallEP(pdev, 0x80U);
+  (void)USBD_LL_StallEP(pdev, 0U);
 }
 
 
@@ -798,18 +882,29 @@ void USBD_CtlError( USBD_HandleTypeDef *pdev ,
 void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)
 {
   uint8_t idx = 0U;
+  uint8_t *pdesc;
 
-  if (desc != NULL)
+  if (desc == NULL)
   {
-    *len = (uint16_t)USBD_GetLen(desc) * 2U + 2U;
+    return;
-    unicode[idx++] = *(uint8_t *)(void *)len;
-    unicode[idx++] = USB_DESC_TYPE_STRING;
-
-    while (*desc != '\0')
-    {
-      unicode[idx++] = *desc++;
-      unicode[idx++] =  0U;
   }
+
+  pdesc = desc;
+  *len = ((uint16_t)USBD_GetLen(pdesc) * 2U) + 2U;
+
+  unicode[idx] = *(uint8_t *)len;
+  idx++;
+  unicode[idx] = USB_DESC_TYPE_STRING;
+  idx++;
+
+  while (*pdesc != (uint8_t)'\0')
+  {
+    unicode[idx] = *pdesc;
+    pdesc++;
+    idx++;
+
+    unicode[idx] = 0U;
+    idx++;
   }
 }
 
@@ -822,11 +917,12 @@ void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)
 static uint8_t USBD_GetLen(uint8_t *buf)
 {
   uint8_t  len = 0U;
+  uint8_t *pbuff = buf;
 
-    while (*buf != '\0')
+  while (*pbuff != (uint8_t)'\0')
   {
     len++;
-        buf++;
+    pbuff++;
   }
 
   return len;

Core/Src/usbd_desc_template.c

@@ -3,8 +3,8 @@
   * @file    usbd_desc_template.c
   * @author  MCD Application Team
   * @brief   This file provides the USBD descriptors and string formatting method.
-  *          This template should be copied to the user folder, renamed and customized
+  *          This template should be copied to the user folder,
-  *          following user needs.
+  *          renamed and customized following user needs.
   ******************************************************************************
   * @attention
   *
@@ -14,7 +14,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -41,17 +41,23 @@
 /* Private function prototypes -----------------------------------------------*/
 uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
 uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_ManufacturerStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_ProductStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
 uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
 uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
 uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-#ifdef USB_SUPPORT_USER_STRING_DESC
+
-uint8_t *USBD_Class_USRStringDesc (USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length);
+#if (USBD_CLASS_USER_STRING_DESC == 1)
-#endif /* USB_SUPPORT_USER_STRING_DESC */
+uint8_t *USBD_Class_UserStrDescriptor(USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length);
+#endif /* USB_CLASS_USER_STRING_DESC */
+
+#if ((USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1))
+uint8_t *USBD_USR_BOSDescriptor(USBD_SpeedTypeDef speed , uint16_t *length);
+#endif
 
 /* Private variables ---------------------------------------------------------*/
-USBD_DescriptorsTypeDef Class_Desc = {
+USBD_DescriptorsTypeDef Class_Desc =
+{
   USBD_Class_DeviceDescriptor,
   USBD_Class_LangIDStrDescriptor,
   USBD_Class_ManufacturerStrDescriptor,
@@ -59,16 +65,29 @@ USBD_DescriptorsTypeDef Class_Desc = {
   USBD_Class_SerialStrDescriptor,
   USBD_Class_ConfigStrDescriptor,
   USBD_Class_InterfaceStrDescriptor,
+#if (USBD_CLASS_USER_STRING_DESC == 1)
+  USBD_CLASS_UserStrDescriptor,
+#endif
+
+#if ((USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1))
+  USBD_USR_BOSDescriptor,
+#endif
 };
 
 /* USB Standard Device Descriptor */
 #if defined ( __ICCARM__ ) /*!< IAR Compiler */
-  #pragma data_alignment=4
+#pragma data_alignment=4
 #endif
-__ALIGN_BEGIN   uint8_t USBD_DeviceDesc[USB_LEN_DEV_DESC] __ALIGN_END = {
+__ALIGN_BEGIN uint8_t USBD_DeviceDesc[USB_LEN_DEV_DESC] __ALIGN_END =
+{
   0x12,                       /* bLength */
   USB_DESC_TYPE_DEVICE,       /* bDescriptorType */
+#if ((USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1))
+  0x01,                       /*bcdUSB */     /* changed to USB version 2.01
+                                              in order to support BOS Desc */
+#else
   0x00,                       /* bcdUSB */
+#endif
   0x02,
   0x00,                       /* bDeviceClass */
   0x00,                       /* bDeviceSubClass */
@@ -86,30 +105,146 @@ __ALIGN_BEGIN   uint8_t USBD_DeviceDesc[USB_LEN_DEV_DESC] __ALIGN_END = {
   USBD_MAX_NUM_CONFIGURATION  /* bNumConfigurations */
 }; /* USB_DeviceDescriptor */
 
-/* USB Standard Device Descriptor */
+
+/* USB Device LPM BOS descriptor */
+#if (USBD_LPM_ENABLED == 1)
 #if defined ( __ICCARM__ ) /*!< IAR Compiler */
   #pragma data_alignment=4
 #endif
-__ALIGN_BEGIN   uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __ALIGN_END = {
+__ALIGN_BEGIN  uint8_t USBD_BOSDesc[USB_SIZ_BOS_DESC] __ALIGN_END =
+{
+  0x5,
+  USB_DESC_TYPE_BOS,
+  0xC,
+  0x0,
+  0x1,  /* 1 device capability */
+  /* device capability */
+  0x7,
+  USB_DEVICE_CAPABITY_TYPE,
+  0x2,
+  0x6, /*LPM capability bit set */
+  0x0,
+  0x0,
+  0x0
+};
+#endif
+
+/* USB Device Billboard BOS descriptor Template */
+#if (USBD_CLASS_BOS_ENABLED == 1)
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+  #pragma data_alignment=4
+#endif
+__ALIGN_BEGIN  uint8_t USBD_BOSDesc[USB_SIZ_BOS_DESC] __ALIGN_END =
+{
+0x05,                                /* bLength */
+USB_DESC_TYPE_BOS,                   /* Device Descriptor Type */
+USB_SIZ_BOS_DESC,                    /* Total length of BOS descriptor and all of its sub descs */
+0x00,
+0x04,                                /* The number of separate device capability descriptors in the BOS */
+
+    /* ----------- Device Capability Descriptor: CONTAINER_ID ---------- */
+0x14,                                /* bLength */
+0x10,                                /* bDescriptorType: DEVICE CAPABILITY Type */
+0x04,                                /* bDevCapabilityType: CONTAINER_ID */
+0x00,                                /* bReserved */
+0xa7, 0xd6, 0x1b, 0xfa,              /* ContainerID: This is a Unique 128-bit number GUID */
+0x91, 0xa6, 0xa8, 0x4e,
+0xa8, 0x21, 0x9f, 0x2b,
+0xaf, 0xf7, 0x94, 0xd4,
+
+    /* ----------- Device Capability Descriptor: BillBoard ---------- */
+0x34,                                /* bLength */
+0x10,                                /* bDescriptorType: DEVICE CAPABILITY Type */
+0x0D,                                /* bDevCapabilityType: BILLBOARD_CAPABILITY */
+USBD_BB_URL_STRING_INDEX,            /* iAddtionalInfoURL: Index of string descriptor providing a URL where the user can go to get more
+                                        detailed information about the product and the various Alternate Modes it supports */
+
+0x02,                                /* bNumberOfAlternateModes: Number of Alternate modes supported. The
+                                        maximum value that this field can be set to is MAX_NUM_ALT_MODE. */
+
+0x00,                                /* bPreferredAlternateMode: Index of the preferred Alternate Mode. System
+                                        software may use this information to provide the user with a better user experience. */
+
+0x00, 0x00,                          /* VCONN Power needed by the adapter for full functionality 000b = 1W */
+
+0x01,0x00,0x00,0x00,                 /* bmConfigured. 01b: Alternate Mode configuration not attempted or exited */
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,
+0x21, 0x01,                          /* bcdVersion = 0x0121 */
+0x00,                                /* bAdditionalFailureInfo */
+0x00,                                /* bReserved */
+LOBYTE(USBD_VID),
+HIBYTE(USBD_VID),                    /* wSVID[0]: Standard or Vendor ID. This shall match one of the SVIDs
+                                        returned in response to a USB PD Discover SVIDs command */
+
+0x00,                                /* bAlternateMode[0] Index of the Alternate Mode within the SVID as
+                                        returned in response to a Discover Modes command. Example:
+                                        0 <20> first Mode entry
+                                        1 <20> second mode entry */
+
+USBD_BB_ALTMODE0_STRING_INDEX,           /* iAlternateModeString[0]: Index of string descriptor describing protocol.
+                                        It is optional to support this string. */
+LOBYTE(USBD_VID),
+HIBYTE(USBD_VID),                    /* wSVID[1]: Standard or Vendor ID. This shall match one of the SVIDs
+                                        returned in response to a USB PD Discover SVIDs command */
+
+0x01,                                /* bAlternateMode[1] Index of the Alternate Mode within the SVID as
+                                        returned in response to a Discover Modes command. Example:
+                                        0 <20> first Mode entry
+                                        1 <20> second Mode entry */
+
+USBD_BB_ALTMODE1_STRING_INDEX,           /* iAlternateModeString[1]: Index of string descriptor describing protocol.
+                                        It is optional to support this string. */
+ /* Alternate Mode Desc */
+    /* ----------- Device Capability Descriptor: BillBoard Alternate Mode Desc ---------- */
+0x08,                                /* bLength */
+0x10,                                /* bDescriptorType: Device Descriptor Type */
+0x0F,                                /* bDevCapabilityType: BILLBOARD ALTERNATE MODE CAPABILITY */
+0x00,                                /* bIndex: Index of Alternate Mode described in the Billboard Capability Desc */
+0x10, 0x00, 0x00, 0x00,              /* dwAlternateModeVdo: contents of the Mode VDO for the alternate mode identified by bIndex */
+
+0x08,                                /* bLength */
+0x10,                                /* bDescriptorType: Device Descriptor Type */
+0x0F,                                /* bDevCapabilityType: BILLBOARD ALTERNATE MODE CAPABILITY */
+0x01,                                /* bIndex: Index of Alternate Mode described in the Billboard Capability Desc */
+0x20, 0x00, 0x00, 0x00,              /* dwAlternateModeVdo: contents of the Mode VDO for the alternate mode identified by bIndex */
+};
+#endif
+
+
+/* USB Standard Device Descriptor */
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif
+__ALIGN_BEGIN uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __ALIGN_END =
+{
   USB_LEN_LANGID_STR_DESC,
   USB_DESC_TYPE_STRING,
   LOBYTE(USBD_LANGID_STRING),
   HIBYTE(USBD_LANGID_STRING),
 };
 
-uint8_t USBD_StringSerial[USB_SIZ_STRING_SERIAL] =
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif
+__ALIGN_BEGIN uint8_t USBD_StringSerial[USB_SIZ_STRING_SERIAL] =
 {
   USB_SIZ_STRING_SERIAL,
   USB_DESC_TYPE_STRING,
 };
 
 #if defined ( __ICCARM__ ) /*!< IAR Compiler */
-  #pragma data_alignment=4
+#pragma data_alignment=4
 #endif
 __ALIGN_BEGIN uint8_t USBD_StrDesc[USBD_MAX_STR_DESC_SIZ] __ALIGN_END;
 
 /* Private functions ---------------------------------------------------------*/
-static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len);
+static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len);
 static void Get_SerialNum(void);
 
 /**
@@ -120,8 +255,10 @@ static void Get_SerialNum(void);
   */
 uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
+  UNUSED(speed);
+
   *length = sizeof(USBD_DeviceDesc);
-  return (uint8_t*)USBD_DeviceDesc;
+  return (uint8_t *)USBD_DeviceDesc;
 }
 
 /**
@@ -132,8 +269,10 @@ uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
   */
 uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
+  UNUSED(speed);
+
   *length = sizeof(USBD_LangIDDesc);
-  return (uint8_t*)USBD_LangIDDesc;
+  return (uint8_t *)USBD_LangIDDesc;
 }
 
 /**
@@ -144,7 +283,7 @@ uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *lengt
   */
 uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
-  if(speed == USBD_SPEED_HIGH)
+  if (speed == USBD_SPEED_HIGH)
   {
     USBD_GetString((uint8_t *)USBD_PRODUCT_HS_STRING, USBD_StrDesc, length);
   }
@@ -163,6 +302,8 @@ uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *leng
   */
 uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
+  UNUSED(speed);
+
   USBD_GetString((uint8_t *)USBD_MANUFACTURER_STRING, USBD_StrDesc, length);
   return USBD_StrDesc;
 }
@@ -175,12 +316,14 @@ uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t
   */
 uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
+  UNUSED(speed);
+
   *length = USB_SIZ_STRING_SERIAL;
 
   /* Update the serial number string descriptor with the data from the unique ID*/
   Get_SerialNum();
 
-  return (uint8_t*)USBD_StringSerial;
+  return (uint8_t *)USBD_StringSerial;
 }
 
 /**
@@ -191,7 +334,7 @@ uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *lengt
   */
 uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
-  if(speed == USBD_SPEED_HIGH)
+  if (speed == USBD_SPEED_HIGH)
   {
     USBD_GetString((uint8_t *)USBD_CONFIGURATION_HS_STRING, USBD_StrDesc, length);
   }
@@ -210,7 +353,7 @@ uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *lengt
   */
 uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
 {
-  if(speed == USBD_SPEED_HIGH)
+  if (speed == USBD_SPEED_HIGH)
   {
     USBD_GetString((uint8_t *)USBD_INTERFACE_HS_STRING, USBD_StrDesc, length);
   }
@@ -230,19 +373,53 @@ static void Get_SerialNum(void)
 {
   uint32_t deviceserial0, deviceserial1, deviceserial2;
 
-  deviceserial0 = *(uint32_t*)DEVICE_ID1;
+  deviceserial0 = *(uint32_t *)DEVICE_ID1;
-  deviceserial1 = *(uint32_t*)DEVICE_ID2;
+  deviceserial1 = *(uint32_t *)DEVICE_ID2;
-  deviceserial2 = *(uint32_t*)DEVICE_ID3;
+  deviceserial2 = *(uint32_t *)DEVICE_ID3;
 
   deviceserial0 += deviceserial2;
 
-  if (deviceserial0 != 0)
+  if (deviceserial0 != 0U)
   {
-    IntToUnicode (deviceserial0, &USBD_StringSerial[2] ,8);
+    IntToUnicode(deviceserial0, &USBD_StringSerial[2], 8U);
-    IntToUnicode (deviceserial1, &USBD_StringSerial[18] ,4);
+    IntToUnicode(deviceserial1, &USBD_StringSerial[18], 4U);
   }
 }
 
+
+#if ((USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1))
+/**
+  * @brief  USBD_USR_BOSDescriptor
+  *         return the BOS descriptor
+  * @param  speed : current device speed
+  * @param  length : pointer to data length variable
+  * @retval pointer to descriptor buffer
+  */
+uint8_t *USBD_USR_BOSDescriptor(USBD_SpeedTypeDef speed , uint16_t *length)
+{
+  *length = sizeof(USBD_BOSDesc);
+  return (uint8_t*)USBD_BOSDesc;
+}
+#endif
+
+
+#if (USBD_CLASS_USER_STRING_DESC == 1)
+/**
+  * @brief  Returns the Class User string descriptor.
+  * @param  speed: Current device speed
+  * @param  idx: index of string descriptor
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_UserStrDescriptor(USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length)
+{
+  static uint8_t USBD_StrDesc[255];
+
+  return USBD_StrDesc;
+}
+#endif
+
+
 /**
   * @brief  Convert Hex 32Bits value into char
   * @param  value: value to convert
@@ -250,24 +427,24 @@ static void Get_SerialNum(void)
   * @param  len: buffer length
   * @retval None
   */
-static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len)
+static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len)
 {
-  uint8_t idx = 0;
+  uint8_t idx = 0U;
 
-  for( idx = 0 ; idx < len ; idx ++)
+  for (idx = 0U ; idx < len ; idx ++)
   {
-    if( ((value >> 28)) < 0xA )
+    if (((value >> 28)) < 0xAU)
     {
-      pbuf[ 2* idx] = (value >> 28) + '0';
+      pbuf[ 2U * idx] = (value >> 28) + '0';
     }
     else
     {
-      pbuf[2* idx] = (value >> 28) + 'A' - 10;
+      pbuf[2U * idx] = (value >> 28) + 'A' - 10U;
     }
 
     value = value << 4;
 
-    pbuf[ 2* idx + 1] = 0;
+    pbuf[2U * idx + 1] = 0U;
   }
 }
 

Core/Src/usbd_ioreq.c

@@ -12,7 +12,7 @@
   * This software component is licensed by ST under Ultimate Liberty license
   * SLA0044, the "License"; You may not use this file except in compliance with
   * the License. You may obtain a copy of the License at:
-  *                      http://www.st.com/SLA0044
+  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -84,8 +84,8 @@
 * @param  len: length of data to be sent
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlSendData (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
+USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
-                                     uint16_t len)
+                                    uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_IN;
@@ -93,7 +93,7 @@ USBD_StatusTypeDef USBD_CtlSendData (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
   pdev->ep_in[0].rem_length = len;
 
   /* Start the transfer */
-  USBD_LL_Transmit (pdev, 0x00U, pbuf, len);
+  (void)USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
 
   return USBD_OK;
 }
@@ -106,11 +106,11 @@ USBD_StatusTypeDef USBD_CtlSendData (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
 * @param  len: length of data to be sent
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlContinueSendData (USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_CtlContinueSendData(USBD_HandleTypeDef *pdev,
-                                             uint8_t *pbuf, uint16_t len)
+                                            uint8_t *pbuf, uint32_t len)
 {
   /* Start the next transfer */
-  USBD_LL_Transmit (pdev, 0x00U, pbuf, len);
+  (void)USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
 
   return USBD_OK;
 }
@@ -123,8 +123,8 @@ USBD_StatusTypeDef USBD_CtlContinueSendData (USBD_HandleTypeDef *pdev,
 * @param  len: length of data to be received
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
+USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
-                                      uint16_t len)
+                                     uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_OUT;
@@ -132,7 +132,7 @@ USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
   pdev->ep_out[0].rem_length = len;
 
   /* Start the transfer */
-  USBD_LL_PrepareReceive (pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
@@ -145,10 +145,10 @@ USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
 * @param  len: length of data to be received
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlContinueRx (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
+USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
-                                       uint16_t len)
+                                      uint8_t *pbuf, uint32_t len)
 {
-  USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
@@ -159,13 +159,13 @@ USBD_StatusTypeDef USBD_CtlContinueRx (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlSendStatus (USBD_HandleTypeDef *pdev)
+USBD_StatusTypeDef USBD_CtlSendStatus(USBD_HandleTypeDef *pdev)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_STATUS_IN;
 
   /* Start the transfer */
-  USBD_LL_Transmit(pdev, 0x00U, NULL, 0U);
+  (void)USBD_LL_Transmit(pdev, 0x00U, NULL, 0U);
 
   return USBD_OK;
 }
@@ -176,13 +176,13 @@ USBD_StatusTypeDef USBD_CtlSendStatus (USBD_HandleTypeDef *pdev)
 * @param  pdev: device instance
 * @retval status
 */
-USBD_StatusTypeDef USBD_CtlReceiveStatus (USBD_HandleTypeDef *pdev)
+USBD_StatusTypeDef USBD_CtlReceiveStatus(USBD_HandleTypeDef *pdev)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_STATUS_OUT;
 
   /* Start the transfer */
-  USBD_LL_PrepareReceive (pdev, 0U, NULL, 0U);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
 
   return USBD_OK;
 }
@@ -194,7 +194,7 @@ USBD_StatusTypeDef USBD_CtlReceiveStatus (USBD_HandleTypeDef *pdev)
 * @param  ep_addr: endpoint address
 * @retval Rx Data blength
 */
-uint32_t USBD_GetRxCount (USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
   return USBD_LL_GetRxDataSize(pdev, ep_addr);
 }

README.md

@@ -40,6 +40,9 @@ Note that:
 USB Device | HAL |
 ---------- | ---------- |
 Tag v2.5.1 | Tag v1.10.2 ([stm32l0xx_hal_driver](https://github.com/STMicroelectronics/stm32l0xx_hal_driver))
+Tag v2.5.2 | Tag v1.4.0 ([stm32l1xx_hal_driver](https://github.com/STMicroelectronics/stm32l1xx_hal_driver))
+Tag v2.5.3 | Tag v1.7.3 ([stm32f0xx_hal_driver](https://github.com/STMicroelectronics/stm32f0xx_hal_driver))<br>Tag v1.1.4 ([stm32f1xx_hal_driver](https://github.com/STMicroelectronics/stm32f1xx_hal_driver))<br>Tag v1.2.4 ([stm32f2xx_hal_driver](https://github.com/STMicroelectronics/stm32f2xx_hal_driver))<br>Tag v1.5.3 ([stm32f3xx_hal_driver](https://github.com/STMicroelectronics/stm32f3xx_hal_driver))
+Tag v2.6.0 | Tag v1.7.8 ([stm32f4xx_hal_driver](https://github.com/STMicroelectronics/stm32f4xx_hal_driver))<br>Tag v1.2.8 ([stm32f7xx_hal_driver](https://github.com/STMicroelectronics/stm32f7xx_hal_driver))<br>Tag v1.9.0 ([stm32h7xx_hal_driver](https://github.com/STMicroelectronics/stm32h7xx_hal_driver))<br>Tag v1.12.0 ([stm32l4xx_hal_driver](https://github.com/STMicroelectronics/stm32l4xx_hal_driver))<br>Tag v1.6.0 ([stm32wbxx_hal_driver](https://github.com/STMicroelectronics/stm32wbxx_hal_driver))
 
 ## Troubleshooting
 

Release_Notes.html

@@ -923,7 +923,77 @@ ul
    <tbody><tr style="">
     <td style="padding: 0in;" valign="top">
     <h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">Update History</span></h2>
-            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V2.5.1 / 03-August-2018<br>
+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V2.6.0 / 27-December-2019</span></h3><p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main
+Changes</span></u></b><u><span style="font-size: 10pt; font-family: Verdana; color: black;"><o:p></o:p></span></u></p>
+
+
+
+
+
+
+
+
+
+
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            <ul style="margin-top: 0cm;" type="square"><li>Integration of three new USB device Class drivers:</li><ul><li>USB CDC ECM Class driver</li><li>USB CDC RNDIS Microsoft Class driver</li><li>USB Billboard Class driver</li></ul><li>Fix mondatory misra-c 2012 violations</li><li>update user core and class template files</li><li>USB Core:</li><ul><li>Fix unexpected EP0 stall during enumeration phase&nbsp;</li><li>Improve APIs error&nbsp;management and prevent accessing NULL pointers</li></ul><li>USB MSC Class:</li><ul><li>Fix USBCV specific class tests</li><li>Fix mutliple error with SCSI commands handling</li><li>Protect medium access when host ask for medium ejection</li></ul><li>USB CDC Class:</li><ul><li>Add new function to inform user that current IN transfer is completed</li><li>update transmit and receive APIs to transfer up to 64KB</li></ul></ul><ul style="margin-top: 0cm;" type="square"><li>USB AUDIO Class:</li><ul><li>Fix audio sync start buffer size</li><li>update user callback periodicTC args by adding pointer to user buffer and size</li></ul><li>USB CustomHID Class:</li><ul><li>Rework the OUT transfer complete and prevent automaticly re-enabling the OUT EP&nbsp;</li><li>Add new user API to restart the OUT transfer: USBD_CUSTOM_HID_ReceivePacket()</li></ul></ul><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V2.5.3 / 30-April-2019</span></h3><p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main
+Changes</span></u></b><u><span style="font-size: 10pt; font-family: Verdana; color: black;"><o:p></o:p></span></u></p>
+
+
+
+
+
+
+
+
+
+
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            <ul style="margin-top: 0cm;" type="square"><li>Fix misra-c 2012 high severity violations</li><li>Core driver:</li><ul><li>protect shared macros __ALIGN_BEGIN, __ALIGN_END with C directive #ifndef</li><li>update Core driver and DFU Class driver to use&nbsp;USBD_SUPPORT_USER_STRING_DESC insead of &nbsp;USBD_SUPPORT_USER_STRING</li><li>&nbsp;prevent accessing to NULL pointer if the get descriptor functions are not defined</li><li>Update on USBD_LL_Resume(),&nbsp; restore the device state only if the current state is USBD_STATE_SUSPENDED </li></ul></ul><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V2.5.2 / 27-Mars-2019</span></h3><p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main
+Changes</span></u></b><u><span style="font-size: 10pt; font-family: Verdana; color: black;"><o:p></o:p></span></u></p>
+
+
+
+
+
+
+
+
+
+
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            <ul style="margin-top: 0cm;" type="square"><li><span style="font-family: Verdana; font-size: 10pt;">DFU Class:</span></li><ul><li><span style="font-family: Verdana; font-size: 10pt;"></span><span style="font-size: 10pt; font-family: &quot;Verdana&quot;,sans-serif;" lang="EN-US"></span><span style="font-family: Verdana; font-size: 10pt;"></span>fix compilation warning due to&nbsp;<span style="font-size: 11pt; font-family: &quot;Calibri&quot;,sans-serif;" lang="EN-US">unreachable
+</span> instruction code introduced with CMSIS V5.4.0 NVIC_SystemReset() prototype change</li></ul></ul><h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 180px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V2.5.1 / 03-August-2018<br>
 </span></h3>