Release v2.8.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
   *
   ******************************************************************************
   */
@@ -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
@@ -116,8 +127,7 @@ typedef enum
   AUDIO_OFFSET_HALF,
   AUDIO_OFFSET_FULL,
   AUDIO_OFFSET_UNKNOWN,
-}
-AUDIO_OffsetTypeDef;
+} AUDIO_OffsetTypeDef;
 /**
   * @}
   */
@@ -132,9 +142,7 @@ AUDIO_OffsetTypeDef;
   uint8_t data[USB_MAX_EP0_SIZE];
   uint8_t len;
   uint8_t unit;
-}
-USBD_AUDIO_ControlTypeDef;
-
+} USBD_AUDIO_ControlTypeDef;
 
 
 typedef struct
@@ -146,8 +154,7 @@ typedef struct
   uint16_t rd_ptr;
   uint16_t wr_ptr;
   USBD_AUDIO_ControlTypeDef control;
-}
-USBD_AUDIO_HandleTypeDef;
+} USBD_AUDIO_HandleTypeDef;
 
 
 typedef struct
@@ -157,7 +164,7 @@ typedef struct
   int8_t (*AudioCmd)(uint8_t *pbuf, uint32_t size, uint8_t cmd);
   int8_t (*VolumeCtl)(uint8_t vol);
   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);
 } USBD_AUDIO_ItfTypeDef;
 /**

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

Class/AUDIO/Src/usbd_audio.c

@@ -48,7 +48,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
   *
   ******************************************************************************
   */
@@ -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_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_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_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 void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
 static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
 
 /**
@@ -173,13 +157,17 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   /* Configuration 1 */
   0x09,                                 /* bLength */
   USB_DESC_TYPE_CONFIGURATION,          /* bDescriptorType */
-  LOBYTE(USB_AUDIO_CONFIG_DESC_SIZ),    /* wTotalLength  109 bytes*/
+  LOBYTE(USB_AUDIO_CONFIG_DESC_SIZ),    /* wTotalLength */
   HIBYTE(USB_AUDIO_CONFIG_DESC_SIZ),
   0x02,                                 /* bNumInterfaces */
   0x01,                                 /* bConfigurationValue */
   0x00,                                 /* iConfiguration */
-  0xC0,                                 /* bmAttributes  BUS Powred*/
-  0x32,                                 /* bMaxPower = 100 mA*/
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                 /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                 /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                       /* MaxPower (mA) */
   /* 09 byte*/
 
   /* USB Speaker Standard interface descriptor */
@@ -200,7 +188,7 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   AUDIO_CONTROL_HEADER,                 /* bDescriptorSubtype */
   0x00,          /* 1.00 */             /* bcdADC */
   0x01,
-  0x27,                                 /* wTotalLength = 39*/
+  0x27,                                 /* wTotalLength */
   0x00,
   0x01,                                 /* bInCollection */
   0x01,                                 /* baInterfaceNr */
@@ -245,7 +233,7 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   0x00,                                 /* iTerminal */
   /* 09 byte */
 
-  /* USB Speaker Standard AS Interface Descriptor - Audio Streaming Zero Bandwith */
+  /* USB Speaker Standard AS Interface Descriptor - Audio Streaming Zero Bandwidth */
   /* Interface 1, Alternate Setting 0                                              */
   AUDIO_INTERFACE_DESC_SIZE,            /* bLength */
   USB_DESC_TYPE_INTERFACE,              /* bDescriptorType */
@@ -299,7 +287,7 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALI
   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*/
@@ -347,22 +335,33 @@ __ALIGN_BEGIN static uint8_t USBD_AUDIO_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIE
   */
 static uint8_t USBD_AUDIO_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
   USBD_AUDIO_HandleTypeDef *haudio;
 
+  /* Allocate Audio structure */
+  haudio = (USBD_AUDIO_HandleTypeDef *)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 +371,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 +390,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,
-                                 uint8_t cfgidx)
+static uint8_t USBD_AUDIO_DeInit(USBD_HandleTypeDef *pdev, 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)
   {
     ((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;
 }
 
 /**
@@ -424,10 +424,15 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
   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;
 
+  if (haudio == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
     case USB_REQ_TYPE_CLASS:
@@ -454,7 +459,7 @@ 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
           {
@@ -469,14 +474,14 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
             pbuf = USBD_AUDIO_CfgDesc + 18;
             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:
           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
           {
@@ -494,7 +499,7 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
             }
             else
             {
-           /* Call the error management function (command will be nacked */
+              /* Call the error management function (command will be NAKed */
               USBD_CtlError(pdev, req);
               ret = USBD_FAIL;
             }
@@ -506,6 +511,9 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
           }
           break;
 
+        case USB_REQ_CLEAR_FEATURE:
+          break;
+
         default:
           USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
@@ -518,7 +526,7 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 
@@ -531,7 +539,8 @@ static uint8_t  USBD_AUDIO_Setup (USBD_HandleTypeDef *pdev,
   */
 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 +551,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,
-                              uint8_t epnum)
+static uint8_t USBD_AUDIO_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  UNUSED(pdev);
+  UNUSED(epnum);
 
   /* Only OUT data are processed */
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -561,8 +571,14 @@ static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev)
   USBD_AUDIO_HandleTypeDef *haudio;
   haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
+  if (haudio == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   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 +588,7 @@ static uint8_t  USBD_AUDIO_EP0_RxReady (USBD_HandleTypeDef *pdev)
     }
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_AUDIO_EP0_TxReady
@@ -582,8 +598,10 @@ static uint8_t  USBD_AUDIO_EP0_RxReady (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
@@ -593,7 +611,9 @@ static uint8_t  USBD_AUDIO_EP0_TxReady (USBD_HandleTypeDef *pdev)
   */
 static uint8_t USBD_AUDIO_SOF(USBD_HandleTypeDef *pdev)
 {
-  return USBD_OK;
+  UNUSED(pdev);
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -604,15 +624,21 @@ static uint8_t  USBD_AUDIO_SOF (USBD_HandleTypeDef *pdev)
   */
 void USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
 {
-  uint32_t cmd = 0U;
   USBD_AUDIO_HandleTypeDef *haudio;
+  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)
   {
-    haudio->rd_ptr += (uint16_t)(AUDIO_TOTAL_BUF_SIZE / 2U);
+    haudio->rd_ptr += (uint16_t)BufferSize;
 
     if (haudio->rd_ptr == AUDIO_TOTAL_BUF_SIZE)
     {
@@ -625,13 +651,13 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
   {
     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))
       {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U - 4U;
+        BufferSize -= 4U;
       }
     }
   }
@@ -639,13 +665,13 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
   {
     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))
       {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U + 4U;
+        BufferSize += 4U;
       }
     }
   }
@@ -653,8 +679,7 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
   if (haudio->offset == AUDIO_OFFSET_FULL)
   {
     ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->AudioCmd(&haudio->buffer[0],
-                                                         cmd,
-                                                         AUDIO_CMD_PLAY);
+                                                         BufferSize, AUDIO_CMD_PLAY);
     haudio->offset = AUDIO_OFFSET_NONE;
   }
 }
@@ -668,8 +693,10 @@ void  USBD_AUDIO_Sync (USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
   */
 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
@@ -680,8 +707,10 @@ static uint8_t  USBD_AUDIO_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t ep
   */
 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,17 +719,29 @@ 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,
-                              uint8_t epnum)
+static uint8_t USBD_AUDIO_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  uint16_t PacketSize;
   USBD_AUDIO_HandleTypeDef *haudio;
+
   haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
+  if (haudio == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   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)
     {
@@ -725,11 +766,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;
 }
 
 /**
@@ -744,10 +786,16 @@ static void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
   USBD_AUDIO_HandleTypeDef *haudio;
   haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
-  memset(haudio->control.data, 0, 64U);
+  if (haudio == NULL)
+  {
+    return;
+  }
+
+  (void)USBD_memset(haudio->control.data, 0, USB_MAX_EP0_SIZE);
 
   /* Send the current mute state */
-  USBD_CtlSendData (pdev, haudio->control.data, req->wLength);
+  (void)USBD_CtlSendData(pdev, haudio->control.data,
+                         MIN(req->wLength, USB_MAX_EP0_SIZE));
 }
 
 /**
@@ -762,16 +810,19 @@ static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
   USBD_AUDIO_HandleTypeDef *haudio;
   haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
 
-  if (req->wLength)
+  if (haudio == NULL)
   {
-    /* Prepare the reception of the buffer over EP0 */
-    USBD_CtlPrepareRx (pdev,
-                       haudio->control.data,
-                       req->wLength);
+    return;
+  }
 
+  if (req->wLength != 0U)
+  {
     haudio->control.cmd = AUDIO_REQ_SET_CUR;     /* Set the request value */
-    haudio->control.len = (uint8_t)req->wLength; /* Set the request data length */
+    haudio->control.len = (uint8_t)MIN(req->wLength, USB_MAX_EP0_SIZE);  /* Set the request data length */
     haudio->control.unit = HIBYTE(req->wIndex);  /* Set the request target unit */
+
+    /* Prepare the reception of the buffer over EP0 */
+    (void)USBD_CtlPrepareRx(pdev, haudio->control.data, haudio->control.len);
   }
 }
 
@@ -784,7 +835,8 @@ static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
   */
 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;
 }
 
@@ -796,11 +848,14 @@ static uint8_t  *USBD_AUDIO_GetDeviceQualifierDesc (uint16_t *length)
 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,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
   *
   ******************************************************************************
   */
@@ -70,7 +70,7 @@ 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_VolumeCtl(uint8_t vol);
 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);
 
 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
   */
@@ -125,6 +131,9 @@ static int8_t TEMPLATE_DeInit(uint32_t options)
   */
 static int8_t TEMPLATE_AudioCmd(uint8_t *pbuf, uint32_t size, uint8_t cmd)
 {
+  UNUSED(pbuf);
+  UNUSED(size);
+  UNUSED(cmd);
 
   return (0);
 }
@@ -136,6 +145,7 @@ static int8_t TEMPLATE_AudioCmd (uint8_t* pbuf, uint32_t size, uint8_t cmd)
   */
 static int8_t TEMPLATE_VolumeCtl(uint8_t vol)
 {
+  UNUSED(vol);
 
   return (0);
 }
@@ -147,6 +157,7 @@ static int8_t TEMPLATE_VolumeCtl (uint8_t vol)
   */
 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);
 }
@@ -169,7 +183,6 @@ static int8_t TEMPLATE_PeriodicTC (uint8_t cmd)
   */
 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,504 @@
+/**
+  ******************************************************************************
+  * @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 */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                        /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                        /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,              /* MaxPower (mA) */
+  /* 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: Configuration 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 */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                        /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                        /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,              /* MaxPower (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 *)(void *)pbuf;
+
+  *ptr += pnext->bLength;
+  pnext = (USBD_BB_DescHeader_t *)(void *)(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 *)(void *)pBosDesc;
+  USBD_BosDescTypedef *desc = (USBD_BosDescTypedef *)(void *)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 *)(void *)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 *)(void *)pBosDesc;
+  USBD_BosDescTypedef *desc = (USBD_BosDescTypedef *)(void *)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 *)(void *)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
   *
   ******************************************************************************
   */
@@ -65,6 +65,7 @@
 #define CDC_DATA_FS_IN_PACKET_SIZE                  CDC_DATA_FS_MAX_PACKET_SIZE
 #define CDC_DATA_FS_OUT_PACKET_SIZE                 CDC_DATA_FS_MAX_PACKET_SIZE
 
+#define CDC_REQ_MAX_DATA_SIZE                       0x7U
 /*---------------------------------------------------------------------*/
 /*  CDC definitions                                                    */
 /*---------------------------------------------------------------------*/
@@ -104,13 +105,13 @@ typedef struct _USBD_CDC_Itf
   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);
 } USBD_CDC_ItfTypeDef;
 
 
 typedef struct
 {
-  uint32_t data[CDC_DATA_HS_MAX_PACKET_SIZE / 4U];      /* Force 32bits alignment */
+  uint32_t data[CDC_DATA_HS_MAX_PACKET_SIZE / 4U];      /* Force 32-bit alignment */
   uint8_t  CmdOpCode;
   uint8_t  CmdLength;
   uint8_t  *RxBuffer;
@@ -120,8 +121,7 @@ typedef struct
 
   __IO uint32_t TxState;
   __IO uint32_t RxState;
-}
-USBD_CDC_HandleTypeDef;
+} USBD_CDC_HandleTypeDef;
 
 
 
@@ -149,15 +149,11 @@ extern USBD_ClassTypeDef  USBD_CDC;
 uint8_t USBD_CDC_RegisterInterface(USBD_HandleTypeDef *pdev,
                                    USBD_CDC_ItfTypeDef *fops);
 
-uint8_t  USBD_CDC_SetTxBuffer        (USBD_HandleTypeDef   *pdev,
-                                      uint8_t  *pbuff,
-                                      uint16_t length);
-
-uint8_t  USBD_CDC_SetRxBuffer        (USBD_HandleTypeDef   *pdev,
-                                      uint8_t  *pbuff);
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
+                             uint32_t length);
 
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
 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
   *
   ******************************************************************************
   */

Class/CDC/Src/usbd_cdc.c

@@ -45,7 +45,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
   *
   ******************************************************************************
   */
@@ -99,32 +99,17 @@
   * @{
   */
 
-
-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_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_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 */
@@ -157,7 +142,7 @@ USBD_ClassTypeDef  USBD_CDC =
   USBD_CDC_Init,
   USBD_CDC_DeInit,
   USBD_CDC_Setup,
-  NULL,                 /* EP0_TxSent, */
+  NULL,                 /* EP0_TxSent */
   USBD_CDC_EP0_RxReady,
   USBD_CDC_DataIn,
   USBD_CDC_DataOut,
@@ -171,32 +156,35 @@ 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 */
   0x09,                                       /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                /* bDescriptorType: Configuration */
   USB_CDC_CONFIG_DESC_SIZ,                    /* wTotalLength:no of returned bytes */
   0x00,
-  0x02,   /* bNumInterfaces: 2 interface */
+  0x02,                                       /* bNumInterfaces: 2 interfaces */
   0x01,                                       /* bConfigurationValue: Configuration value */
   0x00,                                       /* iConfiguration: Index of string descriptor describing the configuration */
-  0xC0,   /* bmAttributes: self powered */
-  0x32,   /* MaxPower 0 mA */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                       /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                       /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                             /* MaxPower (mA) */
 
   /*---------------------------------------------------------------------------*/
 
   /* Interface Descriptor */
   0x09,                                       /* bLength: Interface Descriptor size */
   USB_DESC_TYPE_INTERFACE,                    /* bDescriptorType: Interface */
-  /* Interface descriptor type */
   0x00,                                       /* bInterfaceNumber: Number of Interface */
   0x00,                                       /* bAlternateSetting: Alternate setting */
   0x01,                                       /* bNumEndpoints: One endpoints used */
   0x02,                                       /* bInterfaceClass: Communication Interface Class */
   0x02,                                       /* bInterfaceSubClass: Abstract Control Model */
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
-  0x00,   /* iInterface: */
+  0x00,                                       /* iInterface */
 
   /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
@@ -230,9 +218,9 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
   0x03,                                       /* bmAttributes: Interrupt */
-  LOBYTE(CDC_CMD_PACKET_SIZE),     /* wMaxPacketSize: */
+  LOBYTE(CDC_CMD_PACKET_SIZE),                /* wMaxPacketSize */
   HIBYTE(CDC_CMD_PACKET_SIZE),
-  CDC_HS_BINTERVAL,                           /* bInterval: */
+  CDC_HS_BINTERVAL,                           /* bInterval */
   /*---------------------------------------------------------------------------*/
 
   /* Data class interface descriptor */
@@ -242,43 +230,47 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgHSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x00,                                       /* bAlternateSetting: Alternate setting */
   0x02,                                       /* bNumEndpoints: Two endpoints used */
   0x0A,                                       /* bInterfaceClass: CDC */
-  0x00,   /* bInterfaceSubClass: */
-  0x00,   /* bInterfaceProtocol: */
-  0x00,   /* iInterface: */
+  0x00,                                       /* bInterfaceSubClass */
+  0x00,                                       /* bInterfaceProtocol */
+  0x00,                                       /* iInterface */
 
   /* Endpoint OUT Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_OUT_EP,                                 /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),  /* wMaxPacketSize: */
+  LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),        /* wMaxPacketSize */
   HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
-  0x00,                              /* bInterval: ignore for Bulk transfer */
+  0x00,                                       /* bInterval */
 
   /* Endpoint IN Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_IN_EP,                                  /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),  /* wMaxPacketSize: */
+  LOBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),        /* wMaxPacketSize */
   HIBYTE(CDC_DATA_HS_MAX_PACKET_SIZE),
-  0x00                               /* bInterval: ignore for Bulk transfer */
+  0x00                                        /* bInterval */
 };
 
 
 /* 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 */
   0x09,                                       /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                /* bDescriptorType: Configuration */
-  USB_CDC_CONFIG_DESC_SIZ,                /* wTotalLength:no of returned bytes */
+  USB_CDC_CONFIG_DESC_SIZ,                    /* wTotalLength */
   0x00,
-  0x02,   /* bNumInterfaces: 2 interface */
+  0x02,                                       /* bNumInterfaces: 2 interfaces */
   0x01,                                       /* bConfigurationValue: Configuration value */
   0x00,                                       /* iConfiguration: Index of string descriptor describing the configuration */
-  0xC0,   /* bmAttributes: self powered */
-  0x32,   /* MaxPower 0 mA */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                       /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                       /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                             /* MaxPower (mA) */
 
   /*---------------------------------------------------------------------------*/
 
@@ -288,11 +280,11 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   /* Interface descriptor type */
   0x00,                                       /* bInterfaceNumber: Number of Interface */
   0x00,                                       /* bAlternateSetting: Alternate setting */
-  0x01,   /* bNumEndpoints: One endpoints used */
+  0x01,                                       /* bNumEndpoints: One endpoint used */
   0x02,                                       /* bInterfaceClass: Communication Interface Class */
   0x02,                                       /* bInterfaceSubClass: Abstract Control Model */
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
-  0x00,   /* iInterface: */
+  0x00,                                       /* iInterface */
 
   /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
@@ -306,7 +298,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x01,                                       /* bDescriptorSubtype: Call Management Func Desc */
   0x00,                                       /* bmCapabilities: D0+D1 */
-  0x01,   /* bDataInterface: 1 */
+  0x01,                                       /* bDataInterface */
 
   /* ACM Functional Descriptor */
   0x04,                                       /* bFunctionLength */
@@ -326,9 +318,9 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
   0x03,                                       /* bmAttributes: Interrupt */
-  LOBYTE(CDC_CMD_PACKET_SIZE),     /* wMaxPacketSize: */
+  LOBYTE(CDC_CMD_PACKET_SIZE),                /* wMaxPacketSize */
   HIBYTE(CDC_CMD_PACKET_SIZE),
-  CDC_FS_BINTERVAL,                           /* bInterval: */
+  CDC_FS_BINTERVAL,                           /* bInterval */
   /*---------------------------------------------------------------------------*/
 
   /* Data class interface descriptor */
@@ -338,40 +330,44 @@ __ALIGN_BEGIN uint8_t USBD_CDC_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIGN_END =
   0x00,                                       /* bAlternateSetting: Alternate setting */
   0x02,                                       /* bNumEndpoints: Two endpoints used */
   0x0A,                                       /* bInterfaceClass: CDC */
-  0x00,   /* bInterfaceSubClass: */
-  0x00,   /* bInterfaceProtocol: */
-  0x00,   /* iInterface: */
+  0x00,                                       /* bInterfaceSubClass */
+  0x00,                                       /* bInterfaceProtocol */
+  0x00,                                       /* iInterface */
 
   /* Endpoint OUT Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_OUT_EP,                                 /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),  /* wMaxPacketSize: */
+  LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),        /* wMaxPacketSize */
   HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
-  0x00,                              /* bInterval: ignore for Bulk transfer */
+  0x00,                                       /* bInterval */
 
   /* Endpoint IN Descriptor */
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_IN_EP,                                  /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),  /* wMaxPacketSize: */
+  LOBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),        /* wMaxPacketSize */
   HIBYTE(CDC_DATA_FS_MAX_PACKET_SIZE),
-  0x00                               /* bInterval: ignore for Bulk transfer */
+  0x00                                        /* bInterval */
 };
 
-__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 */
+  0x09,                                       /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
   USB_CDC_CONFIG_DESC_SIZ,
   0x00,
   0x02,                                       /* bNumInterfaces: 2 interfaces */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
+  0x01,                                       /* bConfigurationValue */
+  0x04,                                       /* iConfiguration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                       /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                       /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                             /* MaxPower (mA) */
 
   /* Interface Descriptor */
   0x09,                                       /* bLength: Interface Descriptor size */
@@ -383,7 +379,7 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   0x02,                                       /* bInterfaceClass: Communication Interface Class */
   0x02,                                       /* bInterfaceSubClass: Abstract Control Model */
   0x01,                                       /* bInterfaceProtocol: Common AT commands */
-  0x00,   /* iInterface: */
+  0x00,                                       /* iInterface */
 
   /* Header Functional Descriptor */
   0x05,                                       /* bLength: Endpoint Descriptor size */
@@ -396,8 +392,8 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   0x05,                                       /* bFunctionLength */
   0x24,                                       /* bDescriptorType: CS_INTERFACE */
   0x01,                                       /* bDescriptorSubtype: Call Management Func Desc */
-  0x00,   /* bmCapabilities: D0+D1 */
-  0x01,   /* bDataInterface: 1 */
+  0x00,                                       /* bmCapabilities */
+  0x01,                                       /* bDataInterface */
 
   /* ACM Functional Descriptor */
   0x04,                                       /* bFunctionLength */
@@ -417,9 +413,9 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_CMD_EP,                                 /* bEndpointAddress */
   0x03,                                       /* bmAttributes: Interrupt */
-  LOBYTE(CDC_CMD_PACKET_SIZE),     /* wMaxPacketSize: */
+  LOBYTE(CDC_CMD_PACKET_SIZE),                /* wMaxPacketSize */
   HIBYTE(CDC_CMD_PACKET_SIZE),
-  CDC_FS_BINTERVAL,                           /* bInterval: */
+  CDC_FS_BINTERVAL,                           /* bInterval */
 
   /*---------------------------------------------------------------------------*/
 
@@ -430,25 +426,25 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   0x00,                                       /* bAlternateSetting: Alternate setting */
   0x02,                                       /* bNumEndpoints: Two endpoints used */
   0x0A,                                       /* bInterfaceClass: CDC */
-  0x00,   /* bInterfaceSubClass: */
-  0x00,   /* bInterfaceProtocol: */
-  0x00,   /* iInterface: */
+  0x00,                                       /* bInterfaceSubClass */
+  0x00,                                       /* bInterfaceProtocol */
+  0x00,                                       /* iInterface */
 
   /*Endpoint OUT Descriptor*/
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_OUT_EP,                                 /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  0x40,                              /* wMaxPacketSize: */
+  0x40,                                       /* wMaxPacketSize */
   0x00,
-  0x00,                              /* bInterval: ignore for Bulk transfer */
+  0x00,                                       /* bInterval */
 
   /*Endpoint IN Descriptor*/
   0x07,                                       /* bLength: Endpoint Descriptor size */
   USB_DESC_TYPE_ENDPOINT,                     /* bDescriptorType: Endpoint */
   CDC_IN_EP,                                  /* bEndpointAddress */
   0x02,                                       /* bmAttributes: Bulk */
-  0x40,                             /* wMaxPacketSize: */
+  0x40,                                       /* wMaxPacketSize */
   0x00,
   0x00                                        /* bInterval */
 };
@@ -470,52 +466,58 @@ __ALIGN_BEGIN uint8_t USBD_CDC_OtherSpeedCfgDesc[USB_CDC_CONFIG_DESC_SIZ] __ALIG
   */
 static uint8_t USBD_CDC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  uint8_t ret = 0U;
+  UNUSED(cfgidx);
   USBD_CDC_HandleTypeDef *hcdc;
 
+  hcdc = (USBD_CDC_HandleTypeDef *)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();
 
@@ -526,17 +528,17 @@ static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   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;
 }
 
 /**
@@ -548,29 +550,30 @@ static uint8_t  USBD_CDC_Init (USBD_HandleTypeDef *pdev, uint8_t cfgidx)
   */
 static uint8_t USBD_CDC_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  uint8_t ret = 0U;
+  UNUSED(cfgidx);
 
   /* 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)
   {
     ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->DeInit();
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
 
-  return ret;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -584,35 +587,42 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
                               USBD_SetupReqTypedef *req)
 {
   USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
+  uint16_t len;
   uint8_t ifalt = 0U;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
+
+  if (hcdc == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
     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);
+          len = MIN(CDC_REQ_MAX_DATA_SIZE, req->wLength);
+          (void)USBD_CtlSendData(pdev, (uint8_t *)hcdc->data, len);
         }
         else
         {
           hcdc->CmdOpCode = req->bRequest;
-        hcdc->CmdLength = (uint8_t)req->wLength;
+          hcdc->CmdLength = (uint8_t)MIN(req->wLength, USB_MAX_EP0_SIZE);
 
-        USBD_CtlPrepareRx (pdev, (uint8_t *)(void *)hcdc->data, req->wLength);
+          (void)USBD_CtlPrepareRx(pdev, (uint8_t *)hcdc->data, hcdc->CmdLength);
         }
       }
       else
       {
         ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->Control(req->bRequest,
-                                                        (uint8_t *)(void *)req, 0U);
+                                                          (uint8_t *)req, 0U);
       }
       break;
 
@@ -622,7 +632,7 @@ 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
           {
@@ -634,7 +644,7 @@ 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
           {
@@ -651,6 +661,9 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
           }
           break;
 
+        case USB_REQ_CLEAR_FEATURE:
+          break;
+
         default:
           USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
@@ -664,7 +677,7 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -676,31 +689,38 @@ static uint8_t  USBD_CDC_Setup (USBD_HandleTypeDef *pdev,
   */
 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;
-    }
-    return USBD_OK;
-  }
-  else
+
+    if (((USBD_CDC_ItfTypeDef *)pdev->pUserData)->TransmitCplt != NULL)
     {
-    return USBD_FAIL;
+      ((USBD_CDC_ItfTypeDef *)pdev->pUserData)->TransmitCplt(hcdc->TxBuffer, &hcdc->TxLength, epnum);
     }
   }
 
+  return (uint8_t)USBD_OK;
+}
+
 /**
   * @brief  USBD_CDC_DataOut
   *         Data received on non-control Out endpoint
@@ -712,21 +732,20 @@ static uint8_t  USBD_CDC_DataOut (USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
   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);
 
   /* 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;
-  }
-  else
-  {
-    return USBD_FAIL;
-  }
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -739,15 +758,20 @@ static uint8_t  USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev)
 {
   USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
+  if (hcdc == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   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;
 }
 
 /**
@@ -759,7 +783,8 @@ static uint8_t  USBD_CDC_EP0_RxReady (USBD_HandleTypeDef *pdev)
   */
 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;
 }
 
@@ -772,12 +797,13 @@ static uint8_t  *USBD_CDC_GetFSCfgDesc (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;
 }
 
 /**
-  * @brief  USBD_CDC_GetCfgDesc
+  * @brief  USBD_CDC_GetOtherSpeedCfgDesc
   *         Return configuration descriptor
   * @param  speed : current device speed
   * @param  length : pointer data length
@@ -785,19 +811,21 @@ static uint8_t  *USBD_CDC_GetHSCfgDesc (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;
 }
 
 /**
-* @brief  DeviceQualifierDescriptor
+  * @brief  USBD_CDC_GetDeviceQualifierDescriptor
   *         return Device Qualifier descriptor
   * @param  length : pointer data length
   * @retval pointer to descriptor buffer
   */
 uint8_t *USBD_CDC_GetDeviceQualifierDescriptor(uint16_t *length)
 {
-  *length = sizeof (USBD_CDC_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_CDC_DeviceQualifierDesc);
+
   return USBD_CDC_DeviceQualifierDesc;
 }
 
@@ -810,15 +838,14 @@ uint8_t  *USBD_CDC_GetDeviceQualifierDescriptor (uint16_t *length)
 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;
-    ret = USBD_OK;
+    return (uint8_t)USBD_FAIL;
   }
 
-  return ret;
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -828,32 +855,39 @@ uint8_t  USBD_CDC_RegisterInterface  (USBD_HandleTypeDef   *pdev,
   * @retval status
   */
 uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev,
-                                uint8_t  *pbuff,
-                                uint16_t length)
+                             uint8_t *pbuff, uint32_t length)
 {
   USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
+  if (hcdc == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   hcdc->TxBuffer = pbuff;
   hcdc->TxLength = length;
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
-
 /**
   * @brief  USBD_CDC_SetRxBuffer
   * @param  pdev: device instance
   * @param  pbuff: Rx Buffer
   * @retval status
   */
-uint8_t  USBD_CDC_SetRxBuffer  (USBD_HandleTypeDef   *pdev,
-                                   uint8_t  *pbuff)
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff)
 {
   USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
+  if (hcdc == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   hcdc->RxBuffer = pbuff;
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -865,9 +899,13 @@ 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_StatusTypeDef ret = USBD_BUSY;
 
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData == NULL)
   {
+    return (uint8_t)USBD_FAIL;
+  }
+
   if (hcdc->TxState == 0U)
   {
     /* Tx Transfer in progress */
@@ -877,22 +915,13 @@ 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,
-                       (uint16_t)hcdc->TxLength);
+    (void)USBD_LL_Transmit(pdev, CDC_IN_EP, hcdc->TxBuffer, hcdc->TxLength);
 
-      return USBD_OK;
-    }
-    else
-    {
-      return USBD_BUSY;
-    }
-  }
-  else
-  {
-    return USBD_FAIL;
-  }
+    ret = USBD_OK;
   }
 
+  return (uint8_t)ret;
+}
 
 /**
   * @brief  USBD_CDC_ReceivePacket
@@ -904,31 +933,25 @@ uint8_t  USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev)
 {
   USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef *)pdev->pClassData;
 
-  /* Suspend or Resume USB Out process */
-  if(pdev->pClassData != NULL)
+  if (pdev->pClassData == NULL)
   {
+    return (uint8_t)USBD_FAIL;
+  }
+
   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 USBD_OK;
-  }
-  else
-  {
-    return USBD_FAIL;
-  }
+
+  return (uint8_t)USBD_OK;
 }
 /**
   * @}

Class/CDC/Src/usbd_cdc_if_template.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
   *
   ******************************************************************************
   */
@@ -68,13 +68,15 @@ static int8_t TEMPLATE_Init     (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_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 =
@@ -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.
@@ -203,6 +205,29 @@ static int8_t TEMPLATE_Control  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
   */
 static int8_t TEMPLATE_Receive(uint8_t *Buf, uint32_t *Len)
 {
+  UNUSED(Buf);
+  UNUSED(Len);
+
+  return (0);
+}
+
+/**
+  * @brief  TEMPLATE_TransmitCplt
+  *         Data transmitted 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,257 @@
+/**
+  ******************************************************************************
+  * @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_BUFFER_SIZE                        2000U
+
+#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[CDC_ECM_DATA_BUFFER_SIZE / 4U];      /* Force 32-bit 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 transmitted 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[CDC_RNDIS_MAX_DATA_SZE / 4U]; /* Force 32-bit 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 transmitted 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
   *
   ******************************************************************************
   */
@@ -42,10 +42,16 @@
   * @{
   */
 #define CUSTOM_HID_EPIN_ADDR                         0x81U
+
+#ifndef CUSTOM_HID_EPIN_SIZE
 #define CUSTOM_HID_EPIN_SIZE                         0x02U
+#endif
 
 #define CUSTOM_HID_EPOUT_ADDR                        0x01U
+
+#ifndef CUSTOM_HID_EPOUT_SIZE
 #define CUSTOM_HID_EPOUT_SIZE                        0x02U
+#endif
 
 #define USB_CUSTOM_HID_CONFIG_DESC_SIZ               41U
 #define USB_CUSTOM_HID_DESC_SIZ                      9U
@@ -61,6 +67,7 @@
 #ifndef USBD_CUSTOMHID_OUTREPORT_BUF_SIZE
 #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
 #endif /* USBD_CUSTOM_HID_REPORT_DESC_SIZE */
@@ -88,8 +95,7 @@ typedef enum
 {
   CUSTOM_HID_IDLE = 0U,
   CUSTOM_HID_BUSY,
-}
-CUSTOM_HID_StateTypeDef;
+} CUSTOM_HID_StateTypeDef;
 
 typedef struct _USBD_CUSTOM_HID_Itf
 {
@@ -108,8 +114,7 @@ typedef struct
   uint32_t AltSetting;
   uint32_t IsReportAvailable;
   CUSTOM_HID_StateTypeDef state;
-}
-USBD_CUSTOM_HID_HandleTypeDef;
+} USBD_CUSTOM_HID_HandleTypeDef;
 /**
   * @}
   */
@@ -138,10 +143,9 @@ extern USBD_ClassTypeDef  USBD_CUSTOM_HID;
   * @{
   */
 uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef *pdev,
-                                 uint8_t *report,
-                                 uint16_t len);
-
+                                   uint8_t *report, uint16_t len);
 
+uint8_t USBD_CUSTOM_HID_ReceivePacket(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
   *
   ******************************************************************************
   */

Class/CustomHID/Src/usbd_customhid.c

@@ -32,7 +32,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,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_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_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_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);
+
+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);
+
 /**
   * @}
   */
@@ -137,15 +128,17 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgFSDesc[USB_CUSTOM_HID_CONFIG_DES
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_CUSTOM_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_CUSTOM_HID_CONFIG_DESC_SIZ,                     /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xC0,         /*bmAttributes: bus powered */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
@@ -157,7 +150,7 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgFSDesc[USB_CUSTOM_HID_CONFIG_DES
   0x03,                                               /* bInterfaceClass: CUSTOM_HID */
   0x00,                                               /* bInterfaceSubClass : 1=BOOT, 0=no boot */
   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 */
@@ -176,7 +169,7 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgFSDesc[USB_CUSTOM_HID_CONFIG_DES
 
   CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Bytes max */
   0x00,
   CUSTOM_HID_FS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
@@ -196,15 +189,17 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgHSDesc[USB_CUSTOM_HID_CONFIG_DES
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_CUSTOM_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_CUSTOM_HID_CONFIG_DESC_SIZ,                     /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xC0,         /*bmAttributes: bus powered */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
@@ -231,11 +226,11 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgHSDesc[USB_CUSTOM_HID_CONFIG_DES
   /******************** Descriptor of Custom HID endpoints ********************/
   /* 27 */
   0x07,                                               /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
+  USB_DESC_TYPE_ENDPOINT,                             /* bDescriptorType */
 
   CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Bytes max */
   0x00,
   CUSTOM_HID_HS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
@@ -255,15 +250,17 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_OtherSpeedCfgDesc[USB_CUSTOM_HID_CO
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_CUSTOM_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_CUSTOM_HID_CONFIG_DESC_SIZ,                     /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xC0,         /*bmAttributes: bus powered */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of CUSTOM HID interface ****************/
   /* 09 */
@@ -294,7 +291,7 @@ __ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_OtherSpeedCfgDesc[USB_CUSTOM_HID_CO
 
   CUSTOM_HID_EPIN_ADDR,                               /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPIN_SIZE, /*wMaxPacketSize: 2 Byte max */
+  CUSTOM_HID_EPIN_SIZE,                               /* wMaxPacketSize: 2 Bytes max */
   0x00,
   CUSTOM_HID_FS_BINTERVAL,                            /* bInterval: Polling Interval */
   /* 34 */
@@ -354,43 +351,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,
-                               uint8_t cfgidx)
+static uint8_t USBD_CUSTOM_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  uint8_t ret = 0U;
+  UNUSED(cfgidx);
   USBD_CUSTOM_HID_HandleTypeDef *hhid;
 
+  hhid = (USBD_CUSTOM_HID_HandleTypeDef *)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 +407,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,
-                                 uint8_t cfgidx)
+static uint8_t USBD_CUSTOM_HID_DeInit(USBD_HandleTypeDef *pdev, 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 */
+  /* Free allocated memory */
   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;
 }
 
 /**
@@ -435,7 +446,12 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
   uint16_t len = 0U;
   uint8_t  *pbuf = NULL;
   uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
+  USBD_StatusTypeDef ret = USBD_OK;
+
+  if (hhid == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -447,7 +463,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,12 +471,13 @@ 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,
+                                  MIN(req->wLength, USBD_CUSTOMHID_OUTREPORT_BUF_SIZE));
           break;
 
         default:
@@ -476,7 +493,7 @@ 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
           {
@@ -486,27 +503,27 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
           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);
             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);
             }
           }
 
-      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
           {
@@ -527,6 +544,9 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
           }
           break;
 
+        case USB_REQ_CLEAR_FEATURE:
+          break;
+
         default:
           USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
@@ -539,7 +559,7 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
       ret = USBD_FAIL;
       break;
   }
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -550,24 +570,30 @@ static uint8_t  USBD_CUSTOM_HID_Setup (USBD_HandleTypeDef *pdev,
   * @retval status
   */
 uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef *pdev,
-                                    uint8_t *report,
-                                    uint16_t len)
+                                   uint8_t *report, uint16_t len)
 {
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_CUSTOM_HID_HandleTypeDef *hhid;
+
+  if (pdev->pClassData == NULL)
+  {
+    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;
 }
 
 /**
@@ -579,7 +605,8 @@ uint8_t USBD_CUSTOM_HID_SendReport (USBD_HandleTypeDef  *pdev,
   */
 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;
 }
 
@@ -592,7 +619,8 @@ static uint8_t  *USBD_CUSTOM_HID_GetFSCfgDesc (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;
 }
 
@@ -605,7 +633,8 @@ static uint8_t  *USBD_CUSTOM_HID_GetHSCfgDesc (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 +645,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,
-                                        uint8_t epnum)
+static uint8_t USBD_CUSTOM_HID_DataIn(USBD_HandleTypeDef *pdev, 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 +663,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,
-                                          uint8_t epnum)
+static uint8_t USBD_CUSTOM_HID_DataOut(USBD_HandleTypeDef *pdev, 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.
@@ -658,6 +719,11 @@ static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
 {
   USBD_CUSTOM_HID_HandleTypeDef *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
 
+  if (hhid == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   if (hhid->IsReportAvailable == 1U)
   {
     ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->OutEvent(hhid->Report_buf[0],
@@ -665,7 +731,7 @@ static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
     hhid->IsReportAvailable = 0U;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -676,7 +742,8 @@ static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
   */
 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;
 }
 
@@ -689,15 +756,14 @@ static uint8_t  *USBD_CUSTOM_HID_GetDeviceQualifierDesc (uint16_t *length)
 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;
-    ret = USBD_OK;
+    return (uint8_t)USBD_FAIL;
   }
 
-  return ret;
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
 }
 /**
   * @}

Class/CustomHID/Src/usbd_customhid_if_template.c

@@ -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
   *
   ******************************************************************************
   */
@@ -53,7 +53,6 @@ USBD_CUSTOM_HID_ItfTypeDef USBD_CustomHID_template_fops =
   */
 static int8_t TEMPLATE_CUSTOM_HID_Init(void)
 {
-
   return (0);
 }
 
@@ -81,6 +80,11 @@ static int8_t TEMPLATE_CUSTOM_HID_DeInit(void)
   */
 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
   *
   ******************************************************************************
   */
@@ -115,7 +115,7 @@
 /* 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
@@ -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)
 
 /**
   * @}
@@ -174,8 +174,7 @@ typedef struct
   uint8_t ReservedForAlign[2];
   uint8_t dev_state;
   uint8_t manif_state;
-}
-USBD_DFU_HandleTypeDef;
+} USBD_DFU_HandleTypeDef;
 
 typedef struct
 {
@@ -186,8 +185,7 @@ typedef struct
   uint16_t (* Write)(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;
 /**
   * @}
   */

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

Class/DFU/Src/usbd_dfu.c

@@ -42,7 +42,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
   *
   ******************************************************************************
   */
@@ -93,61 +93,34 @@
   */
 
 
-
-
 /** @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_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_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_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t *USBD_DFU_GetCfgDesc(uint16_t *length);
+static uint8_t *USBD_DFU_GetDeviceQualifierDesc(uint16_t *length);
 
-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);
+#if (USBD_SUPPORT_USER_STRING_DESC == 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_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_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,
-  USBD_DFU_DataOut,
+  NULL,
+  NULL,
   USBD_DFU_SOF,
-  USBD_DFU_IsoINIncomplete,
-  USBD_DFU_IsoOutIncomplete,
+  NULL,
+  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
 };
@@ -180,16 +153,19 @@ USBD_ClassTypeDef  USBD_DFU =
 /* USB DFU device Configuration Descriptor */
 __ALIGN_BEGIN static uint8_t USBD_DFU_CfgDesc[USB_DFU_CONFIG_DESC_SIZ] __ALIGN_END =
 {
-  0x09, /* bLength: Configuation Descriptor size */
+  0x09,                                                /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                         /* bDescriptorType: Configuration */
-  USB_DFU_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_DFU_CONFIG_DESC_SIZ,                             /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                                /* bNumInterfaces: 1 interface */
   0x01,                                                /* bConfigurationValue: Configuration value */
   0x02,                                                /* iConfiguration: Index of string descriptor describing the configuration */
-  0xC0,         /*bmAttributes: bus powered and Supprts Remote Wakeup */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                                /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                                /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                      /* MaxPower (mA) */
   /* 09 */
 
   /**********  Descriptor of DFU interface 0 Alternate setting 0 **************/
@@ -227,7 +203,7 @@ __ALIGN_BEGIN static uint8_t USBD_DFU_CfgDesc[USB_DFU_CONFIG_DESC_SIZ] __ALIGN_E
   /******************** DFU Functional Descriptor********************/
   0x09,                                                /* blength = 9 Bytes */
   DFU_DESCRIPTOR_TYPE,                                 /* DFU Functional Descriptor */
-  0x0B,   /*bmAttribute
+  0x0B,                                                /* bmAttribute:
                                                           bitCanDnload             = 1      (bit 0)
                                                           bitCanUpload             = 1      (bit 1)
                                                           bitManifestationTolerant = 0      (bit 2)
@@ -275,21 +251,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,
-                               uint8_t cfgidx)
+static uint8_t USBD_DFU_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+
   USBD_DFU_HandleTypeDef *hdfu;
 
   /* Allocate Audio structure */
-  pdev->pClassData = USBD_malloc(sizeof (USBD_DFU_HandleTypeDef));
+  hdfu = (USBD_DFU_HandleTypeDef *)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
-  {
-    hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
+
+  pdev->pClassData = (void *)hdfu;
 
   hdfu->alt_setting = 0U;
   hdfu->data_ptr = USBD_DFU_APP_DEFAULT_ADD;
@@ -309,10 +286,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 +299,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,
-                                 uint8_t cfgidx)
+static uint8_t USBD_DFU_DeInit(USBD_HandleTypeDef *pdev, 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 +317,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 */
-  if(pdev->pClassData != NULL)
-  {
-    /* De-Initialize Hardware layer */
+  /* DeInit  physical Interface components and 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 +332,18 @@ static uint8_t  USBD_DFU_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req)
+static uint8_t USBD_DFU_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-  USBD_DFU_HandleTypeDef   *hdfu;
-  uint8_t *pbuf = 0U;
+  USBD_DFU_HandleTypeDef *hdfu = (USBD_DFU_HandleTypeDef *)pdev->pClassData;
+  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;
+  if (hdfu == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -411,7 +391,7 @@ 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
           {
@@ -427,13 +407,13 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
             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
           {
@@ -457,12 +437,15 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
           }
           else
           {
-        /* Call the error management function (command will be nacked */
+            /* Call the error management function (command will be NAKed */
             USBD_CtlError(pdev, req);
             ret = USBD_FAIL;
           }
           break;
 
+        case USB_REQ_CLEAR_FEATURE:
+          break;
+
         default:
           USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
@@ -476,7 +459,7 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 
@@ -489,23 +472,11 @@ static uint8_t  USBD_DFU_Setup (USBD_HandleTypeDef *pdev,
   */
 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
@@ -515,8 +486,9 @@ static uint8_t  USBD_DFU_DataIn (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
@@ -526,38 +498,52 @@ static uint8_t  USBD_DFU_EP0_RxReady (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;
+  USBD_DFU_MediaTypeDef *DfuInterface = (USBD_DFU_MediaTypeDef *)pdev->pUserData;
 
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
+  if (hdfu == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   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)
+        {
+          /* Nothing 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
+        {
+          return (uint8_t)USBD_FAIL;
         }
       }
       else
@@ -565,7 +551,7 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
         /* Reset the global length and block number */
         hdfu->wlength = 0U;
         hdfu->wblock_num = 0U;
-        /* Call the error management function (command will be nacked) */
+        /* Call the error management function (command will be NAKed) */
         req.bmRequest = 0U;
         req.wLength = 1U;
         USBD_CtlError(pdev, &req);
@@ -579,11 +565,10 @@ static uint8_t  USBD_DFU_EP0_TxReady (USBD_HandleTypeDef *pdev)
         /* Decode the required address */
         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,
-                                     (uint8_t *)addr, hdfu->wlength) != USBD_OK)
+        /* Perform the write operation */
+        if (DfuInterface->Write(hdfu->buffer.d8, (uint8_t *)addr, hdfu->wlength) != USBD_OK)
         {
-          return USBD_FAIL;
+          return (uint8_t)USBD_FAIL;
         }
       }
     }
@@ -599,18 +584,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
-  {
-    if (hdfu->dev_state == DFU_STATE_MANIFEST)/* Manifestation in progress */
+  else if (hdfu->dev_state == DFU_STATE_MANIFEST)/* Manifestation in progress */
   {
     /* Start leaving DFU mode */
     DFU_Leave(pdev);
   }
+  else
+  {
+    return (uint8_t)USBD_FAIL;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_DFU_SOF
@@ -620,46 +605,11 @@ static uint8_t  USBD_DFU_EP0_TxReady (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
@@ -669,7 +619,8 @@ static uint8_t  USBD_DFU_DataOut (USBD_HandleTypeDef *pdev,
   */
 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;
 }
 
@@ -677,23 +628,25 @@ static uint8_t  *USBD_DFU_GetDeviceQualifierDesc (uint16_t *length)
   * @brief  USBD_DFU_GetUsrStringDesc
   *         Manages the transfer of memory interfaces string descriptors.
   * @param  speed : current device speed
-  * @param  index: desciptor index
+  * @param  index: descriptor index
   * @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_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;
   }
 }
@@ -707,11 +660,14 @@ static uint8_t* USBD_DFU_GetUsrStringDesc (USBD_HandleTypeDef *pdev, uint8_t ind
 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 +682,18 @@ 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 == NULL)
+  {
+    return;
+  }
 
-  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_MANIFEST_SYNC
-        || hdfu->dev_state == DFU_STATE_UPLOAD_IDLE )
+  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_MANIFEST_SYNC) ||
+      (hdfu->dev_state == DFU_STATE_UPLOAD_IDLE))
   {
     /* Update the state machine */
     hdfu->dev_state = DFU_STATE_IDLE;
@@ -747,11 +708,11 @@ 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);
-    USBD_Start (pdev);
+    (void)USBD_Stop(pdev);
+    (void)USBD_Start(pdev);
   }
   else
   {
@@ -769,9 +730,12 @@ 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;
+  if (hdfu == NULL)
+  {
+    return;
+  }
 
   /* Data setup request */
   if (req->wLength > 0U)
@@ -780,20 +744,19 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     {
       /* Update the global length and block number */
       hdfu->wblock_num = req->wValue;
-      hdfu->wlength = req->wLength;
+      hdfu->wlength = MIN(req->wLength, USBD_DFU_XFER_SIZE);
 
       /* Update the state machine */
       hdfu->dev_state = DFU_STATE_DNLOAD_SYNC;
       hdfu->dev_status[4] = hdfu->dev_state;
 
       /* Prepare the reception of the buffer over EP0 */
-      USBD_CtlPrepareRx (pdev, (uint8_t*)hdfu->buffer.d8,
-                         (uint16_t)hdfu->wlength);
+      (void)USBD_CtlPrepareRx(pdev, (uint8_t *)hdfu->buffer.d8, hdfu->wlength);
     }
     /* Unsupported state */
     else
     {
-      /* Call the error management function (command will be nacked */
+      /* Call the error management function (command will be NAKed */
       USBD_CtlError(pdev, req);
     }
   }
@@ -801,7 +764,7 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   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;
@@ -812,7 +775,7 @@ static void DFU_Download(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     }
     else
     {
-      /* Call the error management function (command will be nacked */
+      /* Call the error management function (command will be NAKed */
       USBD_CtlError(pdev, req);
     }
   }
@@ -827,12 +790,15 @@ 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;
+  uint8_t *phaddr;
+  uint32_t addr;
 
- hdfu = (USBD_DFU_HandleTypeDef*) pdev->pClassData;
-
-  uint8_t *phaddr = NULL;
-  uint32_t addr = 0U;
+  if (hdfu == NULL)
+  {
+    return;
+  }
 
   /* Data setup request */
   if (req->wLength > 0U)
@@ -841,7 +807,7 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
     {
       /* Update the global length and block number */
       hdfu->wblock_num = req->wValue;
-      hdfu->wlength = req->wLength;
+      hdfu->wlength = MIN(req->wLength, USBD_DFU_XFER_SIZE);
 
       /* DFU Get Command */
       if (hdfu->wblock_num == 0U)
@@ -860,7 +826,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 +837,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 */
       {
@@ -888,7 +854,7 @@ static void DFU_Upload(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
         hdfu->dev_status[3] = 0U;
         hdfu->dev_status[4] = hdfu->dev_state;
 
-        /* Call the error management function (command will be nacked */
+        /* Call the error management function (command will be NAKed */
         USBD_CtlError(pdev, req);
       }
     }
@@ -897,7 +863,8 @@ 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 */
+
+      /* Call the error management function (command will be NAKed */
       USBD_CtlError(pdev, req);
     }
   }
@@ -921,9 +888,13 @@ 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;
+  if (hdfu == NULL)
+  {
+    return;
+  }
 
   switch (hdfu->dev_state)
   {
@@ -939,11 +910,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)*/
@@ -970,7 +941,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;
 
@@ -987,7 +958,7 @@ static void DFU_GetStatus(USBD_HandleTypeDef *pdev)
   }
 
   /* 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,9 +969,12 @@ 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 == NULL)
+  {
+    return;
+  }
 
   if (hdfu->dev_state == DFU_STATE_ERROR)
   {
@@ -1013,7 +987,8 @@ static void DFU_ClearStatus(USBD_HandleTypeDef *pdev)
     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[1] = 0U;
@@ -1032,12 +1007,15 @@ 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;
+  if (hdfu == NULL)
+  {
+    return;
+  }
 
   /* 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 +1026,18 @@ 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 == NULL)
+  {
+    return;
+  }
 
-  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_MANIFEST_SYNC
-        || hdfu->dev_state == DFU_STATE_UPLOAD_IDLE )
+  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_MANIFEST_SYNC) ||
+      (hdfu->dev_state == DFU_STATE_UPLOAD_IDLE))
   {
     hdfu->dev_state = DFU_STATE_IDLE;
     hdfu->dev_status[0] = DFU_ERROR_NONE;
@@ -1077,13 +1060,16 @@ 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;
+  if (hdfu == NULL)
+  {
+    return;
+  }
 
   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;
 
@@ -1103,10 +1089,7 @@ static void DFU_Leave(USBD_HandleTypeDef *pdev)
     hdfu->dev_status[4] = hdfu->dev_state;
 
     /* Disconnect the USB device */
-    USBD_Stop (pdev);
-
-    /* DeInitilialize the MAL(Media Access Layer) */
-    ((USBD_DFU_MediaTypeDef *)pdev->pUserData)->DeInit();
+    (void)USBD_Stop(pdev);
 
     /* Generate system reset to allow jumping to the user code */
     NVIC_SystemReset();

Class/DFU/Src/usbd_dfu_media_template.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
   *
   ******************************************************************************
   */

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
   *
   ******************************************************************************
   */
@@ -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,10 +116,7 @@ extern USBD_ClassTypeDef  USBD_HID;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t USBD_HID_SendReport (USBD_HandleTypeDef *pdev,
-                                 uint8_t *report,
-                                 uint16_t len);
-
+uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev, uint8_t *report, uint16_t len);
 uint32_t USBD_HID_GetPollingInterval(USBD_HandleTypeDef *pdev);
 
 /**

Class/HID/Src/usbd_hid.c

@@ -33,7 +33,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,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_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_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);
 /**
   * @}
   */
@@ -139,15 +128,17 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgFSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIG
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_HID_CONFIG_DESC_SIZ,                            /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xE0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0xA0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
@@ -178,7 +169,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgFSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIG
 
   HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Bytes max */
   0x00,
   HID_FS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
@@ -189,15 +180,17 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgHSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIG
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_HID_CONFIG_DESC_SIZ,                            /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xE0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0xA0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
@@ -228,7 +221,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgHSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIG
 
   HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Bytes max */
   0x00,
   HID_HS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
@@ -239,15 +232,17 @@ __ALIGN_BEGIN static uint8_t USBD_HID_OtherSpeedCfgDesc[USB_HID_CONFIG_DESC_SIZ]
 {
   0x09,                                               /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                        /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
+  USB_HID_CONFIG_DESC_SIZ,                            /* wTotalLength: Bytes returned */
   0x00,
   0x01,                                               /* bNumInterfaces: 1 interface */
   0x01,                                               /* bConfigurationValue: Configuration value */
-  0x00,         /*iConfiguration: Index of string descriptor describing
-  the configuration*/
-  0xE0,         /*bmAttributes: bus powered and Support Remote Wake-up */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
+  0x00,                                               /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xE0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0xA0,                                               /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                     /* MaxPower (mA) */
 
   /************** Descriptor of Joystick Mouse interface ****************/
   /* 09 */
@@ -278,7 +273,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_OtherSpeedCfgDesc[USB_HID_CONFIG_DESC_SIZ]
 
   HID_EPIN_ADDR,                                      /* bEndpointAddress: Endpoint Address (IN) */
   0x03,                                               /* bmAttributes: Interrupt endpoint */
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
+  HID_EPIN_SIZE,                                      /* wMaxPacketSize: 4 Bytes max */
   0x00,
   HID_FS_BINTERVAL,                                   /* bInterval: Polling Interval */
   /* 34 */
@@ -317,52 +312,44 @@ __ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_
 
 __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE] __ALIGN_END =
 {
-  0x05,   0x01,
-  0x09,   0x02,
-  0xA1,   0x01,
-  0x09,   0x01,
-
-  0xA1,   0x00,
-  0x05,   0x09,
-  0x19,   0x01,
-  0x29,   0x03,
-
-  0x15,   0x00,
-  0x25,   0x01,
-  0x95,   0x03,
-  0x75,   0x01,
-
-  0x81,   0x02,
-  0x95,   0x01,
-  0x75,   0x05,
-  0x81,   0x01,
-
-  0x05,   0x01,
-  0x09,   0x30,
-  0x09,   0x31,
-  0x09,   0x38,
-
-  0x15,   0x81,
-  0x25,   0x7F,
-  0x75,   0x08,
-  0x95,   0x03,
-
-  0x81,   0x06,
-  0xC0,   0x09,
-  0x3c,   0x05,
-  0xff,   0x09,
-
-  0x01,   0x15,
-  0x00,   0x25,
-  0x01,   0x75,
-  0x01,   0x95,
-
-  0x02,   0xb1,
-  0x22,   0x75,
-  0x06,   0x95,
-  0x01,   0xb1,
-
-  0x01,   0xc0
+  0x05, 0x01,        /* Usage Page (Generic Desktop Ctrls)     */
+  0x09, 0x02,        /* Usage (Mouse)                          */
+  0xA1, 0x01,        /* Collection (Application)               */
+  0x09, 0x01,        /*   Usage (Pointer)                      */
+  0xA1, 0x00,        /*   Collection (Physical)                */
+  0x05, 0x09,        /*     Usage Page (Button)                */
+  0x19, 0x01,        /*     Usage Minimum (0x01)               */
+  0x29, 0x03,        /*     Usage Maximum (0x03)               */
+  0x15, 0x00,        /*     Logical Minimum (0)                */
+  0x25, 0x01,        /*     Logical Maximum (1)                */
+  0x95, 0x03,        /*     Report Count (3)                   */
+  0x75, 0x01,        /*     Report Size (1)                    */
+  0x81, 0x02,        /*     Input (Data,Var,Abs)               */
+  0x95, 0x01,        /*     Report Count (1)                   */
+  0x75, 0x05,        /*     Report Size (5)                    */
+  0x81, 0x01,        /*     Input (Const,Array,Abs)            */
+  0x05, 0x01,        /*     Usage Page (Generic Desktop Ctrls) */
+  0x09, 0x30,        /*     Usage (X)                          */
+  0x09, 0x31,        /*     Usage (Y)                          */
+  0x09, 0x38,        /*     Usage (Wheel)                      */
+  0x15, 0x81,        /*     Logical Minimum (-127)             */
+  0x25, 0x7F,        /*     Logical Maximum (127)              */
+  0x75, 0x08,        /*     Report Size (8)                    */
+  0x95, 0x03,        /*     Report Count (3)                   */
+  0x81, 0x06,        /*     Input (Data,Var,Rel)               */
+  0xC0,              /*   End Collection                       */
+  0x09, 0x3C,        /*   Usage (Motion Wakeup)                */
+  0x05, 0xFF,        /*   Usage Page (Reserved 0xFF)           */
+  0x09, 0x01,        /*   Usage (0x01)                         */
+  0x15, 0x00,        /*   Logical Minimum (0)                  */
+  0x25, 0x01,        /*   Logical Maximum (1)                  */
+  0x75, 0x01,        /*   Report Size (1)                      */
+  0x95, 0x02,        /*   Report Count (2)                     */
+  0xB1, 0x22,        /*   Feature (Data,Var,Abs,NoWrp)         */
+  0x75, 0x06,        /*   Report Size (6)                      */
+  0x95, 0x01,        /*   Report Count (1)                     */
+  0xB1, 0x01,        /*   Feature (Const,Array,Abs,NoWrp)      */
+  0xC0               /* End Collection                         */
 };
 
 /**
@@ -382,44 +369,62 @@ __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  _
   */
 static uint8_t USBD_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  /* Open EP IN */
-  USBD_LL_OpenEP(pdev, HID_EPIN_ADDR, USBD_EP_TYPE_INTR, HID_EPIN_SIZE);
-  pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 1U;
+  UNUSED(cfgidx);
 
-  pdev->pClassData = USBD_malloc(sizeof (USBD_HID_HandleTypeDef));
+  USBD_HID_HandleTypeDef *hhid;
 
-  if (pdev->pClassData == NULL)
+  hhid = (USBD_HID_HandleTypeDef *)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,
-                                 uint8_t cfgidx)
+static uint8_t USBD_HID_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  /* Close HID EPs */
-  USBD_LL_CloseEP(pdev, HID_EPIN_ADDR);
-  pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 0U;
+  UNUSED(cfgidx);
 
-  /* FRee allocated memory */
+  /* Close HID EPs */
+  (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)
   {
-    USBD_free(pdev->pClassData);
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -429,14 +434,18 @@ static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev,
   * @param  req: usb requests
   * @retval status
   */
-static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
-                                USBD_SetupReqTypedef *req)
+static uint8_t USBD_HID_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   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;
+
+  if (hhid == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -448,7 +457,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,7 +465,7 @@ 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:
@@ -471,7 +480,7 @@ 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
           {
@@ -481,12 +490,12 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
           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);
             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);
@@ -497,13 +506,13 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
             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
           {
@@ -524,6 +533,9 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
           }
           break;
 
+        case USB_REQ_CLEAR_FEATURE:
+          break;
+
         default:
           USBD_CtlError(pdev, req);
           ret = USBD_FAIL;
@@ -537,7 +549,7 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -547,24 +559,25 @@ 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 *report,
-                                 uint16_t len)
+uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev, uint8_t *report, uint16_t len)
 {
   USBD_HID_HandleTypeDef *hhid = (USBD_HID_HandleTypeDef *)pdev->pClassData;
 
+  if (hhid == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   if (pdev->dev_state == USBD_STATE_CONFIGURED)
   {
     if (hhid->state == HID_IDLE)
     {
       hhid->state = HID_BUSY;
-      USBD_LL_Transmit (pdev,
-                        HID_EPIN_ADDR,
-                        report,
-                        len);
+      (void)USBD_LL_Transmit(pdev, HID_EPIN_ADDR, report, len);
     }
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -575,7 +588,7 @@ uint8_t USBD_HID_SendReport     (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)
@@ -604,7 +617,8 @@ uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev)
   */
 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;
 }
 
@@ -617,7 +631,8 @@ static uint8_t  *USBD_HID_GetFSCfgDesc (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;
 }
 
@@ -630,7 +645,8 @@ static uint8_t  *USBD_HID_GetHSCfgDesc (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 +657,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,
-                              uint8_t epnum)
+static uint8_t USBD_HID_DataIn(USBD_HandleTypeDef *pdev, 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;
 }
 
 
@@ -660,7 +676,8 @@ static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev,
   */
 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
   *
   ******************************************************************************
   */
@@ -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;

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

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
   *
   ******************************************************************************
   */
@@ -40,10 +40,11 @@
 /** @defgroup USB_INFO_Exported_Defines
   * @{
   */
-#define MODE_SENSE6_LEN                    8U
-#define MODE_SENSE10_LEN                   8U
-#define LENGTH_INQUIRY_PAGE00              7U
-#define LENGTH_FORMAT_CAPACITIES           20U
+#define MODE_SENSE6_LEN                    0x17U
+#define MODE_SENSE10_LEN                   0x1BU
+#define LENGTH_INQUIRY_PAGE00              0x06U
+#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 const uint8_t MSC_Mode_Sense6_data[];
-extern const uint8_t MSC_Mode_Sense10_data[] ;
+extern uint8_t MSC_Page00_Inquiry_Data[LENGTH_INQUIRY_PAGE00];
+extern uint8_t MSC_Page80_Inquiry_Data[LENGTH_INQUIRY_PAGE80];
+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
   *
   ******************************************************************************
   */
@@ -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[];
-extern  uint8_t Standard_Inquiry_Data[];
-extern  uint8_t Standard_Inquiry_Data2[];
-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 [];
+#define SCSI_MEDIUM_UNLOCKED                        0x00U
+#define SCSI_MEDIUM_LOCKED                          0x01U
+#define SCSI_MEDIUM_EJECTED                         0x02U
 /**
   * @}
   */
@@ -126,15 +119,18 @@ extern  uint8_t ReadFormatCapacity_Data [];
   * @{
   */
 
-typedef struct _SENSE_ITEM {
-  char Skey;
-  union {
-    struct _ASCs {
-      char ASC;
-      char ASCQ;
+typedef struct _SENSE_ITEM
+{
+  uint8_t Skey;
+  union
+  {
+    struct _ASCs
+    {
+      uint8_t ASC;
+      uint8_t ASCQ;
     } b;
     uint8_t ASC;
-    char *pData;
+    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
   *
   ******************************************************************************
   */

Class/MSC/Src/usbd_msc.c

@@ -27,7 +27,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
   *
   ******************************************************************************
   */
@@ -80,31 +80,17 @@
 /** @defgroup MSC_CORE_Private_FunctionPrototypes
   * @{
   */
-uint8_t  USBD_MSC_Init (USBD_HandleTypeDef *pdev,
-                            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_DataIn (USBD_HandleTypeDef *pdev,
-                              uint8_t epnum);
-
-
-uint8_t  USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
-                               uint8_t epnum);
+uint8_t USBD_MSC_Init(USBD_HandleTypeDef *pdev, 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_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);
 
-
 /**
   * @}
   */
@@ -135,19 +121,22 @@ 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 */
+  0x09,                                            /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                     /* bDescriptorType: Configuration */
   USB_MSC_CONFIG_DESC_SIZ,
 
   0x00,
   0x01,                                            /* bNumInterfaces: 1 interface */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
+  0x01,                                            /* bConfigurationValue */
+  0x04,                                            /* iConfiguration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                            /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                            /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                  /* MaxPower (mA) */
 
   /********************  Mass Storage interface ********************/
   0x09,                                            /* bLength: Interface Descriptor size */
@@ -158,7 +147,7 @@ __ALIGN_BEGIN uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
   0x08,                                            /* bInterfaceClass: MSC Class */
   0x06,                                            /* bInterfaceSubClass : SCSI transparent */
   0x50,                                            /* nInterfaceProtocol */
-  0x05,          /* iInterface: */
+  0x05,                                            /* iInterface */
   /********************  Mass Storage Endpoints ********************/
   0x07,                                            /* Endpoint descriptor length = 7 */
   0x05,                                            /* Endpoint descriptor type */
@@ -179,19 +168,22 @@ __ALIGN_BEGIN uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
 
 /* 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 */
+  0x09,                                            /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_CONFIGURATION,                     /* bDescriptorType: Configuration */
   USB_MSC_CONFIG_DESC_SIZ,
 
   0x00,
   0x01,                                            /* bNumInterfaces: 1 interface */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
+  0x01,                                            /* bConfigurationValue */
+  0x04,                                            /* iConfiguration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                            /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                            /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                  /* MaxPower (mA) */
 
   /********************  Mass Storage interface ********************/
   0x09,                                            /* bLength: Interface Descriptor size */
@@ -221,30 +213,33 @@ uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
   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 */
+  0x09,                                           /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
   USB_MSC_CONFIG_DESC_SIZ,
 
   0x00,
   0x01,                                           /* bNumInterfaces: 1 interface */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
+  0x01,                                           /* bConfigurationValue */
+  0x04,                                           /* iConfiguration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                           /* bmAttributes: Bus Powered according to user configuration */
+#else
+  0x80,                                           /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                                 /* MaxPower (mA) */
 
   /********************  Mass Storage interface ********************/
   0x09,                                           /* bLength: Interface Descriptor size */
-  0x04,   /* bDescriptorType: */
+  0x04,                                           /* bDescriptorType */
   0x00,                                           /* bInterfaceNumber: Number of Interface */
   0x00,                                           /* bAlternateSetting: Alternate setting */
   0x02,                                           /* bNumEndpoints */
   0x08,                                           /* bInterfaceClass: MSC Class */
   0x06,                                           /* bInterfaceSubClass : SCSI transparent command set */
   0x50,                                           /* nInterfaceProtocol */
-  0x05,          /* iInterface: */
+  0x05,                                           /* iInterface */
   /********************  Mass Storage Endpoints ********************/
   0x07,                                           /* Endpoint descriptor length = 7 */
   0x05,                                           /* Endpoint descriptor type */
@@ -264,7 +259,7 @@ __ALIGN_BEGIN uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ]   __AL
 };
 
 /* 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,
@@ -295,67 +290,76 @@ __ALIGN_BEGIN  uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]
   */
 uint8_t USBD_MSC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
+  UNUSED(cfgidx);
+  USBD_MSC_BOT_HandleTypeDef *hmsc;
+
+  hmsc = (USBD_MSC_BOT_HandleTypeDef *)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;
 }
 
 /**
   * @brief  USBD_MSC_DeInit
-  *         DeInitilaize  the mass storage configuration
+  *         DeInitialize  the mass storage configuration
   * @param  pdev: device instance
   * @param  cfgidx: configuration index
   * @retval status
   */
-uint8_t  USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
-                              uint8_t cfgidx)
+uint8_t USBD_MSC_DeInit(USBD_HandleTypeDef *pdev, 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)
   {
-    USBD_free(pdev->pClassData);
+    /* De-Init the BOT layer */
+    MSC_BOT_DeInit(pdev);
+
+    (void)USBD_free(pdev->pClassData);
     pdev->pClassData = NULL;
   }
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 /**
   * @brief  USBD_MSC_Setup
@@ -367,12 +371,16 @@ uint8_t  USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
 uint8_t USBD_MSC_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   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;
 
+  if (hmsc == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
-
     /* Class request */
     case USB_REQ_TYPE_CLASS:
       switch (req->bRequest)
@@ -382,7 +390,7 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
               ((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
           {
@@ -417,7 +425,7 @@ 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
           {
@@ -429,7 +437,7 @@ 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
           {
@@ -451,49 +459,17 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
           break;
 
         case USB_REQ_CLEAR_FEATURE:
-
-      /* 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)
+          if (pdev->dev_state == USBD_STATE_CONFIGURED)
           {
-        pdev->ep_in[(uint8_t)req->wIndex & 0xFU].is_used = 0U;
-        if(pdev->dev_speed == USBD_SPEED_HIGH)
+            if (req->wValue == USB_FEATURE_EP_HALT)
             {
-          /* Open EP IN */
-          USBD_LL_OpenEP(pdev, MSC_EPIN_ADDR, USBD_EP_TYPE_BULK,
-                         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;
-      }
+              /* Flush the FIFO */
+              (void)USBD_LL_FlushEP(pdev, (uint8_t)req->wIndex);
 
               /* Handle BOT error */
               MSC_BOT_CplClrFeature(pdev, (uint8_t)req->wIndex);
+            }
+          }
           break;
 
         default:
@@ -509,7 +485,7 @@ uint8_t  USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
 /**
@@ -519,11 +495,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 epnum)
+uint8_t USBD_MSC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
   MSC_BOT_DataIn(pdev, epnum);
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -533,11 +509,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 epnum)
+uint8_t USBD_MSC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
   MSC_BOT_DataOut(pdev, epnum);
-  return USBD_OK;
+
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -548,7 +524,8 @@ uint8_t  USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
   */
 uint8_t *USBD_MSC_GetHSCfgDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_MSC_CfgHSDesc);
+  *length = (uint16_t)sizeof(USBD_MSC_CfgHSDesc);
+
   return USBD_MSC_CfgHSDesc;
 }
 
@@ -560,7 +537,8 @@ uint8_t  *USBD_MSC_GetHSCfgDesc (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;
 }
 
@@ -572,7 +550,8 @@ uint8_t  *USBD_MSC_GetFSCfgDesc (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;
 }
 /**
@@ -583,7 +562,8 @@ uint8_t  *USBD_MSC_GetOtherSpeedCfgDesc (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 +572,16 @@ uint8_t  *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length)
   * @param  fops: storage callback
   * @retval status
   */
-uint8_t  USBD_MSC_RegisterStorage  (USBD_HandleTypeDef   *pdev,
-                                    USBD_StorageTypeDef *fops)
+uint8_t USBD_MSC_RegisterStorage(USBD_HandleTypeDef *pdev, 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,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
   *
   ******************************************************************************
   */
@@ -76,11 +76,8 @@
 /** @defgroup MSC_BOT_Private_FunctionPrototypes
   * @{
   */
+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,7 +89,6 @@ static void MSC_BOT_Abort(USBD_HandleTypeDef  *pdev);
   */
 
 
-
 /**
   * @brief  MSC_BOT_Init
   *         Initialize the BOT Process
@@ -103,19 +99,25 @@ void MSC_BOT_Init (USBD_HandleTypeDef  *pdev)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   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);
-  USBD_LL_FlushEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_FlushEP(pdev, MSC_EPOUT_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,
+  /* Prepare EP to Receive First BOT Cmd */
+  (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)&hmsc->cbw,
                                USBD_BOT_CBW_LENGTH);
 }
 
@@ -129,25 +131,37 @@ void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   hmsc->bot_state  = USBD_BOT_IDLE;
   hmsc->bot_status = USBD_BOT_STATUS_RECOVERY;
 
-  /* Prapare EP to Receive First BOT Cmd */
-  USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
+  (void)USBD_LL_ClearStallEP(pdev, MSC_EPIN_ADDR);
+  (void)USBD_LL_ClearStallEP(pdev, MSC_EPOUT_ADDR);
+
+  /* Prepare EP to Receive First BOT Cmd */
+  (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)&hmsc->cbw,
                                USBD_BOT_CBW_LENGTH);
 }
 
 /**
   * @brief  MSC_BOT_DeInit
-*         Deinitialize the BOT Machine
+  *         DeInitialize the BOT Machine
   * @param  pdev: device instance
   * @retval None
   */
 void MSC_BOT_DeInit(USBD_HandleTypeDef  *pdev)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc != NULL)
+  {
     hmsc->bot_state = USBD_BOT_IDLE;
   }
+}
 
 /**
   * @brief  MSC_BOT_DataIn
@@ -156,17 +170,21 @@ void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)
   * @param  epnum: endpoint index
   * @retval None
   */
-void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
-                     uint8_t epnum)
+void MSC_BOT_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  UNUSED(epnum);
+
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   switch (hmsc->bot_state)
   {
     case USBD_BOT_DATA_IN:
-    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);
       }
@@ -175,7 +193,6 @@ void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
     case USBD_BOT_SEND_DATA:
     case USBD_BOT_LAST_DATA_IN:
       MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
-
       break;
 
     default:
@@ -189,11 +206,17 @@ void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
   * @param  epnum: endpoint index
   * @retval None
   */
-void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
-                      uint8_t epnum)
+void MSC_BOT_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
+  UNUSED(epnum);
+
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   switch (hmsc->bot_state)
   {
     case USBD_BOT_IDLE:
@@ -201,14 +224,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);
       }
-
       break;
 
     default:
@@ -226,15 +245,19 @@ static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   hmsc->csw.dTag = hmsc->cbw.dTag;
   hmsc->csw.dDataResidue = hmsc->cbw.dDataLength;
 
   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.bCBLength < 1U) || (hmsc->cbw.bCBLength > 16U))
+      (hmsc->cbw.bLUN > 1U) || (hmsc->cbw.bCBLength < 1U) ||
+      (hmsc->cbw.bCBLength > 16U))
   {
-
     SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
 
     hmsc->bot_status = USBD_BOT_STATUS_ERROR;
@@ -286,18 +309,22 @@ 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,
-                              uint16_t len)
+static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf, uint32_t len)
 {
   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);
+
+  if (hmsc == NULL)
+  {
+    return;
+  }
 
   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 +334,24 @@ static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t* pbuf,
   * @param  status : CSW status
   * @retval None
   */
-void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
-                              uint8_t CSW_Status)
+void  MSC_BOT_SendCSW(USBD_HandleTypeDef *pdev, uint8_t CSW_Status)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   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);
 }
 
@@ -335,19 +366,24 @@ static void  MSC_BOT_Abort (USBD_HandleTypeDef  *pdev)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   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)
   {
-    USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
-                            USBD_BOT_CBW_LENGTH);
+    (void)USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
+    (void)USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
   }
 }
 
@@ -363,10 +399,15 @@ void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev, uint8_t epnum)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   if (hmsc->bot_status == USBD_BOT_STATUS_ERROR) /* Bad CBW Signature */
   {
-    USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
-    hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
+    (void)USBD_LL_StallEP(pdev, MSC_EPIN_ADDR);
+    (void)USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
   }
   else if (((epnum & 0x80U) == 0x80U) && (hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))
   {

Class/MSC/Src/usbd_msc_data.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
   *
   ******************************************************************************
   */
@@ -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,
-	0x83
+  0x80
 };
+
+/* 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_scsi.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
   *
   ******************************************************************************
   */
@@ -30,7 +30,6 @@
 #include "usbd_msc_data.h"
 
 
-
 /** @addtogroup STM32_USB_DEVICE_LIBRARY
   * @{
   */
@@ -82,18 +81,25 @@ static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
 static int8_t SCSI_Inquiry(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_ReadCapacity16(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_RequestSense(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_StartStopUnit(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_AllowPreventRemovable(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_ModeSense6(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_ModeSense10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_Write10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_Write12(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_Read12(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_Verify10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
 static int8_t SCSI_CheckAddressRange(USBD_HandleTypeDef *pdev, uint8_t lun,
                                      uint32_t blk_offset, uint32_t blk_nbr);
 
 static int8_t SCSI_ProcessRead(USBD_HandleTypeDef *pdev, uint8_t lun);
 static int8_t SCSI_ProcessWrite(USBD_HandleTypeDef *pdev, uint8_t lun);
+
+static int8_t SCSI_UpdateBotData(USBD_MSC_BOT_HandleTypeDef *hmsc,
+                                 uint8_t *pBuff, uint16_t length);
 /**
   * @}
   */
@@ -114,60 +120,84 @@ static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef *pdev, uint8_t lun);
   */
 int8_t SCSI_ProcessCmd(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *cmd)
 {
+  int8_t ret;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   switch (cmd[0])
   {
     case SCSI_TEST_UNIT_READY:
-    SCSI_TestUnitReady(pdev, lun, cmd);
+      ret = SCSI_TestUnitReady(pdev, lun, cmd);
       break;
 
     case SCSI_REQUEST_SENSE:
-    SCSI_RequestSense (pdev, lun, cmd);
+      ret = SCSI_RequestSense(pdev, lun, cmd);
       break;
+
     case SCSI_INQUIRY:
-    SCSI_Inquiry(pdev, lun, cmd);
+      ret = SCSI_Inquiry(pdev, lun, cmd);
       break;
 
     case SCSI_START_STOP_UNIT:
-    SCSI_StartStopUnit(pdev, lun, cmd);
+      ret = SCSI_StartStopUnit(pdev, lun, cmd);
       break;
 
     case SCSI_ALLOW_MEDIUM_REMOVAL:
-    SCSI_StartStopUnit(pdev, lun, cmd);
+      ret = SCSI_AllowPreventRemovable(pdev, lun, cmd);
       break;
 
     case SCSI_MODE_SENSE6:
-    SCSI_ModeSense6 (pdev, lun, cmd);
+      ret = SCSI_ModeSense6(pdev, lun, cmd);
       break;
 
     case SCSI_MODE_SENSE10:
-    SCSI_ModeSense10 (pdev, lun, cmd);
+      ret = SCSI_ModeSense10(pdev, lun, cmd);
       break;
 
     case SCSI_READ_FORMAT_CAPACITIES:
-    SCSI_ReadFormatCapacity(pdev, lun, cmd);
+      ret = SCSI_ReadFormatCapacity(pdev, lun, cmd);
       break;
 
     case SCSI_READ_CAPACITY10:
-    SCSI_ReadCapacity10(pdev, lun, cmd);
+      ret = SCSI_ReadCapacity10(pdev, lun, cmd);
+      break;
+
+    case SCSI_READ_CAPACITY16:
+      ret = SCSI_ReadCapacity16(pdev, lun, cmd);
       break;
 
     case SCSI_READ10:
-    SCSI_Read10(pdev, lun, cmd);
+      ret = SCSI_Read10(pdev, lun, cmd);
+      break;
+
+    case SCSI_READ12:
+      ret = SCSI_Read12(pdev, lun, cmd);
       break;
 
     case SCSI_WRITE10:
-    SCSI_Write10(pdev, lun, cmd);
+      ret = SCSI_Write10(pdev, lun, cmd);
+      break;
+
+    case SCSI_WRITE12:
+      ret = SCSI_Write12(pdev, lun, cmd);
       break;
 
     case SCSI_VERIFY10:
-    SCSI_Verify10(pdev, lun, cmd);
+      ret = SCSI_Verify10(pdev, lun, cmd);
       break;
 
     default:
       SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, INVALID_CDB);
-    return -1;
+      hmsc->bot_status = USBD_BOT_STATUS_ERROR;
+      ret = -1;
+      break;
   }
-  return 0;
+
+  return ret;
 }
 
 
@@ -180,8 +210,14 @@ int8_t SCSI_ProcessCmd(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *cmd)
   */
 static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
+  UNUSED(params);
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   /* case 9 : Hi > D0 */
   if (hmsc->cbw.dDataLength != 0U)
   {
@@ -190,6 +226,13 @@ static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
     return -1;
   }
 
+  if (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED)
+  {
+    SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+    hmsc->bot_state = USBD_BOT_NO_DATA;
+    return -1;
+  }
+
   if (((USBD_StorageTypeDef *)pdev->pUserData)->IsReady(lun) != 0)
   {
     SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
@@ -202,6 +245,7 @@ static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
   return 0;
 }
 
+
 /**
   * @brief  SCSI_Inquiry
   *         Process Inquiry command
@@ -215,38 +259,52 @@ static int8_t  SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *par
   uint16_t len;
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
-  if (params[1] & 0x01U)/*Evpd is set*/
+  if (hmsc == NULL)
   {
-    len = LENGTH_INQUIRY_PAGE00;
-    hmsc->bot_data_length = len;
+    return -1;
+  }
 
-    while (len)
+  if (hmsc->cbw.dDataLength == 0U)
   {
-      len--;
-      hmsc->bot_data[len] = MSC_Page00_Inquiry_Data[len];
+    SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+    return -1;
+  }
+
+  if ((params[1] & 0x01U) != 0U) /* Evpd is set */
+  {
+    if (params[2] == 0U) /* Request for Supported Vital Product Data Pages*/
+    {
+      (void)SCSI_UpdateBotData(hmsc, MSC_Page00_Inquiry_Data, LENGTH_INQUIRY_PAGE00);
+    }
+    else if (params[2] == 0x80U) /* Request for VPD page 0x80 Unit Serial Number */
+    {
+      (void)SCSI_UpdateBotData(hmsc, MSC_Page80_Inquiry_Data, LENGTH_INQUIRY_PAGE80);
+    }
+    else /* Request Not supported */
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST,
+                     INVALID_FIELED_IN_COMMAND);
+
+      return -1;
     }
   }
   else
   {
-    pPage = (uint8_t *)(void *)&((USBD_StorageTypeDef *)pdev->pUserData)->pInquiry[lun * STANDARD_INQUIRY_DATA_LEN];
+    pPage = (uint8_t *) &((USBD_StorageTypeDef *)pdev->pUserData)->pInquiry[lun * STANDARD_INQUIRY_DATA_LEN];
     len = (uint16_t)pPage[4] + 5U;
 
     if (params[4] <= len)
     {
       len = params[4];
     }
-    hmsc->bot_data_length = len;
 
-    while (len)
-    {
-      len--;
-      hmsc->bot_data[len] = pPage[len];
-    }
+    (void)SCSI_UpdateBotData(hmsc, pPage, len);
   }
 
   return 0;
 }
 
+
 /**
   * @brief  SCSI_ReadCapacity10
   *         Process Read Capacity 10 command
@@ -256,15 +314,22 @@ static int8_t  SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *par
   */
 static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
+  UNUSED(params);
+  int8_t ret;
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
-  if(((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size) != 0)
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  ret = ((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size);
+
+  if ((ret != 0) || (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED))
   {
     SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
     return -1;
   }
-  else
-  {
 
   hmsc->bot_data[0] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >> 24);
   hmsc->bot_data[1] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >> 16);
@@ -277,9 +342,68 @@ static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_
   hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_size);
 
   hmsc->bot_data_length = 8U;
+
+  return 0;
+
+}
+
+
+/**
+  * @brief  SCSI_ReadCapacity16
+  *         Process Read Capacity 16 command
+  * @param  lun: Logical unit number
+  * @param  params: Command parameters
+  * @retval status
+  */
+static int8_t SCSI_ReadCapacity16(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
+{
+  UNUSED(params);
+  uint8_t idx;
+  int8_t ret;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  ret = ((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size);
+
+  if ((ret != 0) || (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED))
+  {
+    SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+    return -1;
+  }
+
+  hmsc->bot_data_length = ((uint32_t)params[10] << 24) |
+                          ((uint32_t)params[11] << 16) |
+                          ((uint32_t)params[12] <<  8) |
+                          (uint32_t)params[13];
+
+  for (idx = 0U; idx < hmsc->bot_data_length; idx++)
+  {
+    hmsc->bot_data[idx] = 0U;
+  }
+
+  hmsc->bot_data[4] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >> 24);
+  hmsc->bot_data[5] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >> 16);
+  hmsc->bot_data[6] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >>  8);
+  hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_nbr - 1U);
+
+  hmsc->bot_data[8] = (uint8_t)(hmsc->scsi_blk_size >>  24);
+  hmsc->bot_data[9] = (uint8_t)(hmsc->scsi_blk_size >>  16);
+  hmsc->bot_data[10] = (uint8_t)(hmsc->scsi_blk_size >>  8);
+  hmsc->bot_data[11] = (uint8_t)(hmsc->scsi_blk_size);
+
+  hmsc->bot_data_length = ((uint32_t)params[10] << 24) |
+                          ((uint32_t)params[11] << 16) |
+                          ((uint32_t)params[12] <<  8) |
+                          (uint32_t)params[13];
+
   return 0;
 }
-}
+
+
 /**
   * @brief  SCSI_ReadFormatCapacity
   *         Process Read Format Capacity command
@@ -289,24 +413,31 @@ static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_
   */
 static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
-
+  UNUSED(params);
   uint16_t blk_size;
   uint32_t blk_nbr;
   uint16_t i;
+  int8_t ret;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  ret = ((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &blk_nbr, &blk_size);
+
+  if ((ret != 0) || (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED))
+  {
+    SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+    return -1;
+  }
 
   for (i = 0U; i < 12U ; i++)
   {
     hmsc->bot_data[i] = 0U;
   }
 
-  if(((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &blk_nbr, &blk_size) != 0U)
-  {
-    SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
-    return -1;
-  }
-  else
-  {
   hmsc->bot_data[3] = 0x08U;
   hmsc->bot_data[4] = (uint8_t)((blk_nbr - 1U) >> 24);
   hmsc->bot_data[5] = (uint8_t)((blk_nbr - 1U) >> 16);
@@ -319,9 +450,11 @@ static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, ui
   hmsc->bot_data[11] = (uint8_t)(blk_size);
 
   hmsc->bot_data_length = 12U;
+
   return 0;
 }
-}
+
+
 /**
   * @brief  SCSI_ModeSense6
   *         Process Mode Sense6 command
@@ -331,18 +464,26 @@ static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, ui
   */
 static int8_t SCSI_ModeSense6(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
+  UNUSED(lun);
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-  uint16_t len = 8U;
-  hmsc->bot_data_length = len;
+  uint16_t len = MODE_SENSE6_LEN;
 
-  while (len)
+  if (hmsc == NULL)
   {
-    len--;
-    hmsc->bot_data[len] = MSC_Mode_Sense6_data[len];
+    return -1;
   }
+
+  if (params[4] <= len)
+  {
+    len = params[4];
+  }
+
+  (void)SCSI_UpdateBotData(hmsc, MSC_Mode_Sense6_data, len);
+
   return 0;
 }
 
+
 /**
   * @brief  SCSI_ModeSense10
   *         Process Mode Sense10 command
@@ -352,20 +493,26 @@ static int8_t SCSI_ModeSense6 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *
   */
 static int8_t SCSI_ModeSense10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
-  uint16_t len = 8U;
+  UNUSED(lun);
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+  uint16_t len = MODE_SENSE10_LEN;
 
-  hmsc->bot_data_length = len;
-
-  while (len)
+  if (hmsc == NULL)
   {
-    len--;
-    hmsc->bot_data[len] = MSC_Mode_Sense10_data[len];
+    return -1;
   }
 
+  if (params[8] <= len)
+  {
+    len = params[8];
+  }
+
+  (void)SCSI_UpdateBotData(hmsc, MSC_Mode_Sense10_data, len);
+
   return 0;
 }
 
+
 /**
   * @brief  SCSI_RequestSense
   *         Process Request Sense command
@@ -373,12 +520,23 @@ static int8_t SCSI_ModeSense10 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
   * @param  params: Command parameters
   * @retval status
   */
-
 static int8_t SCSI_RequestSense(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
+  UNUSED(lun);
   uint8_t i;
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  if (hmsc->cbw.dDataLength == 0U)
+  {
+    SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+    return -1;
+  }
+
   for (i = 0U; i < REQUEST_SENSE_DATA_LEN; i++)
   {
     hmsc->bot_data[i] = 0U;
@@ -387,11 +545,11 @@ static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
   hmsc->bot_data[0] = 0x70U;
   hmsc->bot_data[7] = REQUEST_SENSE_DATA_LEN - 6U;
 
-  if((hmsc->scsi_sense_head != hmsc->scsi_sense_tail)) {
-
-    hmsc->bot_data[2]     = hmsc->scsi_sense[hmsc->scsi_sense_head].Skey;
-    hmsc->bot_data[12]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASCQ;
-    hmsc->bot_data[13]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASC;
+  if ((hmsc->scsi_sense_head != hmsc->scsi_sense_tail))
+  {
+    hmsc->bot_data[2] = (uint8_t)hmsc->scsi_sense[hmsc->scsi_sense_head].Skey;
+    hmsc->bot_data[12] = (uint8_t)hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASC;
+    hmsc->bot_data[13] = (uint8_t)hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASCQ;
     hmsc->scsi_sense_head++;
 
     if (hmsc->scsi_sense_head == SENSE_LIST_DEEPTH)
@@ -399,36 +557,49 @@ static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t
       hmsc->scsi_sense_head = 0U;
     }
   }
+
   hmsc->bot_data_length = REQUEST_SENSE_DATA_LEN;
 
   if (params[4] <= REQUEST_SENSE_DATA_LEN)
   {
     hmsc->bot_data_length = params[4];
   }
+
   return 0;
 }
 
+
 /**
   * @brief  SCSI_SenseCode
   *         Load the last error code in the error list
   * @param  lun: Logical unit number
   * @param  sKey: Sense Key
-* @param  ASC: Additional Sense Key
+  * @param  ASC: Additional Sense Code
   * @retval none
 
   */
 void SCSI_SenseCode(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t sKey, uint8_t ASC)
 {
+  UNUSED(lun);
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return;
+  }
+
   hmsc->scsi_sense[hmsc->scsi_sense_tail].Skey = sKey;
-  hmsc->scsi_sense[hmsc->scsi_sense_tail].w.ASC = ASC << 8;
+  hmsc->scsi_sense[hmsc->scsi_sense_tail].w.b.ASC = ASC;
+  hmsc->scsi_sense[hmsc->scsi_sense_tail].w.b.ASCQ = 0U;
   hmsc->scsi_sense_tail++;
+
   if (hmsc->scsi_sense_tail == SENSE_LIST_DEEPTH)
   {
     hmsc->scsi_sense_tail = 0U;
   }
 }
+
+
 /**
   * @brief  SCSI_StartStopUnit
   *         Process Start Stop Unit command
@@ -438,11 +609,75 @@ void SCSI_SenseCode(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t sKey, uint8_
   */
 static int8_t SCSI_StartStopUnit(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
+  UNUSED(lun);
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  if ((hmsc->scsi_medium_state == SCSI_MEDIUM_LOCKED) && ((params[4] & 0x3U) == 2U))
+  {
+    SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, INVALID_FIELED_IN_COMMAND);
+
+    return -1;
+  }
+
+  if ((params[4] & 0x3U) == 0x1U) /* START=1 */
+  {
+    hmsc->scsi_medium_state = SCSI_MEDIUM_UNLOCKED;
+  }
+  else if ((params[4] & 0x3U) == 0x2U) /* START=0 and LOEJ Load Eject=1 */
+  {
+    hmsc->scsi_medium_state = SCSI_MEDIUM_EJECTED;
+  }
+  else if ((params[4] & 0x3U) == 0x3U) /* START=1 and LOEJ Load Eject=1 */
+  {
+    hmsc->scsi_medium_state = SCSI_MEDIUM_UNLOCKED;
+  }
+  else
+  {
+    /* .. */
+  }
   hmsc->bot_data_length = 0U;
+
   return 0;
 }
 
+
+/**
+  * @brief  SCSI_AllowPreventRemovable
+  *         Process Allow Prevent Removable medium command
+  * @param  lun: Logical unit number
+  * @param  params: Command parameters
+  * @retval status
+  */
+static int8_t SCSI_AllowPreventRemovable(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
+{
+  UNUSED(lun);
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  if (params[4] == 0U)
+  {
+    hmsc->scsi_medium_state = SCSI_MEDIUM_UNLOCKED;
+  }
+  else
+  {
+    hmsc->scsi_medium_state = SCSI_MEDIUM_LOCKED;
+  }
+
+  hmsc->bot_data_length = 0U;
+
+  return 0;
+}
+
+
 /**
   * @brief  SCSI_Read10
   *         Process Read10 command
@@ -454,6 +689,11 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
   {
     /* case 10 : Ho <> Di */
@@ -463,6 +703,13 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params
       return -1;
     }
 
+    if (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED)
+    {
+      SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+
+      return -1;
+    }
+
     if (((USBD_StorageTypeDef *)pdev->pUserData)->IsReady(lun) != 0)
     {
       SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
@@ -482,7 +729,73 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params
       return -1; /* error */
     }
 
+    /* cases 4,5 : Hi <> Dn */
+    if (hmsc->cbw.dDataLength != (hmsc->scsi_blk_len * hmsc->scsi_blk_size))
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
     hmsc->bot_state = USBD_BOT_DATA_IN;
+  }
+  hmsc->bot_data_length = MSC_MEDIA_PACKET;
+
+  return SCSI_ProcessRead(pdev, lun);
+}
+
+
+/**
+  * @brief  SCSI_Read12
+  *         Process Read12 command
+  * @param  lun: Logical unit number
+  * @param  params: Command parameters
+  * @retval status
+  */
+static int8_t SCSI_Read12(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
+  {
+    /* case 10 : Ho <> Di */
+    if ((hmsc->cbw.bmFlags & 0x80U) != 0x80U)
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
+    if (hmsc->scsi_medium_state == SCSI_MEDIUM_EJECTED)
+    {
+      SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+      return -1;
+    }
+
+    if (((USBD_StorageTypeDef *)pdev->pUserData)->IsReady(lun) != 0)
+    {
+      SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+      return -1;
+    }
+
+    hmsc->scsi_blk_addr = ((uint32_t)params[2] << 24) |
+                          ((uint32_t)params[3] << 16) |
+                          ((uint32_t)params[4] <<  8) |
+                          (uint32_t)params[5];
+
+    hmsc->scsi_blk_len = ((uint32_t)params[6] << 24) |
+                         ((uint32_t)params[7] << 16) |
+                         ((uint32_t)params[8] << 8) |
+                         (uint32_t)params[9];
+
+    if (SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr,
+                               hmsc->scsi_blk_len) < 0)
+    {
+      return -1; /* error */
+    }
 
     /* cases 4,5 : Hi <> Dn */
     if (hmsc->cbw.dDataLength != (hmsc->scsi_blk_len * hmsc->scsi_blk_size))
@@ -490,12 +803,15 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params
       SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
       return -1;
     }
+
+    hmsc->bot_state = USBD_BOT_DATA_IN;
   }
   hmsc->bot_data_length = MSC_MEDIA_PACKET;
 
   return SCSI_ProcessRead(pdev, lun);
 }
 
+
 /**
   * @brief  SCSI_Write10
   *         Process Write10 command
@@ -503,14 +819,24 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params
   * @param  params: Command parameters
   * @retval status
   */
-
 static int8_t SCSI_Write10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
   uint32_t len;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
   {
+    if (hmsc->cbw.dDataLength == 0U)
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
     /* case 8 : Hi <> Do */
     if ((hmsc->cbw.bmFlags & 0x80U) == 0x80U)
     {
@@ -560,12 +886,102 @@ static int8_t SCSI_Write10 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *pa
 
     /* Prepare EP to receive first data packet */
     hmsc->bot_state = USBD_BOT_DATA_OUT;
-    USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
+    (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
   }
   else /* Write Process ongoing */
   {
     return SCSI_ProcessWrite(pdev, lun);
   }
+
+  return 0;
+}
+
+
+/**
+  * @brief  SCSI_Write12
+  *         Process Write12 command
+  * @param  lun: Logical unit number
+  * @param  params: Command parameters
+  * @retval status
+  */
+static int8_t SCSI_Write12(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
+  uint32_t len;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
+  {
+    if (hmsc->cbw.dDataLength == 0U)
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
+    /* case 8 : Hi <> Do */
+    if ((hmsc->cbw.bmFlags & 0x80U) == 0x80U)
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
+    /* Check whether Media is ready */
+    if (((USBD_StorageTypeDef *)pdev->pUserData)->IsReady(lun) != 0)
+    {
+      SCSI_SenseCode(pdev, lun, NOT_READY, MEDIUM_NOT_PRESENT);
+      hmsc->bot_state = USBD_BOT_NO_DATA;
+      return -1;
+    }
+
+    /* Check If media is write-protected */
+    if (((USBD_StorageTypeDef *)pdev->pUserData)->IsWriteProtected(lun) != 0)
+    {
+      SCSI_SenseCode(pdev, lun, NOT_READY, WRITE_PROTECTED);
+      hmsc->bot_state = USBD_BOT_NO_DATA;
+      return -1;
+    }
+
+    hmsc->scsi_blk_addr = ((uint32_t)params[2] << 24) |
+                          ((uint32_t)params[3] << 16) |
+                          ((uint32_t)params[4] << 8) |
+                          (uint32_t)params[5];
+
+    hmsc->scsi_blk_len = ((uint32_t)params[6] << 24) |
+                         ((uint32_t)params[7] << 16) |
+                         ((uint32_t)params[8] << 8) |
+                         (uint32_t)params[9];
+
+    /* check if LBA address is in the right range */
+    if (SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr,
+                               hmsc->scsi_blk_len) < 0)
+    {
+      return -1; /* error */
+    }
+
+    len = hmsc->scsi_blk_len * hmsc->scsi_blk_size;
+
+    /* cases 3,11,13 : Hn,Ho <> D0 */
+    if (hmsc->cbw.dDataLength != len)
+    {
+      SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
+      return -1;
+    }
+
+    len = MIN(len, MSC_MEDIA_PACKET);
+
+    /* Prepare EP to receive first data packet */
+    hmsc->bot_state = USBD_BOT_DATA_OUT;
+    (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
+  }
+  else /* Write Process ongoing */
+  {
+    return SCSI_ProcessWrite(pdev, lun);
+  }
+
   return 0;
 }
 
@@ -577,23 +993,28 @@ static int8_t SCSI_Write10 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *pa
   * @param  params: Command parameters
   * @retval status
   */
-
 static int8_t SCSI_Verify10(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   if ((params[1] & 0x02U) == 0x02U)
   {
     SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, INVALID_FIELED_IN_COMMAND);
     return -1; /* Error, Verify Mode Not supported*/
   }
 
-  if(SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr,
-                            hmsc->scsi_blk_len) < 0)
+  if (SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr, hmsc->scsi_blk_len) < 0)
   {
     return -1; /* error */
   }
+
   hmsc->bot_data_length = 0U;
+
   return 0;
 }
 
@@ -610,11 +1031,17 @@ static int8_t SCSI_CheckAddressRange (USBD_HandleTypeDef *pdev, uint8_t lun,
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr)
   {
     SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, ADDRESS_OUT_OF_RANGE);
     return -1;
   }
+
   return 0;
 }
 
@@ -629,10 +1056,14 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
   uint32_t len = hmsc->scsi_blk_len * hmsc->scsi_blk_size;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   len = MIN(len, MSC_MEDIA_PACKET);
 
-  if( ((USBD_StorageTypeDef *)pdev->pUserData)->Read(lun,
-                              hmsc->bot_data,
+  if (((USBD_StorageTypeDef *)pdev->pUserData)->Read(lun, hmsc->bot_data,
                                                      hmsc->scsi_blk_addr,
                                                      (len / hmsc->scsi_blk_size)) < 0)
   {
@@ -640,7 +1071,7 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
     return -1;
   }
 
-  USBD_LL_Transmit (pdev, MSC_EPIN_ADDR, hmsc->bot_data, len);
+  (void)USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, hmsc->bot_data, len);
 
   hmsc->scsi_blk_addr += (len / hmsc->scsi_blk_size);
   hmsc->scsi_blk_len -= (len / hmsc->scsi_blk_size);
@@ -652,6 +1083,7 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
   {
     hmsc->bot_state = USBD_BOT_LAST_DATA_IN;
   }
+
   return 0;
 }
 
@@ -661,12 +1093,16 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
   * @param  lun: Logical unit number
   * @retval status
   */
-
 static int8_t SCSI_ProcessWrite(USBD_HandleTypeDef *pdev, uint8_t lun)
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
   uint32_t len = hmsc->scsi_blk_len * hmsc->scsi_blk_size;
 
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
   len = MIN(len, MSC_MEDIA_PACKET);
 
   if (((USBD_StorageTypeDef *)pdev->pUserData)->Write(lun, hmsc->bot_data,
@@ -674,7 +1110,6 @@ static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)
                                                       (len / hmsc->scsi_blk_size)) < 0)
   {
     SCSI_SenseCode(pdev, lun, HARDWARE_ERROR, WRITE_FAULT);
-
     return -1;
   }
 
@@ -691,8 +1126,39 @@ static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)
   else
   {
     len = MIN((hmsc->scsi_blk_len * hmsc->scsi_blk_size), MSC_MEDIA_PACKET);
+
     /* Prepare EP to Receive next packet */
-    USBD_LL_PrepareReceive (pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
+    (void)USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
+  }
+
+  return 0;
+}
+
+
+/**
+  * @brief  SCSI_UpdateBotData
+  *         fill the requested Data to transmit buffer
+  * @param  hmsc handler
+  * @param  pBuff: Data buffer
+  * @param  length: Data length
+  * @retval status
+  */
+static int8_t SCSI_UpdateBotData(USBD_MSC_BOT_HandleTypeDef *hmsc,
+                                 uint8_t *pBuff, uint16_t length)
+{
+  uint16_t len = length;
+
+  if (hmsc == NULL)
+  {
+    return -1;
+  }
+
+  hmsc->bot_data_length = len;
+
+  while (len != 0U)
+  {
+    len--;
+    hmsc->bot_data[len] = pBuff[len];
   }
 
   return 0;

Class/MSC/Src/usbd_msc_storage_template.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,34 +35,30 @@
 /* Extern function prototypes ------------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 
-#define STORAGE_LUN_NBR                  1
-#define STORAGE_BLK_NBR                  0x10000
-#define STORAGE_BLK_SIZ                  0x200
+#define STORAGE_LUN_NBR                  1U
+#define STORAGE_BLK_NBR                  0x10000U
+#define STORAGE_BLK_SIZ                  0x200U
 
 int8_t STORAGE_Init(uint8_t lun);
 
-int8_t STORAGE_GetCapacity (uint8_t lun,
-                           uint32_t *block_num,
+int8_t STORAGE_GetCapacity(uint8_t lun, uint32_t *block_num,
                            uint16_t *block_size);
 
 int8_t  STORAGE_IsReady(uint8_t lun);
 
 int8_t  STORAGE_IsWriteProtected(uint8_t lun);
 
-int8_t STORAGE_Read (uint8_t lun,
-                        uint8_t *buf,
-                        uint32_t blk_addr,
+int8_t STORAGE_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr,
                     uint16_t blk_len);
 
-int8_t STORAGE_Write (uint8_t lun,
-                        uint8_t *buf,
-                        uint32_t blk_addr,
+int8_t STORAGE_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr,
                      uint16_t blk_len);
 
 int8_t STORAGE_GetMaxLun(void);
 
 /* USB Mass storage Standard Inquiry Data */
-int8_t  STORAGE_Inquirydata[] = {//36
+int8_t  STORAGE_Inquirydata[] =  /* 36 */
+{
 
   /* LUN 0 */
   0x00,
@@ -148,10 +144,8 @@ int8_t  STORAGE_IsWriteProtected (uint8_t lun)
   * Output         : None.
   * Return         : None.
   *******************************************************************************/
-int8_t STORAGE_Read (uint8_t lun,
-                 uint8_t *buf,
-                 uint32_t blk_addr,
-                 uint16_t blk_len)
+int8_t STORAGE_Read(uint8_t lun, uint8_t *buf,
+                    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,
-                  uint8_t *buf,
-                  uint32_t blk_addr,
-                  uint16_t blk_len)
+int8_t STORAGE_Write(uint8_t lun, uint8_t *buf,
+                     uint32_t blk_addr, uint16_t blk_len)
 {
   return (0);
 }

Class/Printer/Inc/usbd_printer.h

@@ -0,0 +1,164 @@
+/**
+  ******************************************************************************
+  * @file    usbd_printer.h
+  * @author  MCD Application Team
+  * @brief   header file for the usbd_printer.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 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_PRNT_H
+#define __USB_PRNT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup usbd_PRNT
+  * @brief This file is the Header file for usbd_PRNT.c
+  * @{
+  */
+
+
+/** @defgroup usbd_PRNT_Exported_Defines
+  * @{
+  */
+#ifndef PRNT_IN_EP
+#define PRNT_IN_EP                                   0x81U  /* Default: EP1 for data IN */
+#endif /* PRNT_IN_EP */
+
+#ifndef PRNT_OUT_EP
+#define PRNT_OUT_EP                                  0x01U  /* Default: EP1 for data OUT */
+#endif /* PRNT_OUT_EP */
+
+#ifndef PRNT_DATA_HS_MAX_PACKET_SIZE
+#define PRNT_DATA_HS_MAX_PACKET_SIZE                 512U  /* Endpoint IN & OUT Packet size */
+#endif /* PRNT_DATA_HS_MAX_PACKET_SIZE */
+
+#ifndef PRNT_DATA_FS_MAX_PACKET_SIZE
+#define PRNT_DATA_FS_MAX_PACKET_SIZE                 64U   /* Endpoint IN & OUT Packet size */
+#endif /* PRNT_DATA_FS_MAX_PACKET_SIZE */
+
+#define USB_PRNT_CONFIG_DESC_SIZ                     32U
+#define PRNT_DATA_HS_IN_PACKET_SIZE                  PRNT_DATA_HS_MAX_PACKET_SIZE
+#define PRNT_DATA_HS_OUT_PACKET_SIZE                 PRNT_DATA_HS_MAX_PACKET_SIZE
+
+#define PRNT_DATA_FS_IN_PACKET_SIZE                  PRNT_DATA_FS_MAX_PACKET_SIZE
+#define PRNT_DATA_FS_OUT_PACKET_SIZE                 PRNT_DATA_FS_MAX_PACKET_SIZE
+
+/*---------------------------------------------------------------------*/
+/*  PRNT definitions                                                    */
+/*---------------------------------------------------------------------*/
+#define PRNT_STATUS_PAPER_EMPTY                      0x10U
+#define PRNT_STATUS_SELECTED                         0x08U
+#define PRNT_STATUS_NO_ERROR                         0x00U
+
+#define USB_PRNT_SUBCLASS                            0x01U
+
+#define USB_PRNT_UNIDIRECTIONAL                      0x01U
+#define USB_PRNT_BIDIRECTIONAL                       0x02U
+
+/* USB PRNT Request types */
+#define PRNT_GET_DEVICE_ID                           0x00U
+#define PRNT_GET_PORT_STATUS                         0x01U
+#define PRNT_SOFT_RESET                              0x02U
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CORE_Exported_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+typedef struct _USBD_PRNT_Itf
+{
+  int8_t (* Init)(void);
+  int8_t (* DeInit)(void);
+  int8_t (* Control_req)(uint8_t req, uint8_t *pbuf, uint16_t *length);
+  int8_t (* Receive)(uint8_t *Buf, uint32_t *Len);
+
+} USBD_PRNT_ItfTypeDef;
+
+typedef struct
+{
+  uint32_t data[PRNT_DATA_HS_MAX_PACKET_SIZE / 4U];  /* Force 32-bit alignment */
+  uint8_t CmdOpCode;
+  uint8_t CmdLength;
+  uint8_t *RxBuffer;
+  uint8_t *TxBuffer;
+  uint32_t RxLength;
+  uint32_t TxLength;
+
+  __IO uint32_t TxState;
+  __IO uint32_t RxState;
+}
+USBD_PRNT_HandleTypeDef;
+
+
+
+/** @defgroup USBD_CORE_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CORE_Exported_Variables
+  * @{
+  */
+
+extern USBD_ClassTypeDef   USBD_PRNT;
+#define USBD_PRNT_CLASS    &USBD_PRNT
+/**
+  * @}
+  */
+
+/** @defgroup USB_CORE_Exported_Functions
+  * @{
+  */
+uint8_t  USBD_PRNT_RegisterInterface(USBD_HandleTypeDef *pdev, USBD_PRNT_ItfTypeDef *fops);
+uint8_t  USBD_PRNT_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
+uint8_t  USBD_PRNT_ReceivePacket(USBD_HandleTypeDef *pdev);
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __USB_PRNT_H */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/Printer/Inc/usbd_printer_if_template.h

@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    usbd_printer_if_template.h
+  * @author  MCD Application Team
+  * @brief   Header for usbd_PRNT_if_template.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 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:
+  *                      http://www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_PRNT_IF_TEMPLATE_H
+#define __USBD_PRNT_IF_TEMPLATE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_printer.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+extern USBD_PRNT_ItfTypeDef  USBD_PRNT_Template_fops;
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_PRNT_IF_TEMPLATE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/Printer/Src/usbd_printer.c

@@ -0,0 +1,673 @@
+/**
+  ******************************************************************************
+  * @file    usbd_printer.c
+  * @author  MCD Application Team
+  * @brief   This file provides the high layer firmware functions to manage the
+  *          following functionalities of the USB printer Class:
+  *           - Initialization and Configuration of high and low layer
+  *           - Enumeration as printer Device (and enumeration for each implemented memory interface)
+  *           - OUT data transfer
+  *           - Command OUT transfer (class requests management)
+  *           - Error management
+  *
+  *  @verbatim
+  *
+  *          ===================================================================
+  *                                PRINTER Class Driver Description
+  *          ===================================================================
+  *           This driver manages the "Universal Serial Bus Class Definitions for Communications Devices
+  *           Revision 1.2 November 16, 2007" and the sub-protocol specification of "Universal Serial Bus
+  *           printer Class Subclass Specification for PSTN Devices Revision 1.2 February 9, 2007"
+  *           This driver implements the following aspects of the specification:
+  *             - Device descriptor management
+  *             - Configuration descriptor management
+  *             - Enumeration as printer device with 2 data endpoints (IN and OUT)
+  *             - Control Requests management (PRNT_GET_DEVICE_ID,PRNT_GET_PORT_STATUS,PRNT_SOFT_RESET)
+  *             - protocol USB_PRNT_BIDIRECTIONAL
+  *
+  *
+  *
+  *           These aspects may be enriched or modified for a specific user application.
+  *
+  *            This driver doesn't implement the following aspects of the specification
+  *            (but it is possible to manage these features with some modifications on this driver):
+  *             - Any class-specific aspect relative to communication classes should be managed by user application.
+  *             - All communication classes other than PSTN are not managed
+  *
+  *  @endverbatim
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 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
+  *
+  ******************************************************************************
+  */
+
+/* BSPDependencies
+- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
+- "stm32xxxxx_{eval}{discovery}_io.c"
+EndBSPDependencies */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_printer.h"
+#include "usbd_ctlreq.h"
+
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup USBD_PRNT
+  * @brief usbd core module
+  * @{
+  */
+
+/** @defgroup USBD_PRNT_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+static uint32_t usbd_PRNT_altset = 0U;
+
+/** @defgroup USBD_PRNT_Private_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup USBD_PRNT_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_PRNT_Private_FunctionPrototypes
+  * @{
+  */
+static uint8_t USBD_PRNT_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_PRNT_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+static uint8_t USBD_PRNT_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
+static uint8_t USBD_PRNT_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum);
+static uint8_t USBD_PRNT_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum);
+
+static uint8_t *USBD_PRNT_GetFSCfgDesc(uint16_t *length);
+static uint8_t *USBD_PRNT_GetHSCfgDesc(uint16_t *length);
+static uint8_t *USBD_PRNT_GetOtherSpeedCfgDesc(uint16_t *length);
+static uint8_t *USBD_PRNT_GetOtherSpeedCfgDesc(uint16_t *length);
+uint8_t *USBD_PRNT_GetDeviceQualifierDescriptor(uint16_t *length);
+
+/* USB Standard Device Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_PRNT_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
+{
+  USB_LEN_DEV_QUALIFIER_DESC,
+  USB_DESC_TYPE_DEVICE_QUALIFIER,
+  0x00,
+  0x02,
+  0x00,
+  0x00,
+  0x00,
+  0x40,
+  0x01,
+  0x00,
+};
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_PRNT_Private_Variables
+  * @{
+  */
+
+/* PRNT interface class callbacks structure */
+USBD_ClassTypeDef USBD_PRNT =
+{
+  USBD_PRNT_Init,
+  USBD_PRNT_DeInit,
+  USBD_PRNT_Setup,
+  NULL,
+  NULL,
+  USBD_PRNT_DataIn,
+  USBD_PRNT_DataOut,
+  NULL,
+  NULL,
+  NULL,
+  USBD_PRNT_GetHSCfgDesc,
+  USBD_PRNT_GetFSCfgDesc,
+  USBD_PRNT_GetOtherSpeedCfgDesc,
+  USBD_PRNT_GetDeviceQualifierDescriptor,
+};
+
+/* USB PRNT device Configuration Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_PRNT_CfgHSDesc[] __ALIGN_END =
+{
+  /*Configuration Descriptor*/
+  0x09,                                /* bLength: Configuration Descriptor size */
+  USB_DESC_TYPE_CONFIGURATION,         /* bDescriptorType: Configuration */
+  USB_PRNT_CONFIG_DESC_SIZ,            /* wTotalLength:no of returned bytes */
+  0x00,
+  0x01,                                /* bNumInterfaces: 1 interface */
+  0x01,                                /* bConfigurationValue: Configuration value */
+  0x00,                                /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                /* bmAttributes: Self Powered according to user configuration */
+#else
+  0x80,                                /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                      /* MaxPower in mA */
+
+  /* Interface Descriptor */
+  0x09,                                /* bLength: Interface Descriptor size */
+  USB_DESC_TYPE_INTERFACE,             /* bDescriptorType: Interface */
+  0x00,                                /* bInterfaceNumber: Number of Interface */
+  0x00,                                /* bAlternateSetting: Alternate setting */
+  0x02,                                /* bNumEndpoints: 2 endpoints used */
+  0x07,                                /* bInterfaceClass: Communication Interface Class */
+  0x01,                                /* bInterfaceSubClass: Abstract Control Model */
+  USB_PRNT_BIDIRECTIONAL,              /* bDeviceProtocol */
+  0x00,                                /* iInterface */
+
+  /* Endpoint IN Descriptor */
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_IN_EP,                          /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_HS_IN_PACKET_SIZE), /* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_HS_IN_PACKET_SIZE),
+  0x00,                                /* bInterval */
+
+  /* Endpoint OUT Descriptor */
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_OUT_EP,                         /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_HS_OUT_PACKET_SIZE),/* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_HS_OUT_PACKET_SIZE),
+  0x00                                 /* bInterval */
+};
+
+
+/* USB PRNT device Configuration Descriptor */
+__ALIGN_BEGIN static uint8_t USBD_PRNT_CfgFSDesc[] __ALIGN_END =
+{
+  /*Configuration Descriptor*/
+  0x09,                                /* bLength: Configuration Descriptor size */
+  USB_DESC_TYPE_CONFIGURATION,         /* bDescriptorType: Configuration */
+  USB_PRNT_CONFIG_DESC_SIZ,            /* wTotalLength:no of returned bytes */
+  0x00,
+  0x01,                                /* bNumInterfaces: 1 interface */
+  0x01,                                /* bConfigurationValue: Configuration value */
+  0x00,                                /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                /* bmAttributes: Self Powered according to user configuration */
+#else
+  0x80,                                /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                      /* MaxPower in mA */
+
+  /*Interface Descriptor */
+  0x09,                                /* bLength: Interface Descriptor size */
+  USB_DESC_TYPE_INTERFACE,             /* bDescriptorType: Interface */
+  0x00,                                /* bInterfaceNumber: Number of Interface */
+  0x00,                                /* bAlternateSetting: Alternate setting */
+  0x02,                                /* bNumEndpoints: 2 endpoints used */
+  0x07,                                /* bInterfaceClass: Communication Interface Class */
+  0x01,                                /* bInterfaceSubClass: Abstract Control Model */
+  USB_PRNT_BIDIRECTIONAL,              /* bDeviceProtocol */
+  0x00,                                /* iInterface */
+
+  /*Endpoint IN Descriptor*/
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_IN_EP,                          /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_FS_IN_PACKET_SIZE), /* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_FS_IN_PACKET_SIZE),
+  0x00,                                /* bInterval */
+
+  /*Endpoint OUT Descriptor*/
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_OUT_EP,                         /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_FS_OUT_PACKET_SIZE),/* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_FS_OUT_PACKET_SIZE),
+  0x00                                 /* bInterval */
+};
+
+__ALIGN_BEGIN static uint8_t USBD_PRNT_OtherSpeedCfgDesc[] __ALIGN_END =
+{
+  /*Configuration Descriptor*/
+  0x09,                                /* bLength: Configuration Descriptor size */
+  USB_DESC_TYPE_CONFIGURATION,         /* bDescriptorType: Configuration */
+  USB_PRNT_CONFIG_DESC_SIZ,            /* wTotalLength:no of returned bytes */
+  0x00,
+  0x01,                                /* bNumInterfaces: 1 interface */
+  0x01,                                /* bConfigurationValue: Configuration value */
+  0x00,                                /* iConfiguration: Index of string descriptor describing the configuration */
+#if (USBD_SELF_POWERED == 1U)
+  0xC0,                                /* bmAttributes: Self Powered according to user configuration */
+#else
+  0x80,                                /* bmAttributes: Bus Powered according to user configuration */
+#endif
+  USBD_MAX_POWER,                      /* MaxPower in mA */
+
+  /*Interface Descriptor */
+  0x09,                                /* bLength: Interface Descriptor size */
+  USB_DESC_TYPE_INTERFACE,             /* bDescriptorType: Interface */
+  0x00,                                /* bInterfaceNumber: Number of Interface */
+  0x00,                                /* bAlternateSetting: Alternate setting */
+  0x02,                                /* bNumEndpoints: 2 endpoints used */
+  0x07,                                /* bInterfaceClass: Communication Interface Class */
+  0x01,                                /* bInterfaceSubClass: Abstract Control Model */
+  USB_PRNT_BIDIRECTIONAL,              /* bDeviceProtocol */
+  0x00,                                /* iInterface */
+
+  /*Endpoint IN Descriptor*/
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_IN_EP,                          /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_FS_IN_PACKET_SIZE), /* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_FS_IN_PACKET_SIZE),
+  0x00,                                /* bInterval */
+
+  /*Endpoint OUT Descriptor*/
+  0x07,                                /* bLength: Endpoint Descriptor size */
+  USB_DESC_TYPE_ENDPOINT,              /* bDescriptorType: Endpoint */
+  PRNT_OUT_EP,                         /* bEndpointAddress */
+  0x02,                                /* bmAttributes: Bulk */
+  LOBYTE(PRNT_DATA_FS_OUT_PACKET_SIZE),/* wMaxPacketSize */
+  HIBYTE(PRNT_DATA_FS_OUT_PACKET_SIZE),
+  0x00                                 /* bInterval */
+};
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_PRNT_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  USBD_PRNT_Init
+  *         Initialize the PRNT interface
+  * @param  pdev: device instance
+  * @param  cfgidx: Configuration index
+  * @retval status
+  */
+static uint8_t USBD_PRNT_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+{
+  UNUSED(cfgidx);
+
+  USBD_PRNT_HandleTypeDef *hPRNT;
+  uint16_t mps;
+  hPRNT = (USBD_PRNT_HandleTypeDef *)USBD_malloc(sizeof(USBD_PRNT_HandleTypeDef));
+
+  if (hPRNT == NULL)
+  {
+    pdev->pClassData = NULL;
+    return (uint8_t)USBD_EMEM;
+  }
+
+  /* Setup the pClassData pointer */
+  pdev->pClassData = (void *)hPRNT;
+
+  /* Setup the max packet size according to selected speed */
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
+  {
+    mps = PRNT_DATA_HS_IN_PACKET_SIZE;
+  }
+  else
+  {
+    mps = PRNT_DATA_FS_IN_PACKET_SIZE;
+  }
+
+  /* Open EP IN */
+  (void)USBD_LL_OpenEP(pdev, PRNT_IN_EP, USBD_EP_TYPE_BULK, mps);
+
+  /* Set endpoint as used */
+  pdev->ep_in[PRNT_IN_EP & 0xFU].is_used = 1U;
+
+  /* Open EP OUT */
+  (void)USBD_LL_OpenEP(pdev, PRNT_OUT_EP, USBD_EP_TYPE_BULK, mps);
+
+  /* Set endpoint as used */
+  pdev->ep_out[PRNT_OUT_EP & 0xFU].is_used = 1U;
+
+  /* Init  physical Interface components */
+  ((USBD_PRNT_ItfTypeDef *)pdev->pUserData)->Init();
+
+  /* Prepare Out endpoint to receive next packet */
+  (void)USBD_LL_PrepareReceive(pdev, PRNT_OUT_EP, hPRNT->RxBuffer, mps);
+
+  /* End of initialization phase */
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_PRNT_DeInit
+  *         DeInitialize the PRNT layer
+  * @param  pdev: device instance
+  * @param  cfgidx: Configuration index
+  * @retval status
+  */
+static uint8_t USBD_PRNT_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
+{
+  UNUSED(cfgidx);
+
+  /* Close EP IN */
+  (void)USBD_LL_CloseEP(pdev, PRNT_IN_EP);
+  pdev->ep_in[PRNT_IN_EP & 0xFU].is_used = 0U;
+
+  /* Close EP OUT */
+  (void)USBD_LL_CloseEP(pdev, PRNT_OUT_EP);
+  pdev->ep_out[PRNT_OUT_EP & 0xFU].is_used = 0U;
+
+  /* DeInit physical Interface components */
+  if (pdev->pClassData != NULL)
+  {
+    ((USBD_PRNT_ItfTypeDef *)pdev->pUserData)->DeInit();
+    (void)USBD_free(pdev->pClassData);
+    pdev->pClassData = NULL;
+  }
+
+  return 0U;
+}
+
+/**
+  * @brief  USBD_PRNT_Setup
+  *         Handle the PRNT specific requests
+  * @param  pdev: instance
+  * @param  req: usb requests
+  * @retval status
+  */
+static uint8_t USBD_PRNT_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+{
+  USBD_PRNT_HandleTypeDef   *hPRNT = (USBD_PRNT_HandleTypeDef *)pdev->pClassData;
+  USBD_PRNT_ItfTypeDef      *hPRNTitf = (USBD_PRNT_ItfTypeDef *)pdev->pUserData;
+
+  USBD_StatusTypeDef ret = USBD_OK;
+  uint16_t status_info = 0U;
+  uint16_t data_length;
+
+  switch (req->bmRequest & USB_REQ_TYPE_MASK)
+  {
+    case USB_REQ_TYPE_CLASS :
+      if (req->wLength != 0U)
+      {
+        data_length = MIN(req->wLength, PRNT_DATA_HS_MAX_PACKET_SIZE);
+
+        if ((req->bmRequest & 0x80U) != 0U)
+        {
+          /* Call the User class interface function to process the command */
+          hPRNTitf->Control_req(req->bRequest, (uint8_t *)hPRNT->data, &data_length);
+
+          /* Return the answer to host */
+          (void) USBD_CtlSendData(pdev, (uint8_t *)hPRNT->data, data_length);
+        }
+        else
+        {
+          /* Prepare for control data reception */
+          (void) USBD_CtlPrepareRx(pdev, (uint8_t *)hPRNT->data, data_length);
+        }
+      }
+      else
+      {
+        data_length = 0U;
+        hPRNTitf->Control_req(req->bRequest, (uint8_t *)req, &data_length);
+      }
+      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 *)&usbd_PRNT_altset, 1U);
+          }
+          else
+          {
+            USBD_CtlError(pdev, req);
+            ret = USBD_FAIL;
+          }
+          break;
+
+        case USB_REQ_SET_INTERFACE:
+          if (pdev->dev_state != USBD_STATE_CONFIGURED)
+          {
+            USBD_CtlError(pdev, req);
+            ret = USBD_FAIL;
+          }
+          break;
+
+        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_PRNT_DataIn
+  *         Data sent on non-control IN endpoint
+  * @param  pdev: device instance
+  * @param  epnum: endpoint number
+  * @retval status
+  */
+static uint8_t USBD_PRNT_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
+{
+  USBD_PRNT_HandleTypeDef *hPRNT = (USBD_PRNT_HandleTypeDef *)pdev->pClassData;
+  PCD_HandleTypeDef *hpcd = pdev->pData;
+
+  if (hPRNT == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
+  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 */
+    (void) USBD_LL_Transmit(pdev, epnum, NULL, 0U);
+  }
+  else
+  {
+    hPRNT->TxState = 0U;
+  }
+
+  return (uint8_t)USBD_OK;
+}
+/**
+  * @brief  USBD_PRNT_DataOut
+  *         Data received on non-control Out endpoint
+  * @param  pdev: device instance
+  * @param  epnum: endpoint number
+  * @retval status
+  */
+static uint8_t USBD_PRNT_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
+{
+  USBD_PRNT_HandleTypeDef *hPRNT = (USBD_PRNT_HandleTypeDef *)pdev->pClassData;
+
+  if (hPRNT == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
+  /* Get the received data length */
+  hPRNT->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 */
+  ((USBD_PRNT_ItfTypeDef *)pdev->pUserData)->Receive(hPRNT->RxBuffer, &hPRNT->RxLength);
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_PRNT_GetFSCfgDesc
+  *         Return configuration descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+static uint8_t *USBD_PRNT_GetFSCfgDesc(uint16_t *length)
+{
+  *length = (uint16_t) sizeof(USBD_PRNT_CfgFSDesc);
+  return USBD_PRNT_CfgFSDesc;
+}
+
+/**
+  * @brief  USBD_PRNT_GetHSCfgDesc
+  *         Return configuration descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+static uint8_t *USBD_PRNT_GetHSCfgDesc(uint16_t *length)
+{
+  *length = (uint16_t) sizeof(USBD_PRNT_CfgHSDesc);
+  return USBD_PRNT_CfgHSDesc;
+}
+
+/**
+  * @brief  USBD_PRNT_GetOtherSpeedCfgDesc
+  *         Return configuration descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+static uint8_t *USBD_PRNT_GetOtherSpeedCfgDesc(uint16_t *length)
+{
+  *length = (uint16_t) sizeof(USBD_PRNT_OtherSpeedCfgDesc);
+  return USBD_PRNT_OtherSpeedCfgDesc;
+}
+
+/**
+  * @brief  USBD_PRNT_GetDeviceQualifierDescriptor
+  *         return Device Qualifier descriptor
+  * @param  length : pointer data length
+  * @retval pointer to descriptor buffer
+  */
+uint8_t *USBD_PRNT_GetDeviceQualifierDescriptor(uint16_t *length)
+{
+  *length = (uint16_t)sizeof(USBD_PRNT_DeviceQualifierDesc);
+  return USBD_PRNT_DeviceQualifierDesc;
+}
+
+/**
+  * @brief  USBD_PRNT_RegisterInterface
+  * @param  pdev: device instance
+  * @param  fops: Interface callbacks
+  * @retval status
+  */
+uint8_t USBD_PRNT_RegisterInterface(USBD_HandleTypeDef *pdev, USBD_PRNT_ItfTypeDef *fops)
+{
+  /* Check if the fops pointer is valid */
+  if (fops == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
+  /* Setup the fops pointer */
+  pdev->pUserData = fops;
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_PRNT_SetRxBuffer
+  * @param  pdev: device instance
+  * @param  pbuff: Rx Buffer
+  * @retval status
+  */
+uint8_t USBD_PRNT_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff)
+{
+  USBD_PRNT_HandleTypeDef *hPRNT = (USBD_PRNT_HandleTypeDef *) pdev->pClassData;
+
+  hPRNT->RxBuffer = pbuff;
+
+  return (uint8_t)USBD_OK;
+}
+
+/**
+  * @brief  USBD_PRNT_ReceivePacket
+  *         prepare OUT Endpoint for reception
+  * @param  pdev: device instance
+  * @retval status
+  */
+uint8_t USBD_PRNT_ReceivePacket(USBD_HandleTypeDef *pdev)
+{
+  USBD_PRNT_HandleTypeDef *hPRNT = (USBD_PRNT_HandleTypeDef *)pdev->pClassData;
+
+  if (hPRNT == NULL)
+  {
+    return (uint8_t)USBD_FAIL;
+  }
+
+  if (pdev->dev_speed == USBD_SPEED_HIGH)
+  {
+    /* Prepare Out endpoint to receive next packet */
+    (void)USBD_LL_PrepareReceive(pdev, PRNT_OUT_EP, hPRNT->RxBuffer,
+                                 PRNT_DATA_HS_OUT_PACKET_SIZE);
+  }
+  else
+  {
+    /* Prepare Out endpoint to receive next packet */
+    (void)USBD_LL_PrepareReceive(pdev, PRNT_OUT_EP, hPRNT->RxBuffer,
+                                 PRNT_DATA_FS_OUT_PACKET_SIZE);
+  }
+
+  return (uint8_t)USBD_OK;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/Printer/Src/usbd_printer_if_template.c

@@ -0,0 +1,218 @@
+/**
+  ******************************************************************************
+  * @file    usbd_printer_if_template.c
+  * @author  MCD Application Team
+  * @brief   Generic media access Layer.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 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:
+  *                      http://www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_printer_if_template.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup USBD_PRNT
+  * @brief usbd core module
+  * @{
+  */
+
+/** @defgroup USBD_PRNT_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_PRNT_Private_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_PRNT_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_PRNT_Private_FunctionPrototypes
+  * @{
+  */
+
+static int8_t TEMPLATE_Init(void);
+static int8_t TEMPLATE_DeInit(void);
+static int8_t TEMPLATE_Control_req(uint8_t req, uint8_t *pbuf, uint16_t *length);
+static int8_t TEMPLATE_Receive(uint8_t *pbuf, uint32_t *Len);
+
+/*printer Private function prototypes*/
+void TEMPLATE_PRNT_PageEndManager(uint8_t *Buf, uint32_t Len);
+
+USBD_PRNT_ItfTypeDef USBD_PRNT_Template_fops =
+{
+  TEMPLATE_Init,
+  TEMPLATE_DeInit,
+  TEMPLATE_Control_req
+  TEMPLATE_Receive
+};
+
+static uint8_t PRNT_DEVICE_ID[DEVICE_ID_LEN] =
+{
+  0x00, 0x6D,
+  'M', 'A', 'N', 'U', 'F', 'A', 'C', 'T', 'U', 'R', 'E', 'R', ':',
+  'S', 'T', 'M', 'i', 'c', 'r', 'o', 'e', 'l', 'e', 'c', 't', 'r', 'o', 'n', 'i', 'c', 's', ';',
+  'C', 'O', 'M', 'M', 'A', 'N', 'D', ' ', 'S', 'E', 'T', ':',
+  'P', 'D', 'L', ',',  'P', 'C', 'P', ';',
+  'M', 'O', 'D', 'E', 'L', ':',
+  'U', 'S', 'B', 'P', 'r', 'i', 'n', 't', 'e', 'r', ';',
+  'C', 'O', 'M', 'M', 'E', 'N', 'T', ':',
+  'G', 'o', 'o', 'd', ' ', '!', ';',
+  'A', 'C', 'T', 'I', 'V', 'E', ' ', 'C', 'O', 'M', 'M', 'A', 'N', 'D', ' ', 'S', 'E', 'T', ':',
+  'P', 'C', 'P', ';'
+};
+
+/* Private functions ---------------------------------------------------------*/
+
+/**
+  * @brief  TEMPLATE_Init
+  *         Initializes the PRNT media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t TEMPLATE_Init(void)
+{
+  /*
+     Add your initialization code here
+  */
+  return (0);
+}
+
+/**
+  * @brief  TEMPLATE_DeInit
+  *         DeInitializes the PRNT media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t TEMPLATE_DeInit(void)
+{
+  /*
+     Add your deinitialization code here
+  */
+  return (0);
+}
+
+
+/**
+  * @brief  TEMPLATE_Receive
+  *         Data received over USB OUT endpoint are sent over PRNT interface
+  *         through this function.
+  *
+  *         @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
+  *         before transfer is complete on PRNT interface (ie. using DMA controller)
+  *         it will result in receiving more data while previous ones are still
+  *         not sent.
+  *
+  * @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_Receive(uint8_t *Buf, uint32_t *Len)
+{
+  UNUSED(Buf);
+  UNUSED(Len);
+
+  return (0);
+}
+
+
+/**
+  * @brief  TEMPLATE_PRNT_Itf_Control_req
+  *         Manage the  PRNT class requests
+  * @param  req: Command code
+  * @param  pbuf: Buffer containing command data (request parameters)
+  * @param  length: 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_PRNT_Itf_Control_req(uint8_t req, uint8_t *pbuf, uint16_t *length)
+{
+  uint32_t i = 0;
+
+  /* Check on the setup request value */
+  switch (req)
+  {
+    /* Get Printer Device ID request */
+    case PRNT_GET_DEVICE_ID:
+      /* Not using for loop here due to MISRA-C2012-Rule-16.1 */
+      while (i < sizeof(PRNT_DEVICE_ID))
+      {
+        pbuf[i] = PRNT_DEVICE_ID[i];
+        i++;
+      }
+      *length = i;
+      break;
+
+    /* Get Printer current status */
+    case PRNT_GET_PORT_STATUS:
+      pbuf[0] =  PRNT_STATUS_PAPER_EMPTY |
+                 PRNT_STATUS_SELECTED |
+                 PRNT_STATUS_NO_ERROR;
+
+      *length = 1U;
+      break;
+
+    /* Printer SOFT RESET request: cleanup pending tasks */
+    case PRNT_SOFT_RESET:
+      (void)f_close(&hSD.MyFile);
+      break;
+
+    default:
+      /* Unkown commands are not managed */
+      break;
+}
+
+/**
+* @brief TEMPLATE_PRNT_PageEndManager, defined by user
+* Call this function frequently to check if data is received.
+* @param Buf: Buffer of data to be received
+* @param Len: Number of data received (in bytes)
+*/
+void TEMPLATE_PRNT_PageEndManager(uint8_t *Buf, uint32_t Len)
+{
+  UNUSED(Buf);
+  UNUSED(Len);
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+

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
   *
   ******************************************************************************
   */
@@ -41,10 +41,10 @@
 /** @defgroup USBD_TEMPLATE_Exported_Defines
   * @{
   */
-#define TEMPLATE_EPIN_ADDR                 0x81
-#define TEMPLATE_EPIN_SIZE                 0x10
+#define TEMPLATE_EPIN_ADDR                 0x81U
+#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,
-                               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_GetCfgDesc (uint16_t *length);
-
-static uint8_t  *USBD_TEMPLATE_GetDeviceQualifierDesc (uint16_t *length);
-
+static uint8_t USBD_TEMPLATE_Init(USBD_HandleTypeDef *pdev, 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_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);
 /**
   * @}
   */
@@ -140,9 +126,9 @@ USBD_ClassTypeDef  USBD_TEMPLATE_ClassDriver =
 #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 */
+  0x09, /* bLength: Configuration Descriptor size */
   USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION, /* bDescriptorType: Configuration */
   USB_TEMPLATE_CONFIG_DESC_SIZ,
   /* wTotalLength: Bytes returned */
@@ -162,7 +148,7 @@ static uint8_t USBD_TEMPLATE_CfgDesc[USB_TEMPLATE_CONFIG_DESC_SIZ] =
 #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,
-                               uint8_t cfgidx)
+static uint8_t USBD_TEMPLATE_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
-  uint8_t ret = 0;
 
-
-  return ret;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -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,
-                                 uint8_t cfgidx)
+static uint8_t USBD_TEMPLATE_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -254,10 +236,9 @@ static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return ret;
+  return (uint8_t)ret;
 }
 
-
 /**
   * @brief  USBD_TEMPLATE_GetCfgDesc
   *         return configuration descriptor
@@ -266,7 +247,7 @@ static uint8_t  USBD_TEMPLATE_Setup (USBD_HandleTypeDef *pdev,
   */
 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;
 }
 
@@ -278,11 +259,10 @@ static uint8_t  *USBD_TEMPLATE_GetCfgDesc (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;
 }
 
-
 /**
   * @brief  USBD_TEMPLATE_DataIn
   *         handle data IN Stage
@@ -290,11 +270,10 @@ uint8_t  *USBD_TEMPLATE_DeviceQualifierDescriptor (uint16_t *length)
   * @param  epnum: endpoint index
   * @retval status
   */
-static uint8_t  USBD_TEMPLATE_DataIn (USBD_HandleTypeDef *pdev,
-                              uint8_t epnum)
+static uint8_t USBD_TEMPLATE_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -306,8 +285,9 @@ static uint8_t  USBD_TEMPLATE_DataIn (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
   *         handle EP0 TRx Ready event
@@ -317,8 +297,9 @@ static uint8_t  USBD_TEMPLATE_EP0_RxReady (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
   *         handle SOF event
@@ -328,8 +309,9 @@ static uint8_t  USBD_TEMPLATE_EP0_TxReady (USBD_HandleTypeDef *pdev)
 static uint8_t USBD_TEMPLATE_SOF(USBD_HandleTypeDef *pdev)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
+
 /**
   * @brief  USBD_TEMPLATE_IsoINIncomplete
   *         handle data ISO IN Incomplete event
@@ -340,8 +322,9 @@ static uint8_t  USBD_TEMPLATE_SOF (USBD_HandleTypeDef *pdev)
 static uint8_t USBD_TEMPLATE_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
+
 /**
   * @brief  USBD_TEMPLATE_IsoOutIncomplete
   *         handle data ISO OUT Incomplete event
@@ -352,7 +335,7 @@ static uint8_t  USBD_TEMPLATE_IsoINIncomplete (USBD_HandleTypeDef *pdev, uint8_t
 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 +344,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,
-                              uint8_t epnum)
+static uint8_t USBD_TEMPLATE_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
 {
 
-  return USBD_OK;
+  return (uint8_t)USBD_OK;
 }
 
 /**
@@ -376,7 +358,8 @@ static uint8_t  USBD_TEMPLATE_DataOut (USBD_HandleTypeDef *pdev,
   */
 uint8_t *USBD_TEMPLATE_GetDeviceQualifierDesc(uint16_t *length)
 {
-  *length = sizeof (USBD_TEMPLATE_DeviceQualifierDesc);
+  *length = (uint16_t)sizeof(USBD_TEMPLATE_DeviceQualifierDesc);
+
   return USBD_TEMPLATE_DeviceQualifierDesc;
 }
 

Class/VIDEO/Inc/usbd_video.h

@@ -0,0 +1,460 @@
+/**
+  ******************************************************************************
+  * @file    usbd_video.h
+  * @author  MCD Application Team
+  * @brief   header file for the usbd_video.c file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 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_VIDEO_H
+#define __USBD_VIDEO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_VIDEO
+  * @brief This file is the Header file for usbd_video.c
+  * @{
+  */
+
+
+/** @defgroup usbd_VIDEO_Exported_Defines
+  * @{
+  */
+
+/* USB Video device class specification version 1.10 */
+#ifdef UVC_1_0
+#define UVC_VERSION                                   0x0100U      /* UVC 1.0 */
+#else
+#define UVC_VERSION                                   0x0110U      /* UVC 1.1 */
+#endif
+
+/* bEndpointAddress in Endpoint Descriptor */
+#ifndef UVC_IN_EP
+#define UVC_IN_EP                                     0x81U
+#endif /* VIDEO_IN_EP */
+
+/* These defines shall be updated in the usbd_conf.h file */
+#ifndef UVC_WIDTH
+#define UVC_WIDTH                                     400U
+#endif /* UVC_WIDTH */
+
+#ifndef UVC_HEIGHT
+#define UVC_HEIGHT                                    240U
+#endif /* UVC_HEIGHT */
+
+#ifndef UVC_CAM_FPS_FS
+#define UVC_CAM_FPS_FS                                10U
+#endif /* UVC_CAM_FPS_FS */
+
+#ifndef UVC_CAM_FPS_HS
+#define UVC_CAM_FPS_HS                                5U
+#endif /* UVC_CAM_FPS_HS */
+
+#ifndef UVC_PACKET_SIZE
+#define UVC_PACKET_SIZE                               512U
+#endif /* UVC_PACKET_SIZE */
+
+#ifndef UVC_MAX_FRAME_SIZE
+#define UVC_MAX_FRAME_SIZE                            (UVC_WIDTH * UVC_HEIGHT * 16U / 2U)
+#endif /* UVC_MAX_FRAME_SIZE */
+
+#ifndef UVC_COLOR_PRIMARIE
+#define UVC_COLOR_PRIMARIE                            0x01U
+#endif /* UVC_COLOR_PRIMARIE */
+
+#ifndef UVC_TFR_CHARACTERISTICS
+#define UVC_TFR_CHARACTERISTICS                       0x01U
+#endif /* UVC_TFR_CHARACTERISTICS */
+
+#ifndef UVC_MATRIX_COEFFICIENTS
+#define UVC_MATRIX_COEFFICIENTS                       0x04U
+#endif /* UVC_MATRIX_COEFFICIENTS */
+
+#ifndef UVC_BITS_PER_PIXEL
+#define UVC_BITS_PER_PIXEL                            12U
+#endif /* UVC_BITS_PER_PIXEL */
+
+#define UVC_GUID_YUY2                                 0x32595559U
+#define UVC_GUID_NV12                                 0x3231564EU
+
+#ifndef UVC_UNCOMPRESSED_GUID
+#define UVC_UNCOMPRESSED_GUID                         UVC_GUID_NV12
+#endif /* UVC_UNCOMPRESSED_GUID */
+
+#define UVC_INTERVAL(n)                               (10000000U/(n))
+
+#define UVC_MIN_BIT_RATE(n)                           (UVC_WIDTH * UVC_HEIGHT * 16U * (n)) /* 16 bit */
+#define UVC_MAX_BIT_RATE(n)                           (UVC_WIDTH * UVC_HEIGHT * 16U * (n)) /* 16 bit */
+
+#define UVC_PACKETS_IN_FRAME(n)                       (UVC_MAX_FRAME_SIZE / (n))
+
+#ifndef UVC_ISO_FS_MPS
+#define UVC_ISO_FS_MPS                                256U
+#endif
+
+#ifndef UVC_ISO_HS_MPS
+#define UVC_ISO_HS_MPS                                512U
+#endif
+
+#ifndef UVC_HEADER_PACKET_CNT
+#define UVC_HEADER_PACKET_CNT                         0x01U
+#endif
+
+
+#define UVC_REQ_READ_MASK                             0x80U
+#define UVC_VC_IF_NUM                                 0x00U
+#define UVC_VS_IF_NUM                                 0x01U
+#define UVC_TOTAL_IF_NUM                              0x02U
+
+#ifdef USBD_UVC_FORMAT_UNCOMPRESSED
+#define UVC_CONFIG_DESC_SIZ                           (0x88U + 0x16U)
+#else
+#define UVC_CONFIG_DESC_SIZ                           0x88U
+#endif
+
+#define UVC_TOTAL_BUF_SIZE                            0x04U
+
+#define UVC_VC_EP_DESC_SIZE                           0x05U
+#define UVC_STREAMING_EP_DESC_SIZE                    0x07U
+#define UVC_EP_DESC_TYPE                              0x25U
+
+/* Video Interface Class Codes*/
+#define UVC_CC_VIDEO                                  0x0EU
+
+#define UVC_PLAY_STATUS_STOP                          0x00U
+#define UVC_PLAY_STATUS_READY                         0x01U
+#define UVC_PLAY_STATUS_STREAMING                     0x02U
+
+#ifndef WBVAL
+#define WBVAL(x) ((x) & 0xFFU),(((x) >> 8) & 0xFFU)
+#endif
+#ifndef DBVAL
+#define DBVAL(x) ((x)& 0xFFU),(((x) >> 8) & 0xFFU),(((x)>> 16) & 0xFFU),(((x) >> 24) & 0xFFU)
+#endif
+
+/* Video Interface Protocol Codes */
+#define PC_PROTOCOL_UNDEFINED                         0x00U
+
+#define VIDEO_VC_IF_HEADER_DESC_SIZE                  0x0DU
+#define VIDEO_IN_TERMINAL_DESC_SIZE                   0x08U
+#define VIDEO_OUT_TERMINAL_DESC_SIZE                  0x09U
+#define VIDEO_VS_IF_IN_HEADER_DESC_SIZE               0x0EU
+
+#define VS_FORMAT_UNCOMPRESSED_DESC_SIZE              0x1BU
+#define VS_FORMAT_MJPEG_DESC_SIZE                     0x0BU
+#define VS_FRAME_DESC_SIZE                            0x1EU
+#define VS_COLOR_MATCHING_DESC_SIZE                   0x06U
+
+#ifdef USBD_UVC_FORMAT_UNCOMPRESSED
+#define VS_FORMAT_DESC_SIZE                           VS_FORMAT_UNCOMPRESSED_DESC_SIZE
+#define VS_FORMAT_SUBTYPE                             VS_FORMAT_UNCOMPRESSED
+#define VS_FRAME_SUBTYPE                              VS_FRAME_UNCOMPRESSED
+
+#define VC_HEADER_SIZE (VIDEO_VS_IF_IN_HEADER_DESC_SIZE + \
+                        VS_FORMAT_UNCOMPRESSED_DESC_SIZE + \
+                        VS_FRAME_DESC_SIZE + \
+                        VS_COLOR_MATCHING_DESC_SIZE)
+#else
+#define VS_FORMAT_DESC_SIZE                           VS_FORMAT_MJPEG_DESC_SIZE
+#define VS_FORMAT_SUBTYPE                             VS_FORMAT_MJPEG
+#define VS_FRAME_SUBTYPE                              VS_FRAME_MJPEG
+
+#define VC_HEADER_SIZE (VIDEO_VS_IF_IN_HEADER_DESC_SIZE + \
+                        VS_FORMAT_DESC_SIZE + \
+                        VS_FRAME_DESC_SIZE)
+#endif
+
+/*
+ * Video Class specification release 1.1
+ * Appendix A. Video Device Class Codes defines
+ */
+
+/* Video Interface Subclass values */
+#define SC_UNDEFINED                                  0x00U
+#define SC_VIDEOCONTROL                               0x01U
+#define SC_VIDEOSTREAMING                             0x02U
+#define SC_VIDEO_INTERFACE_COLLECTION                 0x03U
+
+/* Video Class-Specific Descriptor Types */
+#define CS_UNDEFINED                                  0x20U
+#define CS_DEVICE                                     0x21U
+#define CS_CONFIGURATION                              0x22U
+#define CS_STRING                                     0x23U
+#define CS_INTERFACE                                  0x24U
+#define CS_ENDPOINT                                   0x25U
+
+/* Video Class-Specific VideoControl Interface Descriptor Subtypes */
+#define VC_DESCRIPTOR_UNDEFINED                       0x00U
+#define VC_HEADER                                     0x01U
+#define VC_INPUT_TERMINAL                             0x02U
+#define VC_OUTPUT_TERMINAL                            0x03U
+#define VC_SELECTOR_UNIT                              0x04U
+#define VC_PROCESSING_UNIT                            0x05U
+#define VC_EXTENSION_UNIT                             0x06U
+
+/* Video Class-Specific VideoStreaming Interface Descriptor Subtypes */
+#define VS_UNDEFINED                                  0x00U
+#define VS_INPUT_HEADER                               0x01U
+#define VS_OUTPUT_HEADER                              0x02U
+#define VS_STILL_IMAGE_FRAME                          0x03U
+#define VS_FORMAT_UNCOMPRESSED                        0x04U
+#define VS_FRAME_UNCOMPRESSED                         0x05U
+#define VS_FORMAT_MJPEG                               0x06U
+#define VS_FRAME_MJPEG                                0x07U
+#define VS_FORMAT_MPEG2TS                             0x0AU
+#define VS_FORMAT_DV                                  0x0CU
+#define VS_COLORFORMAT                                0x0DU
+#define VS_FORMAT_FRAME_BASED                         0x10U
+#define VS_FRAME_FRAME_BASED                          0x11U
+#define VS_FORMAT_STREAM_BASED                        0x12U
+
+/* Video Class-Specific Request values */
+#define UVC_RQ_UNDEFINED                               0x00U
+#define UVC_SET_CUR                                    0x01U
+#define UVC_GET_CUR                                    0x81U
+#define UVC_GET_MIN                                    0x82U
+#define UVC_GET_MAX                                    0x83U
+#define UVC_GET_RES                                    0x84U
+#define UVC_GET_LEN                                    0x85U
+#define UVC_GET_INFO                                   0x86U
+#define UVC_GET_DEF                                    0x87U
+
+/* VideoControl Interface Control Selectors */
+#define VC_CONTROL_UNDEFINED                           0x00U
+#define VC_VIDEO_POWER_MODE_CONTROL                    0x01U
+#define VC_REQUEST_ERROR_CODE_CONTROL                  0x02U
+
+/* Request Error Code Control */
+#define UVC_NO_ERROR_ERR                               0x00U
+#define UVC_NOT_READY_ERR                              0x01U
+#define UVC_WRONG_STATE_ERR                            0x02U
+#define UVC_POWER_ERR                                  0x03U
+#define UVC_OUT_OF_RANGE_ERR                           0x04U
+#define UVC_INVALID_UNIT_ERR                           0x05U
+#define UVC_INVALID_CONTROL_ERR                        0x06U
+#define UVC_INVALID_REQUEST_ERR                        0x07U
+#define UVC_UNKNOWN_ERR                                0xFFU
+
+/*Terminal Control Selectors*/
+#define TE_CONTROL_UNDEFINED                           0x00U
+
+/* Selector Unit Control Selectors */
+#define SU_CONTROL_UNDEFINED                           0x00U
+#define SU_INPUT_SELECT_CONTROL                        0x01U
+
+/* Camera Terminal Control Selectors */
+#define CT_CONTROL_UNDEFINED                           0x00U
+#define CT_SCANNING_MODE_CONTROL                       0x01U
+#define CT_AE_MODE_CONTROL                             0x02U
+#define CT_AE_PRIORITY_CONTROL                         0x03U
+#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL              0x04U
+#define CT_EXPOSURE_TIME_RELATIVE_CONTROL              0x05U
+#define CT_FOCUS_ABSOLUTE_CONTROL                      0x06U
+#define CT_FOCUS_RELATIVE_CONTROL                      0x07U
+#define CT_FOCUS_AUTO_CONTROL                          0x08U
+#define CT_IRIS_ABSOLUTE_CONTROL                       0x09U
+#define CT_IRIS_RELATIVE_CONTROL                       0x0AU
+#define CT_ZOOM_ABSOLUTE_CONTROL                       0x0BU
+#define CT_ZOOM_RELATIVE_CONTROL                       0x0CU
+#define CT_PANTILT_ABSOLUTE_CONTROL                    0x0DU
+#define CT_PANTILT_RELATIVE_CONTROL                    0x0EU
+#define CT_ROLL_ABSOLUTE_CONTROL                       0x0FU
+#define CT_ROLL_RELATIVE_CONTROL                       0x10U
+#define CT_PRIVACY_CONTROL                             0x11U
+
+/* Processing Unit Control Selectors */
+#define PU_CONTROL_UNDEFINED                           0x00U
+#define PU_BACKLIGHT_COMPENSATION_CONTROL              0x01U
+#define PU_BRIGHTNESS_CONTROL                          0x02U
+#define PU_CONTRAST_CONTROL                            0x03U
+#define PU_GAIN_CONTROL                                0x04U
+#define PU_POWER_LINE_FREQUENCY_CONTROL                0x05U
+#define PU_HUE_CONTROL                                 0x06U
+#define PU_SATURATION_CONTROL                          0x07U
+#define PU_SHARPNESS_CONTROL                           0x08U
+#define PU_GAMMA_CONTROL                               0x09U
+#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL           0x0AU
+#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL      0x0BU
+#define PU_WHITE_BALANCE_COMPONENT_CONTROL             0x0CU
+#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL        0x0DU
+#define PU_DIGITAL_MULTIPLIER_CONTROL                  0x0EU
+#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL            0x0FU
+#define PU_HUE_AUTO_CONTROL                            0x10U
+#define PU_ANALOG_VIDEO_STANDARD_CONTROL               0x11U
+#define PU_ANALOG_LOCK_STATUS_CONTROL                  0x12U
+
+/*Extension Unit Control Selectors */
+#define XU_CONTROL_UNDEFINED                           0x00U
+
+/* VideoStreaming Interface Control Selectors */
+#define VS_CONTROL_UNDEFINED                           0x00U
+#define VS_PROBE_CONTROL                               0x100U
+#define VS_COMMIT_CONTROL                              0x200U
+#define VS_STILL_PROBE_CONTROL                         0x03U
+#define VS_STILL_COMMIT_CONTROL                        0x04U
+#define VS_STILL_IMAGE_TRIGGER_CONTROL                 0x05U
+#define VS_STREAM_ERROR_CODE_CONTROL                   0x06U
+#define VS_GENERATE_KEY_FRAME_CONTROL                  0x07U
+#define VS_UPDATE_FRAME_SEGMENT_CONTROL                0x08U
+#define VS_SYNC_DELAY_CONTROL                          0x09U
+
+
+/* Control Capabilities */
+#define UVC_SUPPORTS_GET                               0x01U
+#define UVC_SUPPORTS_SET                               0x02U
+#define UVC_STATE_DISABLED                             0x04U
+#define UVC_AUTOUPDATE_CONTROL                         0x08U
+#define UVC_ASYNCHRONOUS_CONTROL                       0x10U
+
+/* USB Terminal Types */
+#define TT_VENDOR_SPECIFIC                             0x0100U
+#define TT_STREAMING                                   0x0101U
+
+/* Input Terminal Types */
+#define ITT_VENDOR_SPECIFIC                            0x0200U
+#define ITT_CAMERA                                     0x0201U
+#define ITT_MEDIA_TRANSPORT_INPUT                      0x0202U
+
+/*Output Terminal Types */
+#define OTT_VENDOR_SPECIFIC                            0x0300U
+#define OTT_DISPLAY                                    0x0301U
+#define OTT_MEDIA_TRANSPORT_OUTPUT                     0x0302U
+
+/* External Terminal Types */
+#define EXTERNAL_VENDOR_SPECIFIC                       0x0400U
+#define COMPOSITE_CONNECTOR                            0x0401U
+#define SVIDEO_CONNECTOR                               0x0402U
+#define COMPONENT_CONNECTOR                            0x0403U
+
+
+/* VIDEO Commands enumeration */
+typedef enum
+{
+  VIDEO_CMD_START = 1U,
+  VIDEO_CMD_PLAY,
+  VIDEO_CMD_STOP,
+} VIDEO_CMD_TypeDef;
+
+typedef enum
+{
+  VIDEO_OFFSET_NONE = 0U,
+  VIDEO_OFFSET_HALF,
+  VIDEO_OFFSET_FULL,
+  VIDEO_OFFSET_UNKNOWN,
+} VIDEO_OffsetTypeDef;
+
+typedef  struct  _VIDEO_DescHeader
+{
+  uint8_t  bLength;
+  uint8_t  bDescriptorType;
+  uint8_t  bDescriptorSubType;
+} USBD_VIDEO_DescHeader_t;
+
+typedef struct
+{
+  uint8_t  bLength;
+  uint8_t  bDescriptorType;
+  uint8_t  bDescriptorSubType;
+  uint8_t  bFrameIndex;
+  uint8_t  bmCapabilities;
+  uint16_t wWidth;
+  uint16_t wHeight;
+  uint32_t dwMinBitRate;
+  uint32_t dwMaxBitRate;
+  uint32_t dwMaxVideoFrameBufSize;
+  uint32_t dwDefaultFrameInterval;
+  uint8_t  bFrameIntervalType;
+  uint32_t dwMinFrameInterval;
+  uint32_t dwMaxFrameInterval;
+  uint32_t dwFrameIntervalStep;
+} __PACKED USBD_VIDEO_VSFrameDescTypeDef;
+
+typedef struct
+{
+  uint8_t cmd;
+  uint8_t data[USB_MAX_EP0_SIZE];
+  uint8_t len;
+  uint8_t unit;
+} USBD_VIDEO_ControlTypeDef;
+
+typedef struct
+{
+  uint32_t                   interface;
+  uint32_t                   uvc_state;
+  uint8_t                    buffer[UVC_TOTAL_BUF_SIZE];
+  VIDEO_OffsetTypeDef        offset;
+  USBD_VIDEO_ControlTypeDef  control;
+} USBD_VIDEO_HandleTypeDef;
+
+typedef struct
+{
+  int8_t (* Init)(void);
+  int8_t (* DeInit)(void);
+  int8_t (* Control)(uint8_t, uint8_t *, uint16_t);
+  int8_t (* Data)(uint8_t **, uint16_t *, uint16_t *);
+  uint8_t  *pStrDesc;
+} USBD_VIDEO_ItfTypeDef;
+
+/* UVC uses only 26 first bytes */
+typedef struct
+{
+  uint16_t    bmHint;
+  uint8_t     bFormatIndex;
+  uint8_t     bFrameIndex;
+  uint32_t    dwFrameInterval;
+  uint16_t    wKeyFrameRate;
+  uint16_t    wPFrameRate;
+  uint16_t    wCompQuality;
+  uint16_t    wCompWindowSize;
+  uint16_t    wDelay;
+  uint32_t    dwMaxVideoFrameSize;
+  uint32_t    dwMaxPayloadTransferSize;
+  uint32_t    dwClockFrequency;
+  uint8_t     bmFramingInfo;
+  uint8_t     bPreferedVersion;
+  uint8_t     bMinVersion;
+  uint8_t     bMaxVersion;
+} __PACKED USBD_VideoControlTypeDef;
+
+extern USBD_ClassTypeDef    USBD_VIDEO;
+#define USBD_VIDEO_CLASS    &USBD_VIDEO
+/**
+  * @}
+  */
+
+/** @defgroup USB_CORE_Exported_Functions
+  * @{
+  */
+
+uint8_t USBD_VIDEO_RegisterInterface(USBD_HandleTypeDef *pdev, USBD_VIDEO_ItfTypeDef *fops);
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _USBD_VIDEO_H_ */

Class/VIDEO/Inc/usbd_video_if_template.h

@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    usbd_video_if_template.h
+  * @author  MCD Application Team
+  * @brief   Template Header file for the video Interface application layer functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 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_VIDEO_IF_H__
+#define __USBD_VIDEO_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_video.h"
+
+/* USER CODE BEGIN INCLUDE */
+
+/* USER CODE END INCLUDE */
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @brief For Usb device.
+  * @{
+  */
+
+/** @defgroup USBD_VIDEO_IF
+  * @brief Usb VIDEO interface device module.
+  * @{
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_Defines
+  * @brief Defines.
+  * @{
+  */
+
+/* USER CODE BEGIN EXPORTED_DEFINES */
+
+/* USER CODE END EXPORTED_DEFINES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_Types
+  * @brief Types.
+  * @{
+  */
+
+/* USER CODE BEGIN EXPORTED_TYPES */
+
+/* USER CODE END EXPORTED_TYPES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_Macros
+  * @brief Aliases.
+  * @{
+  */
+
+/* USER CODE BEGIN EXPORTED_MACRO */
+
+/* USER CODE END EXPORTED_MACRO */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_Variables
+  * @brief Public variables.
+  * @{
+  */
+
+/** VIDEO_IF Interface callback. */
+extern USBD_VIDEO_ItfTypeDef USBD_VIDEO_fops_FS;
+
+/* USER CODE BEGIN EXPORTED_VARIABLES */
+
+/* USER CODE END EXPORTED_VARIABLES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_FunctionsPrototype
+  * @brief Public functions declaration.
+  * @{
+  */
+
+/**
+  * @brief  Manages the DMA full transfer complete event.
+  * @retval None
+  */
+void TransferComplete_CallBack_FS(void);
+
+/**
+  * @brief  Manages the DMA half transfer complete event.
+  * @retval None
+  */
+void HalfTransfer_CallBack_FS(void);
+
+/* USER CODE BEGIN EXPORTED_FUNCTIONS */
+
+/* USER CODE END EXPORTED_FUNCTIONS */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* USBD_VIDEO_IF_H_ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
+
+

Class/VIDEO/Src/usbd_video_if_template.c

@@ -0,0 +1,296 @@
+/**
+  ******************************************************************************
+  * @file    usbd_video_if_template.c
+  * @author  MCD Application Team
+  * @brief   Template file for Video Interface application layer functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 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_video_if.h"
+
+/* Include you image binary file here
+    Binary image template shall provide:
+     - tImagesList: table containing pointers to all images
+     - tImagesSizes: table containing sizes of each image respectively
+     - img_count: global image counter variable
+     - IMG_NBR: Total image number
+
+     To generate such file, it is possible to use tools converting video to MJPEG then to JPEG images.
+ */
+/* #include "img_bin.h" */
+
+/* USER CODE BEGIN INCLUDE */
+
+/* USER CODE END INCLUDE */
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE END PV */
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @brief Usb device library.
+  * @{
+  */
+
+/** @addtogroup USBD_VIDEO_IF
+  * @{
+  */
+
+/** @defgroup USBD_VIDEO_IF_Private_TypesDefinitions
+  * @brief Private types.
+  * @{
+  */
+
+/* USER CODE BEGIN PRIVATE_TYPES */
+
+/* USER CODE END PRIVATE_TYPES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Private_Defines
+  * @brief Private defines.
+  * @{
+  */
+
+/* USER CODE BEGIN PRIVATE_DEFINES */
+
+/* USER CODE END PRIVATE_DEFINES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Private_Macros
+  * @brief Private macros.
+  * @{
+  */
+
+/* USER CODE BEGIN PRIVATE_MACRO */
+
+/* USER CODE END PRIVATE_MACRO */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Private_Variables
+  * @brief Private variables.
+  * @{
+  */
+
+/* USER CODE BEGIN PRIVATE_VARIABLES */
+
+/* USER CODE END PRIVATE_VARIABLES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Exported_Variables
+  * @brief Public variables.
+  * @{
+  */
+
+
+
+/* USER CODE BEGIN EXPORTED_VARIABLES */
+
+/* USER CODE END EXPORTED_VARIABLES */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_VIDEO_IF_Private_FunctionPrototypes
+  * @brief Private functions declaration.
+  * @{
+  */
+
+static int8_t VIDEO_Itf_Init(void);
+static int8_t VIDEO_Itf_DeInit(void);
+static int8_t VIDEO_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length);
+static int8_t VIDEO_Itf_Data(uint8_t **pbuf, uint16_t *psize, uint16_t *pcktidx);
+
+
+/* USER CODE BEGIN PRIVATE_FUNCTIONS_DECLARATION */
+
+/* USER CODE END PRIVATE_FUNCTIONS_DECLARATION */
+
+/**
+  * @}
+  */
+
+USBD_VIDEO_ItfTypeDef USBD_VIDEO_fops_FS =
+{
+  VIDEO_Itf_Init,
+  VIDEO_Itf_DeInit,
+  VIDEO_Itf_Control,
+  VIDEO_Itf_Data,
+};
+
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Initializes the VIDEO media low layer over USB FS IP
+  * @param  VIDEOFreq: VIDEO frequency used to play the VIDEO stream.
+  * @param  Volume: Initial volume level (from 0 (Mute) to 100 (Max))
+  * @param  options: Reserved for future use
+  * @retval USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t VIDEO_Itf_Init(void)
+{
+  /*
+     Add your initialization code here
+  */
+
+  return (0);
+}
+
+/**
+  * @brief  TEMPLATE_DeInit
+  *         DeInitializes the UVC media low layer
+  * @param  None
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t VIDEO_Itf_DeInit(void)
+{
+  /*
+     Add your deinitialization code here
+  */
+  return (0);
+}
+
+
+/**
+  * @brief  TEMPLATE_Control
+  *         Manage the UVC 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 VIDEO_Itf_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length)
+{
+
+  return (0);
+}
+
+/**
+  * @brief  TEMPLATE_Data
+  *         Manage the UVC data packets
+  * @param  pbuf: pointer to the buffer data to be filled
+  * @param  psize: pointer tot he current packet size to be filled
+  * @param  pcktidx: pointer to the current packet index in the current image
+  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
+  */
+static int8_t VIDEO_Itf_Data(uint8_t **pbuf, uint16_t *psize, uint16_t *pcktidx)
+{
+  /*
+    Implementation of this function is mandatory to provide the video data to the USB video class
+    This function shall parse the MJPEG images and provide each time the buffer packet relative to
+    current packet index and its size.
+    If the packet is the first packet in the current MJPEG image, then packet size shall be zero and
+    the pbuf is ignored and pcktidx shall be zero.
+    Below is typical implementation of this function based on a binary image template.
+
+    Binary image template shall provide:
+     - tImagesList: table containing pointers to all images
+     - tImagesSizes: table containing sizes of each image respectively
+     - img_count: global image counter variable
+     - IMG_NBR: Total image number
+
+     To generate such file, it is possible to use tools converting video to MJPEG then to JPEG images.
+
+  */
+  const uint8_t *(*ImagePtr) = tImagesList;
+  uint32_t packet_count = (tImagesSizes[img_count]) / ((uint16_t)(UVC_PACKET_SIZE - (UVC_HEADER_PACKET_CNT * 2U)));
+  uint32_t packet_remainder = (tImagesSizes[img_count]) % ((uint16_t)(UVC_PACKET_SIZE - (UVC_HEADER_PACKET_CNT * 2U)));
+  static uint8_t packet_index = 0;
+
+  /* Check if end of current image has been reached */
+  if (packet_index < packet_count)
+  {
+    /* Set the current packet size */
+    *psize = (uint16_t)UVC_PACKET_SIZE;
+
+    /* Get the pointer to the next packet to be transmitted */
+    *pbuf = (uint8_t *)(*(ImagePtr + img_count) + packet_index * ((uint16_t)(UVC_PACKET_SIZE - (UVC_HEADER_PACKET_CNT * 2U))));
+  }
+  else if ((packet_index == packet_count))
+  {
+    if (packet_remainder != 0U)
+    {
+      /* Get the pointer to the next packet to be transmitted */
+      *pbuf = (uint8_t *)(*(ImagePtr + img_count) + packet_index * ((uint16_t)(UVC_PACKET_SIZE - (UVC_HEADER_PACKET_CNT * 2U))));
+
+      /* Set the current packet size */
+      *psize = packet_remainder + (UVC_HEADER_PACKET_CNT * 2U);
+    }
+    else
+    {
+      packet_index++;
+
+      /* New image to be started, send only the packet header */
+      *psize = 2;
+    }
+  }
+  else
+  {
+    /* New image to be started, send only the packet header */
+    *psize = 2;
+  }
+
+  /* Update the packet index */
+  *pcktidx = packet_index;
+
+  /* Increment the packet count and check if it reached the end of current image buffer */
+  if (packet_index++ >= (packet_count + 1))
+  {
+    /* Reset the packet count to zero */
+    packet_index = 0U;
+
+    /* Move to the next image in the images table */
+
+    img_count++;
+    HAL_Delay(USBD_VIDEO_IMAGE_LAPS);
+    /* Check if images count has been reached, then reset to zero (go back to first image in circular loop) */
+    if (img_count == IMG_NBR)
+    {
+      img_count = 0U;
+    }
+  }
+
+  return (0);
+}
+
+/* USER CODE BEGIN PRIVATE_FUNCTIONS_IMPLEMENTATION */
+
+/* USER CODE END PRIVATE_FUNCTIONS_IMPLEMENTATION */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

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
   *
   ******************************************************************************
   */
@@ -47,10 +47,17 @@
 #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
 
@@ -64,16 +71,68 @@
 /* AUDIO Class Config */
 #define USBD_AUDIO_FREQ                             22100U
 
+/* CustomHID Class Config */
+#define CUSTOM_HID_HS_BINTERVAL                     0x05U
+#define CUSTOM_HID_FS_BINTERVAL                     0x05U
+#define USBD_CUSTOMHID_OUTREPORT_BUF_SIZE           0x02U
+#define USBD_CUSTOM_HID_REPORT_DESC_SIZE            163U
+
+/* VIDEO Class Config */
+#define UVC_1_1 /* #define UVC_1_0 */
+
+/* To be used only with YUY2 and NV12 Video format, shouldn't be defined for MJPEG format */
+#define USBD_UVC_FORMAT_UNCOMPRESSED
+
+#ifdef USBD_UVC_FORMAT_UNCOMPRESSED
+#define UVC_BITS_PER_PIXEL                          12U
+#define UVC_UNCOMPRESSED_GUID                       UVC_GUID_NV12 /* UVC_GUID_YUY2 */
+
+/* refer to Table 3-18 Color Matching Descriptor video class v1.1 */
+#define UVC_COLOR_PRIMARIE                          0x01U
+#define UVC_TFR_CHARACTERISTICS                     0x01U
+#define UVC_MATRIX_COEFFICIENTS                     0x04U
+#endif
+
+/* Video Stream frame width and height */
+#define UVC_WIDTH                                   176U
+#define UVC_HEIGHT                                  144U
+
+/* bEndpointAddress in Endpoint Descriptor */
+#define UVC_IN_EP                                   0x81U
+
+#define UVC_CAM_FPS_FS                              10U
+#define UVC_CAM_FPS_HS                              5U
+
+#define UVC_ISO_FS_MPS                              512U
+#define UVC_ISO_HS_MPS                              512U
+
+#define UVC_PACKET_SIZE                             UVC_ISO_FS_MPS
+/* To be used with Device Only IP supporting double buffer mode */
+/* #define UVC_HEADER_PACKET_CNT                     0x02U */
+/* #define UVC_PACKET_SIZE                           (UVC_ISO_FS_MPS * UVC_HEADER_PACKET_CNT) */
+
+#define UVC_MAX_FRAME_SIZE                          (UVC_WIDTH * UVC_HEIGHT * 16U / 8U)
+
 /** @defgroup USBD_Exported_Macros
   * @{
   */
 
- /* Memory management macros */
-#define USBD_malloc               malloc
-#define USBD_free                 free
+/* Memory management macros make sure to use static memory allocation */
+/** Alias for memory allocation. */
+#define USBD_malloc         (void *)USBD_static_malloc
+
+/** Alias for memory release. */
+#define USBD_free           USBD_static_free
+
+/** Alias for memory set. */
 #define USBD_memset         memset
+
+/** Alias for memory copy. */
 #define USBD_memcpy         memcpy
 
+/** Alias for delay. */
+#define USBD_Delay          HAL_Delay
+
 /* DEBUG macros */
 #if (USBD_DEBUG_LEVEL > 0U)
 #define  USBD_UsrLog(...)   do { \
@@ -141,6 +200,9 @@
 /** @defgroup USBD_CONF_Exported_FunctionsPrototype
   * @{
   */
+/* Exported functions -------------------------------------------------------*/
+void *USBD_static_malloc(uint32_t size);
+void USBD_static_free(void *p);
 /**
   * @}
   */

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
   *
   ******************************************************************************
   */
@@ -113,28 +113,25 @@ USBD_StatusTypeDef  USBD_LL_Init (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_OpenEP  (USBD_HandleTypeDef *pdev,
-                                      uint8_t  ep_addr,
-                                      uint8_t  ep_type,
-                                      uint16_t ep_mps);
+
+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_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
 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,
-                                           uint8_t  ep_addr,
-                                           uint8_t  *pbuf,
-                                           uint16_t  size);
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+                                    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
   *
   ******************************************************************************
   */
@@ -77,12 +77,10 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqType
 USBD_StatusTypeDef USBD_StdItfReq(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);
+
 /**
   * @}
   */

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
   *
   ******************************************************************************
   */
@@ -61,9 +61,17 @@
 #define USBD_SELF_POWERED                               1U
 #endif /*USBD_SELF_POWERED */
 
-#ifndef USBD_SUPPORT_USER_STRING
-#define USBD_SUPPORT_USER_STRING                        0U
-#endif /* USBD_SUPPORT_USER_STRING */
+#ifndef USBD_MAX_POWER
+#define USBD_MAX_POWER                                  0x32U /* 100 mA */
+#endif /* USBD_MAX_POWER */
+
+#ifndef USBD_SUPPORT_USER_STRING_DESC
+#define USBD_SUPPORT_USER_STRING_DESC                   0U
+#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
@@ -110,6 +118,7 @@
 #define  USB_DESC_TYPE_ENDPOINT                         0x05U
 #define  USB_DESC_TYPE_DEVICE_QUALIFIER                 0x06U
 #define  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION        0x07U
+#define  USB_DESC_TYPE_IAD                              0x0BU
 #define  USB_DESC_TYPE_BOS                              0x0FU
 
 #define USB_CONFIG_REMOTE_WAKEUP                        0x02U
@@ -121,6 +130,11 @@
 
 #define USB_DEVICE_CAPABITY_TYPE                        0x10U
 
+#define USB_CONF_DESC_SIZE                              0x09U
+#define USB_IF_DESC_SIZE                                0x09U
+#define USB_EP_DESC_SIZE                                0x07U
+#define USB_IAD_DESC_SIZE                               0x08U
+
 #define USB_HS_MAX_PACKET_SIZE                          512U
 #define USB_FS_MAX_PACKET_SIZE                          64U
 #define USB_MAX_EP0_SIZE                                64U
@@ -146,7 +160,6 @@
 #define USBD_EP_TYPE_BULK                               0x02U
 #define USBD_EP_TYPE_INTR                               0x03U
 
-
 /**
   * @}
   */
@@ -158,7 +171,6 @@
 
 typedef  struct  usb_setup_req
 {
-
   uint8_t   bmRequest;
   uint8_t   bRequest;
   uint16_t  wValue;
@@ -166,6 +178,36 @@ typedef  struct  usb_setup_req
   uint16_t  wLength;
 } USBD_SetupReqTypedef;
 
+typedef struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint16_t  wTotalLength;
+  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;
+
+typedef struct
+{
+  uint8_t   bLength;
+  uint8_t   bDescriptorType;
+  uint8_t   bEndpointAddress;
+  uint8_t   bmAttributes;
+  uint16_t  wMaxPacketSize;
+  uint8_t   bInterval;
+} USBD_EpDescTypedef;
+
 struct _USBD_HandleTypeDef;
 
 typedef struct _Device_cb
@@ -187,7 +229,7 @@ typedef struct _Device_cb
   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);
 #endif
 
@@ -202,9 +244,11 @@ typedef enum
 } USBD_SpeedTypeDef;
 
 /* Following USB Device status */
-typedef enum {
+typedef enum
+{
   USBD_OK = 0U,
   USBD_BUSY,
+  USBD_EMEM,
   USBD_FAIL,
 } USBD_StatusTypeDef;
 
@@ -218,7 +262,10 @@ typedef struct
   uint8_t *(*GetSerialStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
   uint8_t *(*GetConfigurationStrDescriptor)(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 *(*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 +274,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,16 +289,17 @@ 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_out[15];
-  uint32_t                ep0_state;
+  USBD_EndpointTypeDef    ep_in[16];
+  USBD_EndpointTypeDef    ep_out[16];
+  __IO uint32_t           ep0_state;
   uint32_t                ep0_data_len;
-  uint8_t                 dev_state;
-  uint8_t                 dev_old_state;
+  __IO uint8_t            dev_state;
+  __IO uint8_t            dev_old_state;
   uint8_t                 dev_address;
   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 +307,8 @@ typedef struct _USBD_HandleTypeDef
   void                    *pClassData;
   void                    *pUserData;
   void                    *pData;
+  void                    *pBosDesc;
+  void                    *pConfDesc;
 } USBD_HandleTypeDef;
 
 /**
@@ -269,14 +320,35 @@ typedef struct _USBD_HandleTypeDef
 /** @defgroup USBD_DEF_Exported_Macros
   * @{
   */
-#define  SWAPBYTE(addr)        (((uint16_t)(*((uint8_t *)(addr)))) + \
-                               (((uint16_t)(*(((uint8_t *)(addr)) + 1U))) << 8U))
+__STATIC_INLINE uint16_t SWAPBYTE(uint8_t *addr)
+{
+  uint16_t _SwapVal, _Byte1, _Byte2;
+  uint8_t *_pbuff = addr;
 
-#define LOBYTE(x)  ((uint8_t)(x & 0x00FFU))
-#define HIBYTE(x)  ((uint8_t)((x & 0xFF00U) >> 8U))
+  _Byte1 = *(uint8_t *)_pbuff;
+  _pbuff++;
+  _Byte2 = *(uint8_t *)_pbuff;
+
+  _SwapVal = (_Byte2 << 8) | _Byte1;
+
+  return _SwapVal;
+}
+
+#ifndef LOBYTE
+#define LOBYTE(x)  ((uint8_t)((x) & 0x00FFU))
+#endif
+
+#ifndef HIBYTE
+#define HIBYTE(x)  ((uint8_t)(((x) & 0xFF00U) >> 8U))
+#endif
+
+#ifndef MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+#endif
 
+#ifndef MAX
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+#endif
 
 #if  defined ( __GNUC__ )
 #ifndef __weak
@@ -291,18 +363,24 @@ typedef struct _USBD_HandleTypeDef
 /* 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 */
-  #define __ALIGN_END    __attribute__ ((aligned (4)))
+#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
+#ifndef __ALIGN_END
+#define __ALIGN_END    __attribute__ ((aligned (4U)))
+#endif /* __ALIGN_END */
+#ifndef __ALIGN_BEGIN
 #define __ALIGN_BEGIN
+#endif /* __ALIGN_BEGIN */
 #else
+#ifndef __ALIGN_END
 #define __ALIGN_END
+#endif /* __ALIGN_END */
+#ifndef __ALIGN_BEGIN
 #if defined   (__CC_ARM)      /* ARM Compiler */
-    #define __ALIGN_BEGIN    __align(4)
+#define __ALIGN_BEGIN    __align(4U)
 #elif defined (__ICCARM__)    /* IAR Compiler */
 #define __ALIGN_BEGIN
-  #elif defined  (__TASKING__)  /* TASKING Compiler */
-    #define __ALIGN_BEGIN    __align(4)
 #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_ID2          (0x1FFF7A14)
-#define         DEVICE_ID3          (0x1FFF7A18)
+#define         DEVICE_ID1          (UID_BASE)
+#define         DEVICE_ID2          (UID_BASE + 0x4U)
+#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
   *
   ******************************************************************************
   */
@@ -78,23 +78,18 @@
   */
 
 USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
-                               uint16_t len);
+                                    uint8_t *pbuf, uint32_t len);
 
 USBD_StatusTypeDef USBD_CtlContinueSendData(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
-                               uint16_t len);
+                                            uint8_t *pbuf, uint32_t len);
 
 USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
-                               uint8_t *pbuf,
-                               uint16_t len);
+                                     uint8_t *pbuf, uint32_t len);
 
 USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
-                              uint8_t *pbuf,
-                              uint16_t len);
+                                      uint8_t *pbuf, uint32_t len);
 
 USBD_StatusTypeDef USBD_CtlSendStatus(USBD_HandleTypeDef *pdev);
-
 USBD_StatusTypeDef USBD_CtlReceiveStatus(USBD_HandleTypeDef *pdev);
 
 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
-  *          following user needs.
+  *          This template should be copied to the user folder,
+  *          renamed and customized following user needs.
   ******************************************************************************
   * @attention
   *
@@ -14,13 +14,14 @@
   * 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
   *
   ******************************************************************************
   */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_core.h"
+#include "usbd_hid.h" /* Include class header file */
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
@@ -34,6 +35,8 @@
   */
 USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -44,6 +47,8 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -54,6 +59,8 @@ USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -64,6 +71,8 @@ USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
 {
+  UNUSED(pdev);
+
   return USBD_OK;
 }
 
@@ -75,11 +84,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,
-                                  uint8_t ep_addr,
-                                  uint8_t ep_type,
-                                  uint16_t ep_mps)
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+                                  uint8_t ep_type, uint16_t ep_mps)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(ep_type);
+  UNUSED(ep_mps);
+
   return USBD_OK;
 }
 
@@ -91,6 +103,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 +117,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 +131,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 +143,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,17 +160,24 @@ 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;
 }
 
 /**
   * @brief  Assigns a USB address to the device.
   * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
+  * @param  dev_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(dev_addr);
+
   return USBD_OK;
 }
 
@@ -157,11 +189,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,
-                                    uint8_t ep_addr,
-                                    uint8_t *pbuf,
-                                    uint16_t size)
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+                                    uint8_t *pbuf, uint32_t size)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(pbuf);
+  UNUSED(size);
+
   return USBD_OK;
 }
 
@@ -174,10 +209,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 *pbuf,
-                                          uint16_t size)
+                                          uint8_t ep_addr, uint8_t *pbuf,
+                                          uint32_t size)
 {
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+  UNUSED(pbuf);
+  UNUSED(size);
+
   return USBD_OK;
 }
 
@@ -185,11 +224,35 @@ USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
   * @brief  Returns the last transferred packet size.
   * @param  pdev: Device handle
   * @param  ep_addr: Endpoint Number
-  * @retval Recived Data Size
+  * @retval Received Data Size
   */
 uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
-  return 0;
+  UNUSED(pdev);
+  UNUSED(ep_addr);
+
+  return 0U;
+}
+
+/**
+  * @brief  Static single allocation.
+  * @param  size: Size of allocated memory
+  * @retval None
+  */
+void *USBD_static_malloc(uint32_t size)
+{
+  static uint32_t mem[(sizeof(USBD_HID_HandleTypeDef) / 4) + 1]; /* On 32-bit boundary */
+  return mem;
+}
+
+/**
+  * @brief  Dummy memory free
+  * @param  p: Pointer to allocated  memory address
+  * @retval None
+  */
+void USBD_static_free(void *p)
+{
+
 }
 
 /**
@@ -199,6 +262,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,8 +86,11 @@
   * @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)
   {
@@ -96,11 +100,10 @@ USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *
     return USBD_FAIL;
   }
 
-  /* Unlink previous class*/
-  if(pdev->pClass != NULL)
-  {
+  /* Unlink previous class resources */
   pdev->pClass = NULL;
-  }
+  pdev->pUserData = NULL;
+  pdev->pConfDesc = NULL;
 
   /* Assign USBD Descriptors */
   if (pdesc != NULL)
@@ -111,33 +114,45 @@ 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;
 }
 
 /**
   * @brief  USBD_DeInit
-*         Re-Initialize th device library
+  *         Re-Initialize the device library
   * @param  pdev: device instance
   * @retval status: status
   */
 USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)
 {
+  USBD_StatusTypeDef ret;
+
+  /* Disconnect the USB Device */
+  (void)USBD_LL_Stop(pdev);
+
   /* 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);
+    pdev->pClass = NULL;
+    pdev->pUserData = NULL;
+  }
 
-    /* Stop the low level driver  */
-  USBD_LL_Stop(pdev);
+  /* Free Device descriptors resources */
+  pdev->pDesc = NULL;
+  pdev->pConfDesc = NULL;
 
-  /* Initialize low level driver */
-  USBD_LL_DeInit(pdev);
+  /* DeInitialize low level driver */
+  ret = USBD_LL_DeInit(pdev);
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
@@ -149,22 +164,33 @@ USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass)
 {
-  USBD_StatusTypeDef   status = USBD_OK;
-  if(pclass != 0)
-  {
-    /* link the class to the USB Device handle */
-    pdev->pClass = pclass;
-    status = USBD_OK;
-  }
-  else
+  uint16_t len = 0U;
+
+  if (pclass == NULL)
   {
 #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_HS
+  if (pdev->pClass->GetHSConfigDescriptor != NULL)
+  {
+    pdev->pConfDesc = (void *)pdev->pClass->GetHSConfigDescriptor(&len);
+  }
+#else /* Default USE_USB_FS */
+  if (pdev->pClass->GetFSConfigDescriptor != NULL)
+  {
+    pdev->pConfDesc = (void *)pdev->pClass->GetFSConfigDescriptor(&len);
+  }
+#endif /* USE_USB_FS */
+
+  return USBD_OK;
 }
 
 /**
@@ -175,11 +201,8 @@ USBD_StatusTypeDef  USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeD
   */
 USBD_StatusTypeDef USBD_Start(USBD_HandleTypeDef *pdev)
 {
-
   /* Start the low level driver  */
-  USBD_LL_Start(pdev);
-
-  return USBD_OK;
+  return USBD_LL_Start(pdev);
 }
 
 /**
@@ -190,11 +213,14 @@ USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)
   */
 USBD_StatusTypeDef USBD_Stop(USBD_HandleTypeDef *pdev)
 {
-  /* Free Class Resources */
-  pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  /* Disconnect USB Device */
+  (void)USBD_LL_Stop(pdev);
 
-  /* Stop the low level driver  */
-  USBD_LL_Stop(pdev);
+  /* Free Class Resources */
+  if (pdev->pClass != NULL)
+  {
+    (void)pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+  }
 
   return USBD_OK;
 }
@@ -228,10 +254,7 @@ USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx
   if (pdev->pClass != NULL)
   {
     /* Set configuration and Start the Class */
-    if(pdev->pClass->Init(pdev, cfgidx) == 0U)
-    {
-      ret = USBD_OK;
-    }
+    ret = (USBD_StatusTypeDef)pdev->pClass->Init(pdev, cfgidx);
   }
 
   return ret;
@@ -247,19 +270,25 @@ 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 */
+  if (pdev->pClass != NULL)
+  {
     pdev->pClass->DeInit(pdev, cfgidx);
+  }
+
   return USBD_OK;
 }
 
 
 /**
-* @brief  USBD_SetupStage
+  * @brief  USBD_LL_SetupStage
   *         Handle the setup stage
   * @param  pdev: device instance
   * @retval status
   */
 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,36 +298,38 @@ 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;
 }
 
 /**
-* @brief  USBD_DataOutStage
+  * @brief  USBD_LL_DataOutStage
   *         Handle data OUT stage
   * @param  pdev: device instance
   * @param  epnum: endpoint index
+  * @param  pdata: data pointer
   * @retval status
   */
 USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
                                         uint8_t epnum, uint8_t *pdata)
 {
   USBD_EndpointTypeDef *pep;
+  USBD_StatusTypeDef ret;
 
   if (epnum == 0U)
   {
@@ -310,57 +341,66 @@ USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
       {
         pep->rem_length -= pep->maxpacket;
 
-        USBD_CtlContinueRx (pdev,
-                            pdata,
-                            (uint16_t)MIN(pep->rem_length, pep->maxpacket));
+        (void)USBD_CtlContinueRx(pdev, pdata, MIN(pep->rem_length, pep->maxpacket));
       }
       else
       {
-        if((pdev->pClass->EP0_RxReady != NULL)&&
-           (pdev->dev_state == USBD_STATE_CONFIGURED))
+        if (pdev->dev_state == USBD_STATE_CONFIGURED)
+        {
+          if (pdev->pClass->EP0_RxReady != NULL)
           {
             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) &&
-          (pdev->dev_state == USBD_STATE_CONFIGURED))
-  {
-    pdev->pClass->DataOut(pdev, epnum);
-  }
   else
   {
-    /* should never be in this condition */
-    return USBD_FAIL;
+    if (pdev->dev_state == USBD_STATE_CONFIGURED)
+    {
+      if (pdev->pClass->DataOut != NULL)
+      {
+        ret = (USBD_StatusTypeDef)pdev->pClass->DataOut(pdev, epnum);
+
+        if (ret != USBD_OK)
+        {
+          return ret;
+        }
+      }
+    }
   }
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_DataInStage
+  * @brief  USBD_LL_DataInStage
   *         Handle data in stage
   * @param  pdev: device instance
   * @param  epnum: endpoint index
   * @retval status
   */
-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_EndpointTypeDef *pep;
+  USBD_StatusTypeDef ret;
 
   if (epnum == 0U)
   {
@@ -372,59 +412,69 @@ USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum,
       {
         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)&&
-             (pdev->dev_state == USBD_STATE_CONFIGURED))
+          if (pdev->dev_state == USBD_STATE_CONFIGURED)
+          {
+            if (pdev->pClass->EP0_TxSent != NULL)
             {
               pdev->pClass->EP0_TxSent(pdev);
             }
-          USBD_LL_StallEP(pdev, 0x80U);
-          USBD_CtlReceiveStatus(pdev);
+          }
+          (void)USBD_LL_StallEP(pdev, 0x80U);
+          (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) &&
-          (pdev->dev_state == USBD_STATE_CONFIGURED))
-  {
-    pdev->pClass->DataIn(pdev, epnum);
-  }
   else
   {
-    /* should never be in this condition */
-    return USBD_FAIL;
+    if (pdev->dev_state == USBD_STATE_CONFIGURED)
+    {
+      if (pdev->pClass->DataIn != NULL)
+      {
+        ret = (USBD_StatusTypeDef)pdev->pClass->DataIn(pdev, epnum);
+
+        if (ret != USBD_OK)
+        {
+          return ret;
+        }
+      }
+    }
   }
 
   return USBD_OK;
@@ -439,45 +489,56 @@ USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum,
 
 USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef *pdev)
 {
-  /* Open EP0 OUT */
-  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);
-  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)
+  if (pdev->pClass == NULL)
   {
-    pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+    return USBD_FAIL;
   }
 
+  if (pdev->pClassData != NULL)
+  {
+    if (pdev->pClass->DeInit != NULL)
+    {
+      (void)pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+    }
+  }
+
+  /* Open EP0 OUT */
+  (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 */
+  (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;
+
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_LL_Reset
+  * @brief  USBD_LL_SetSpeed
   *         Handle Reset event
   * @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;
 }
 
 /**
-* @brief  USBD_Suspend
+  * @brief  USBD_LL_Suspend
   *         Handle Suspend event
   * @param  pdev: device instance
   * @retval status
@@ -487,24 +548,29 @@ USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)
 {
   pdev->dev_old_state = pdev->dev_state;
   pdev->dev_state = USBD_STATE_SUSPENDED;
+
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_Resume
+  * @brief  USBD_LL_Resume
   *         Handle Resume event
   * @param  pdev: device instance
   * @retval status
   */
 
 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;
 }
 
 /**
-* @brief  USBD_SOF
+  * @brief  USBD_LL_SOF
   *         Handle SOF event
   * @param  pdev: device instance
   * @retval status
@@ -512,48 +578,74 @@ USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)
 
 USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef *pdev)
 {
+  if (pdev->pClass == NULL)
+  {
+    return USBD_FAIL;
+  }
+
   if (pdev->dev_state == USBD_STATE_CONFIGURED)
   {
     if (pdev->pClass->SOF != NULL)
     {
-      pdev->pClass->SOF(pdev);
+      (void)pdev->pClass->SOF(pdev);
     }
   }
+
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_IsoINIncomplete
+  * @brief  USBD_LL_IsoINIncomplete
   *         Handle iso in incomplete event
   * @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);
-  UNUSED(epnum);
+  if (pdev->pClass == NULL)
+  {
+    return USBD_FAIL;
+  }
+
+  if (pdev->dev_state == USBD_STATE_CONFIGURED)
+  {
+    if (pdev->pClass->IsoINIncomplete != NULL)
+    {
+      (void)pdev->pClass->IsoINIncomplete(pdev, epnum);
+    }
+  }
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_IsoOUTIncomplete
+  * @brief  USBD_LL_IsoOUTIncomplete
   *         Handle iso out incomplete event
   * @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);
-  UNUSED(epnum);
+  if (pdev->pClass == NULL)
+  {
+    return USBD_FAIL;
+  }
+
+  if (pdev->dev_state == USBD_STATE_CONFIGURED)
+  {
+    if (pdev->pClass->IsoOUTIncomplete != NULL)
+    {
+      (void)pdev->pClass->IsoOUTIncomplete(pdev, epnum);
+    }
+  }
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_DevConnected
+  * @brief  USBD_LL_DevConnected
   *         Handle device connection event
   * @param  pdev: device instance
   * @retval status
@@ -567,7 +659,7 @@ USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev)
 }
 
 /**
-* @brief  USBD_DevDisconnected
+  * @brief  USBD_LL_DevDisconnected
   *         Handle device disconnection event
   * @param  pdev: device instance
   * @retval status
@@ -576,7 +668,11 @@ USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev)
 {
   /* Free Class Resources */
   pdev->dev_state = USBD_STATE_DEFAULT;
-  pdev->pClass->DeInit(pdev, (uint8_t)pdev->dev_config);
+
+  if (pdev->pClass != NULL)
+  {
+    (void)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 ,
-                               USBD_SetupReqTypedef *req);
-
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req);
-
-static void USBD_SetConfig(USBD_HandleTypeDef *pdev ,
-                           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 void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, 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_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);
 
 /**
@@ -116,15 +105,13 @@ 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);
           break;
 
@@ -133,7 +120,7 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
           break;
 
         case USB_REQ_SET_CONFIGURATION:
-      USBD_SetConfig (pdev, req);
+          ret = USBD_SetConfig(pdev, req);
           break;
 
         case USB_REQ_GET_CONFIGURATION:
@@ -144,7 +131,6 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
           USBD_GetStatus(pdev, req);
           break;
 
-
         case USB_REQ_SET_FEATURE:
           USBD_SetFeature(pdev, req);
           break;
@@ -195,7 +181,7 @@ USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 
             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;
 }
 
 /**
@@ -227,41 +213,29 @@ USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
   */
 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:
-
           switch (pdev->dev_state)
           {
             case USBD_STATE_ADDRESSED:
               if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
               {
-          USBD_LL_StallEP(pdev, ep_addr);
-          USBD_LL_StallEP(pdev, 0x80U);
+                (void)USBD_LL_StallEP(pdev, ep_addr);
+                (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;
 
@@ -294,8 +268,8 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
             case USBD_STATE_ADDRESSED:
               if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
               {
-          USBD_LL_StallEP(pdev, ep_addr);
-          USBD_LL_StallEP(pdev, 0x80U);
+                (void)USBD_LL_StallEP(pdev, ep_addr);
+                (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);
+                ret = (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
               }
               break;
 
@@ -334,7 +309,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;
 
             case USBD_STATE_CONFIGURED:
@@ -362,7 +337,7 @@ USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTyped
               {
                 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 ,
-                               USBD_SetupReqTypedef *req)
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-  uint16_t len;
-  uint8_t *pbuf;
-
+  uint16_t len = 0U;
+  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:
@@ -421,12 +405,12 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
     case USB_DESC_TYPE_CONFIGURATION:
       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,83 +419,164 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
       switch ((uint8_t)(req->wValue))
       {
         case USBD_IDX_LANGID_STR:
-     pbuf = pdev->pDesc->GetLangIDStrDescriptor(pdev->dev_speed, &len);
-      break;
-
-    case USBD_IDX_MFC_STR:
-      pbuf = pdev->pDesc->GetManufacturerStrDescriptor(pdev->dev_speed, &len);
-      break;
-
-    case USBD_IDX_PRODUCT_STR:
-      pbuf = pdev->pDesc->GetProductStrDescriptor(pdev->dev_speed, &len);
-      break;
-
-    case USBD_IDX_SERIAL_STR:
-      pbuf = pdev->pDesc->GetSerialStrDescriptor(pdev->dev_speed, &len);
-      break;
-
-    case USBD_IDX_CONFIG_STR:
-      pbuf = pdev->pDesc->GetConfigurationStrDescriptor(pdev->dev_speed, &len);
-      break;
-
-    case USBD_IDX_INTERFACE_STR:
-      pbuf = pdev->pDesc->GetInterfaceStrDescriptor(pdev->dev_speed, &len);
-      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)
+          if (pdev->pDesc->GetLangIDStrDescriptor != NULL)
           {
-      pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(&len);
-      break;
+            pbuf = pdev->pDesc->GetLangIDStrDescriptor(pdev->dev_speed, &len);
           }
           else
           {
             USBD_CtlError(pdev, req);
-      return;
+            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:
+          if (pdev->pDesc->GetInterfaceStrDescriptor != NULL)
+          {
+            pbuf = pdev->pDesc->GetInterfaceStrDescriptor(pdev->dev_speed, &len);
+          }
+          else
+          {
+            USBD_CtlError(pdev, req);
+            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++;
+          }
+#endif
+
+#if (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++;
+          }
+#endif
+
+#if ((USBD_CLASS_USER_STRING_DESC == 0U) && (USBD_SUPPORT_USER_STRING_DESC == 0U))
+          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)
       {
-      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);
-      return;
+        err++;
       }
+      break;
 
     default:
       USBD_CtlError(pdev, req);
+      err++;
+      break;
+  }
+
+  if (err != 0U)
+  {
     return;
   }
 
-  if((len != 0U) && (req->wLength != 0U))
+  if (req->wLength != 0U)
+  {
+    if (len != 0U)
     {
-
       len = MIN(len, req->wLength);
-
-    USBD_CtlSendData (pdev, pbuf, len);
+      (void)USBD_CtlSendData(pdev, pbuf, len);
     }
-
-  if(req->wLength == 0U)
+    else
     {
-   USBD_CtlSendStatus(pdev);
+      USBD_CtlError(pdev, req);
     }
   }
+  else
+  {
+    (void)USBD_CtlSendStatus(pdev);
+  }
+}
+
 
 /**
   * @brief  USBD_SetAddress
@@ -520,8 +585,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
   * @param  req: usb request
   * @retval status
   */
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req)
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   uint8_t  dev_addr;
 
@@ -536,8 +600,8 @@ static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
     else
     {
       pdev->dev_address = dev_addr;
-      USBD_LL_SetUSBAddress(pdev, dev_addr);
-      USBD_CtlSendStatus(pdev);
+      (void)USBD_LL_SetUSBAddress(pdev, dev_addr);
+      (void)USBD_CtlSendStatus(pdev);
 
       if (dev_addr != 0U)
       {
@@ -562,8 +626,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 +636,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 +669,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);
-        USBD_CtlSendStatus(pdev);
+        (void)USBD_ClrClassConfig(pdev, cfgidx);
+        (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;
-        }
-        USBD_CtlSendStatus(pdev);
+          (void)USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
+          pdev->dev_state = USBD_STATE_ADDRESSED;
         }
         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;
 }
 
 /**
@@ -650,11 +729,11 @@ 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:
@@ -690,12 +769,12 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       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:
@@ -712,16 +791,13 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
   * @param  req: usb request
   * @retval status
   */
-static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req)
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-
   if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
   {
     pdev->dev_remote_wakeup = 1U;
-    USBD_CtlSendStatus(pdev);
+    (void)USBD_CtlSendStatus(pdev);
   }
-
 }
 
 
@@ -732,8 +808,7 @@ static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
   * @param  req: usb request
   * @retval status
   */
-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req)
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   switch (pdev->dev_state)
   {
@@ -743,7 +818,7 @@ 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;
 
@@ -753,6 +828,7 @@ static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
   }
 }
 
+
 /**
   * @brief  USBD_ParseSetupRequest
   *         Copy buffer into setup structure
@@ -760,17 +836,28 @@ static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
   * @param  req: usb request
   * @retval None
   */
-
 void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
 {
-  req->bmRequest     = *(uint8_t *)  (pdata);
-  req->bRequest      = *(uint8_t *)  (pdata +  1);
-  req->wValue        = SWAPBYTE      (pdata +  2);
-  req->wIndex        = SWAPBYTE      (pdata +  4);
-  req->wLength       = SWAPBYTE      (pdata +  6);
+  uint8_t *pbuff = pdata;
 
+  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);
 }
 
+
 /**
   * @brief  USBD_CtlError
   *         Handle USB low level Error
@@ -778,12 +865,12 @@ void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
   * @param  req: usb request
   * @retval None
   */
-
-void USBD_CtlError( USBD_HandleTypeDef *pdev ,
-                            USBD_SetupReqTypedef *req)
+void USBD_CtlError(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-  USBD_LL_StallEP(pdev , 0x80U);
-  USBD_LL_StallEP(pdev , 0U);
+  UNUSED(req);
+
+  (void)USBD_LL_StallEP(pdev, 0x80U);
+  (void)USBD_LL_StallEP(pdev, 0U);
 }
 
 
@@ -798,21 +885,33 @@ 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;
-    unicode[idx++] = *(uint8_t *)(void *)len;
-    unicode[idx++] = USB_DESC_TYPE_STRING;
+    return;
+  }
 
-    while (*desc != '\0')
+  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++] = *desc++;
-      unicode[idx++] =  0U;
-    }
+    unicode[idx] = *pdesc;
+    pdesc++;
+    idx++;
+
+    unicode[idx] = 0U;
+    idx++;
   }
 }
 
+
 /**
   * @brief  USBD_GetLen
   *         return the string length
@@ -822,11 +921,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
-  *          following user needs.
+  *          This template should be copied to the user folder,
+  *          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
   *
   ******************************************************************************
   */
@@ -46,12 +46,18 @@ uint8_t *USBD_Class_ProductStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *len
 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);
-#endif /* USB_SUPPORT_USER_STRING_DESC */
+
+#if (USBD_CLASS_USER_STRING_DESC == 1)
+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
 #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,18 +105,134 @@ __ALIGN_BEGIN   uint8_t USBD_DeviceDesc[USB_LEN_DEV_DESC] __ALIGN_END = {
   USBD_MAX_NUM_CONFIGURATION  /* bNumConfigurations */
 }; /* USB_DeviceDescriptor */
 
+
+/* 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_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 = {
+__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,
@@ -120,6 +255,8 @@ 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;
 }
@@ -132,6 +269,8 @@ 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;
 }
@@ -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,6 +316,8 @@ 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*/
@@ -236,13 +379,47 @@ static void Get_SerialNum(void)
 
   deviceserial0 += deviceserial2;
 
-  if (deviceserial0 != 0)
+  if (deviceserial0 != 0U)
   {
-    IntToUnicode (deviceserial0, &USBD_StringSerial[2] ,8);
-    IntToUnicode (deviceserial1, &USBD_StringSerial[18] ,4);
+    IntToUnicode(deviceserial0, &USBD_StringSerial[2], 8U);
+    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
@@ -252,22 +429,22 @@ static void Get_SerialNum(void)
   */
 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,16 +84,21 @@
   * @param  len: length of data to be sent
   * @retval status
   */
-USBD_StatusTypeDef USBD_CtlSendData (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
-                                     uint16_t len)
+USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
+                                    uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_IN;
   pdev->ep_in[0].total_length = len;
+
+#ifdef USBD_AVOID_PACKET_SPLIT_MPS
+  pdev->ep_in[0].rem_length = 0U;
+#else
   pdev->ep_in[0].rem_length = len;
+#endif
 
   /* Start the transfer */
-  USBD_LL_Transmit (pdev, 0x00U, pbuf, len);
+  (void)USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
 
   return USBD_OK;
 }
@@ -107,10 +112,10 @@ USBD_StatusTypeDef USBD_CtlSendData (USBD_HandleTypeDef *pdev, uint8_t *pbuf,
   * @retval status
   */
 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,16 +128,21 @@ 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,
-                                      uint16_t len)
+USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
+                                     uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_OUT;
   pdev->ep_out[0].total_length = len;
+
+#ifdef USBD_AVOID_PACKET_SPLIT_MPS
+  pdev->ep_out[0].rem_length = 0U;
+#else
   pdev->ep_out[0].rem_length = len;
+#endif
 
   /* Start the transfer */
-  USBD_LL_PrepareReceive (pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
@@ -145,10 +155,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,
-                                       uint16_t len)
+USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
+                                      uint8_t *pbuf, uint32_t len)
 {
-  USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
@@ -165,7 +175,7 @@ USBD_StatusTypeDef USBD_CtlSendStatus (USBD_HandleTypeDef *pdev)
   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;
 }
@@ -182,7 +192,7 @@ USBD_StatusTypeDef USBD_CtlReceiveStatus (USBD_HandleTypeDef *pdev)
   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;
 }

README.md

@@ -29,19 +29,6 @@ This software component is licensed by  ST under Ultimate Liberty license SLA004
 
 Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/stm32_mw_usb_device/blob/master/Release_Notes.html).
 
-## Compatibility information
-
-This table shows the correspondence between the USB Device MW version and the corresponding HAL version of the targeted series. It is **crucial** that you use a consistent set of versions for the MW - HAL, as mentioned in this table.
-
-Note that:
-* in case a series does not support a particular tag, it is not mentioned in front of it.
-* in case a series supports a recent tag, it is not mentioned in front of older ones.
-
-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))
-
 ## Troubleshooting
 
 If you have any issue with the **software content** of this repository, you can file an issue [here](https://github.com/STMicroelectronics/stm32_mw_usb_device/issues/new/choose).

Release_Notes.html

@@ -14,6 +14,8 @@
 
 
 
+
+
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
 <link rel="File-List" href="Release_Notes_for_STM32F2xx_StdPeriph_Driver_files/filelist.xml">
 <link rel="Edit-Time-Data" href="Release_Notes_for_STM32F2xx_StdPeriph_Driver_files/editdata.mso"><!--[if !mso]>
@@ -920,10 +922,151 @@ ul
   </tbody></table>
   <p class="MsoNormal"><span style="font-family: &quot;Arial&quot;,&quot;sans-serif&quot;; display: none;"><o:p>&nbsp;</o:p></span></p>
   <table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" width="900">
-   <tbody><tr style="">
+   <tbody><tr>
     <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.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
+            
+            <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.8.0 / 10-Mars-2021</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></p><ul style="margin-top: 0cm;" type="square"><li>Integration of&nbsp; new USB device Class driver:</li><ul><li>USB Printer Class driver based on&nbsp;Universal Serial Bus
+Device Class Definition
+for
+Printing Devices Version 1.1</li></ul><li>USB All Classes:</li><ul><li>Fix USB buffer overflow vulnerability for CDC, CDC-ECM, CDC-RNDIS, DFU, AUDIO, CustomHID, and Video Classes</li><li>fix compilation warning with C++ due to missing casting during class handler allocation</li><li>Enhance comments of USB configuration descriptors fields</li></ul><li>USB Video Class:</li><ul><li>fix missing closing bracket for extern "C" in usbd_video.h</li><li>fix USBCV test with Uncompressed video format support</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.7.1 / 18-August-2020</span></h3>
+            <b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;"></span></u></b><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></p>
+            <ul style="margin-top: 0cm;" type="square">
+<li>USB All Class:</li>
+              <ul>
+                <li>Add NULL pointer access check to Class handler<br>
+                </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.7.0 / 12-August-2020</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></p><ul style="margin-top: 0cm;" type="square"><li>Integration of&nbsp; new USB device Class driver:</li><ul><li>USB video Class driver based on USB-IF video class definition version 1.1</li></ul></ul>
+
+
+
+
+
+
+
+
+
+
+
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            <ul style="margin-top: 0cm;" type="square"><li>USB Core:</li><ul><li>Enhance NULL pointer check in Core APIs</li><li>Allow supporting both USER and USER Class string desc</li><li>Add support of USB controller which handles packet-size splitting by hardware</li><li>Avoid compilation warning due macro redefinition</li><li>change
+added to USBD_HandleTypeDef structure: dev_state, old_dev_state and
+ep0_state declaration become volatile to disable compiler optimization</li><li>Word spelling correction and file indentation improved</li><li>usbd_conf.h/c Template file updated to suggest using by default a static memory allocation for Class handler</li></ul></ul><ul style="margin-top: 0cm;" type="square"><li>USB All Classes</li><ul><li>Word spelling correction and file indentation improved</li><li>Allow updating device config descriptor Max power from user code usbd_conf.h using USBD_MAX_POWER define</li><li>Fix device config descriptor bmAttributes value which depends on user code define USBD_SELF_POWERED</li></ul></ul><ul style="margin-top: 0cm;" type="square"><li>USB CDC Class:</li><ul><li>Class specific request, add protection to limit the maximum data length to be sent by the CDC device</li></ul></ul><ul style="margin-top: 0cm;" type="square"><li>USB CustomHID Class:</li><ul><li>Allow changing CustomHID data EP size from user code </li></ul></ul>
+            <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.1 / 05-June-2020</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>USB Core:</li>
+              <ul>
+                <li>minor rework on USBD_Init() USBD_DeInit()</li>
+                <li>Fix warning issue with Keil due to missing return value of setup API<br>
+                </li>
+              </ul>
+              <li>USB CDC Class:</li>
+              <ul>
+                <li>Fix file indentation</li>
+                <li>Avoid accessing to NULL pointer in case
+TransmitCplt() user fops is not defined to allow application
+compatibility with device library version below v2.6.0<br>
+                </li>
+              </ul>
+            </ul>
+            <br>
+            <ul style="margin-top: 0cm;" type="square">
+<li>Fix minor misra-c 2012 violations</li>
+            </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.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 mandatory 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 multiple 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 automatically 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 instead 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>
 
 
@@ -1359,7 +1502,7 @@ compliance with the License. You may obtain a copy of the License at:</p><p styl
     Microcontrollers visit </span><u><span style="color: blue;"><a href="http://www.st.com/internet/mcu/family/141.jsp" target="_blank">www.st.com/STM32</a></span></u></span><span style="font-size: 10pt; font-family: &quot;Verdana&quot;,&quot;sans-serif&quot;;"><u><span style="color: blue;"><a href="http://www.st.com/stm32" target="_blank"></a></span></u></span><span style="color: black;"><o:p></o:p></span></p>
     </td>
    </tr>
-  </tbody></table>
+  <tr><td style="padding: 0in;" valign="top"></td></tr></tbody></table>
   <p class="MsoNormal"><span style="font-size: 10pt;"><o:p></o:p></span></p>
   </td>
  </tr>