fix error

Co-authored-by: Berk Akinci <bakinci@zeevee.com>
Co-authored-by: Ali LABBENE <46019491+ALABSTM@users.noreply.github.com>

Class/AUDIO/Inc/usbd_audio.h

@@ -1,211 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_audio.h
-  * @author  MCD Application Team
-  * @brief   header file for the usbd_audio.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_AUDIO_H
-#define __USB_AUDIO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_AUDIO
-  * @brief This file is the Header file for usbd_audio.c
-  * @{
-  */
-
-
-/** @defgroup USBD_AUDIO_Exported_Defines
-  * @{
-  */
-#ifndef USBD_AUDIO_FREQ
-/* AUDIO Class Config */
-#define USBD_AUDIO_FREQ                               48000U
-#endif /* USBD_AUDIO_FREQ */
-
-#ifndef USBD_MAX_NUM_INTERFACES
-#define USBD_MAX_NUM_INTERFACES                       1U
-#endif /* USBD_AUDIO_FREQ */
-
-#define AUDIO_OUT_EP                                  0x01U
-#define USB_AUDIO_CONFIG_DESC_SIZ                     0x6DU
-#define AUDIO_INTERFACE_DESC_SIZE                     0x09U
-#define USB_AUDIO_DESC_SIZ                            0x09U
-#define AUDIO_STANDARD_ENDPOINT_DESC_SIZE             0x09U
-#define AUDIO_STREAMING_ENDPOINT_DESC_SIZE            0x07U
-
-#define AUDIO_DESCRIPTOR_TYPE                         0x21U
-#define USB_DEVICE_CLASS_AUDIO                        0x01U
-#define AUDIO_SUBCLASS_AUDIOCONTROL                   0x01U
-#define AUDIO_SUBCLASS_AUDIOSTREAMING                 0x02U
-#define AUDIO_PROTOCOL_UNDEFINED                      0x00U
-#define AUDIO_STREAMING_GENERAL                       0x01U
-#define AUDIO_STREAMING_FORMAT_TYPE                   0x02U
-
-/* Audio Descriptor Types */
-#define AUDIO_INTERFACE_DESCRIPTOR_TYPE               0x24U
-#define AUDIO_ENDPOINT_DESCRIPTOR_TYPE                0x25U
-
-/* Audio Control Interface Descriptor Subtypes */
-#define AUDIO_CONTROL_HEADER                          0x01U
-#define AUDIO_CONTROL_INPUT_TERMINAL                  0x02U
-#define AUDIO_CONTROL_OUTPUT_TERMINAL                 0x03U
-#define AUDIO_CONTROL_FEATURE_UNIT                    0x06U
-
-#define AUDIO_INPUT_TERMINAL_DESC_SIZE                0x0CU
-#define AUDIO_OUTPUT_TERMINAL_DESC_SIZE               0x09U
-#define AUDIO_STREAMING_INTERFACE_DESC_SIZE           0x07U
-
-#define AUDIO_CONTROL_MUTE                            0x0001U
-
-#define AUDIO_FORMAT_TYPE_I                           0x01U
-#define AUDIO_FORMAT_TYPE_III                         0x03U
-
-#define AUDIO_ENDPOINT_GENERAL                        0x01U
-
-#define AUDIO_REQ_GET_CUR                             0x81U
-#define AUDIO_REQ_SET_CUR                             0x01U
-
-#define AUDIO_OUT_STREAMING_CTRL                      0x02U
-
-
-#define AUDIO_OUT_PACKET                              (uint16_t)(((USBD_AUDIO_FREQ * 2U * 2U) / 1000U))
-#define AUDIO_DEFAULT_VOLUME                          70U
-
-/* Number of sub-packets in the audio transfer buffer. You can modify this value but always make sure
-  that it is an even number and higher than 3 */
-#define AUDIO_OUT_PACKET_NUM                          80U
-/* Total size of the audio transfer buffer */
-#define AUDIO_TOTAL_BUF_SIZE                          ((uint16_t)(AUDIO_OUT_PACKET * AUDIO_OUT_PACKET_NUM))
-
-/* Audio Commands enumeration */
-typedef enum
-{
-  AUDIO_CMD_START = 1,
-  AUDIO_CMD_PLAY,
-  AUDIO_CMD_STOP,
-} AUDIO_CMD_TypeDef;
-
-
-typedef enum
-{
-  AUDIO_OFFSET_NONE = 0,
-  AUDIO_OFFSET_HALF,
-  AUDIO_OFFSET_FULL,
-  AUDIO_OFFSET_UNKNOWN,
-}
-AUDIO_OffsetTypeDef;
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_TypesDefinitions
-  * @{
-  */
-typedef struct
-{
-  uint8_t cmd;
-  uint8_t data[USB_MAX_EP0_SIZE];
-  uint8_t len;
-  uint8_t unit;
-}
-USBD_AUDIO_ControlTypeDef;
-
-
-
-typedef struct
-{
-  uint32_t                  alt_setting;
-  uint8_t                   buffer[AUDIO_TOTAL_BUF_SIZE];
-  AUDIO_OffsetTypeDef       offset;
-  uint8_t                    rd_enable;
-  uint16_t                   rd_ptr;
-  uint16_t                   wr_ptr;
-  USBD_AUDIO_ControlTypeDef control;
-}
-USBD_AUDIO_HandleTypeDef;
-
-
-typedef struct
-{
-  int8_t (*Init)(uint32_t  AudioFreq, uint32_t Volume, uint32_t options);
-  int8_t (*DeInit)(uint32_t options);
-  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 (*GetState)(void);
-} USBD_AUDIO_ItfTypeDef;
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_CORE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CORE_Exported_Variables
-  * @{
-  */
-
-extern USBD_ClassTypeDef  USBD_AUDIO;
-#define USBD_AUDIO_CLASS    &USBD_AUDIO
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Functions
-  * @{
-  */
-uint8_t  USBD_AUDIO_RegisterInterface(USBD_HandleTypeDef *pdev,
-                                      USBD_AUDIO_ItfTypeDef *fops);
-
-void  USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset);
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USB_AUDIO_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/AUDIO/Inc/usbd_audio_if_template.h

@@ -1,45 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_audio_if_template.h
-  * @author  MCD Application Team
-  * @brief   Header for usbd_audio_if_template.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 __USBD_AUDIO_IF_TEMPLATE_H
-#define __USBD_AUDIO_IF_TEMPLATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_audio.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-extern USBD_AUDIO_ItfTypeDef  USBD_AUDIO_Template_fops;
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_AUDIO_IF_TEMPLATE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/AUDIO/Src/usbd_audio.c

@@ -1,800 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_audio.c
-  * @author  MCD Application Team
-  * @brief   This file provides the Audio core functions.
-  *
-  * @verbatim
-  *
-  *          ===================================================================
-  *                                AUDIO Class  Description
-  *          ===================================================================
-  *           This driver manages the Audio Class 1.0 following the "USB Device Class Definition for
-  *           Audio Devices V1.0 Mar 18, 98".
-  *           This driver implements the following aspects of the specification:
-  *             - Device descriptor management
-  *             - Configuration descriptor management
-  *             - Standard AC Interface Descriptor management
-  *             - 1 Audio Streaming Interface (with single channel, PCM, Stereo mode)
-  *             - 1 Audio Streaming Endpoint
-  *             - 1 Audio Terminal Input (1 channel)
-  *             - Audio Class-Specific AC Interfaces
-  *             - Audio Class-Specific AS Interfaces
-  *             - AudioControl Requests: only SET_CUR and GET_CUR requests are supported (for Mute)
-  *             - Audio Feature Unit (limited to Mute control)
-  *             - Audio Synchronization type: Asynchronous
-  *             - Single fixed audio sampling rate (configurable in usbd_conf.h file)
-  *          The current audio class version supports the following audio features:
-  *             - Pulse Coded Modulation (PCM) format
-  *             - sampling rate: 48KHz.
-  *             - Bit resolution: 16
-  *             - Number of channels: 2
-  *             - No volume control
-  *             - Mute/Unmute capability
-  *             - Asynchronous Endpoints
-  *
-  * @note     In HS mode and when the DMA is used, all variables and data structures
-  *           dealing with the DMA during the transaction process should be 32-bit aligned.
-  *
-  *
-  *  @endverbatim
-  *
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}_audio.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_audio.h"
-#include "usbd_ctlreq.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_AUDIO
-  * @brief usbd core module
-  * @{
-  */
-
-/** @defgroup USBD_AUDIO_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_Macros
-  * @{
-  */
-#define AUDIO_SAMPLE_FREQ(frq)         (uint8_t)(frq), (uint8_t)((frq >> 8)), (uint8_t)((frq >> 16))
-
-#define AUDIO_PACKET_SZE(frq)          (uint8_t)(((frq * 2U * 2U)/1000U) & 0xFFU), \
-                                       (uint8_t)((((frq * 2U * 2U)/1000U) >> 8) & 0xFFU)
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_FunctionPrototypes
-  * @{
-  */
-static uint8_t USBD_AUDIO_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-static uint8_t USBD_AUDIO_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
-
-static uint8_t USBD_AUDIO_Setup(USBD_HandleTypeDef *pdev,
-                                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);
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_AUDIO_Private_Variables
-  * @{
-  */
-
-USBD_ClassTypeDef  USBD_AUDIO =
-{
-  USBD_AUDIO_Init,
-  USBD_AUDIO_DeInit,
-  USBD_AUDIO_Setup,
-  USBD_AUDIO_EP0_TxReady,
-  USBD_AUDIO_EP0_RxReady,
-  USBD_AUDIO_DataIn,
-  USBD_AUDIO_DataOut,
-  USBD_AUDIO_SOF,
-  USBD_AUDIO_IsoINIncomplete,
-  USBD_AUDIO_IsoOutIncomplete,
-  USBD_AUDIO_GetCfgDesc,
-  USBD_AUDIO_GetCfgDesc,
-  USBD_AUDIO_GetCfgDesc,
-  USBD_AUDIO_GetDeviceQualifierDesc,
-};
-
-/* USB AUDIO device Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_AUDIO_CfgDesc[USB_AUDIO_CONFIG_DESC_SIZ] __ALIGN_END =
-{
-  /* Configuration 1 */
-  0x09,                                 /* bLength */
-  USB_DESC_TYPE_CONFIGURATION,          /* bDescriptorType */
-  LOBYTE(USB_AUDIO_CONFIG_DESC_SIZ),    /* wTotalLength  109 bytes*/
-  HIBYTE(USB_AUDIO_CONFIG_DESC_SIZ),
-  0x02,                                 /* bNumInterfaces */
-  0x01,                                 /* bConfigurationValue */
-  0x00,                                 /* iConfiguration */
-  0xC0,                                 /* bmAttributes  BUS Powred*/
-  0x32,                                 /* bMaxPower = 100 mA*/
-  /* 09 byte*/
-
-  /* USB Speaker Standard interface descriptor */
-  AUDIO_INTERFACE_DESC_SIZE,            /* bLength */
-  USB_DESC_TYPE_INTERFACE,              /* bDescriptorType */
-  0x00,                                 /* bInterfaceNumber */
-  0x00,                                 /* bAlternateSetting */
-  0x00,                                 /* bNumEndpoints */
-  USB_DEVICE_CLASS_AUDIO,               /* bInterfaceClass */
-  AUDIO_SUBCLASS_AUDIOCONTROL,          /* bInterfaceSubClass */
-  AUDIO_PROTOCOL_UNDEFINED,             /* bInterfaceProtocol */
-  0x00,                                 /* iInterface */
-  /* 09 byte*/
-
-  /* USB Speaker Class-specific AC Interface Descriptor */
-  AUDIO_INTERFACE_DESC_SIZE,            /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_CONTROL_HEADER,                 /* bDescriptorSubtype */
-  0x00,          /* 1.00 */             /* bcdADC */
-  0x01,
-  0x27,                                 /* wTotalLength = 39*/
-  0x00,
-  0x01,                                 /* bInCollection */
-  0x01,                                 /* baInterfaceNr */
-  /* 09 byte*/
-
-  /* USB Speaker Input Terminal Descriptor */
-  AUDIO_INPUT_TERMINAL_DESC_SIZE,       /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_CONTROL_INPUT_TERMINAL,         /* bDescriptorSubtype */
-  0x01,                                 /* bTerminalID */
-  0x01,                                 /* wTerminalType AUDIO_TERMINAL_USB_STREAMING   0x0101 */
-  0x01,
-  0x00,                                 /* bAssocTerminal */
-  0x01,                                 /* bNrChannels */
-  0x00,                                 /* wChannelConfig 0x0000  Mono */
-  0x00,
-  0x00,                                 /* iChannelNames */
-  0x00,                                 /* iTerminal */
-  /* 12 byte*/
-
-  /* USB Speaker Audio Feature Unit Descriptor */
-  0x09,                                 /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_CONTROL_FEATURE_UNIT,           /* bDescriptorSubtype */
-  AUDIO_OUT_STREAMING_CTRL,             /* bUnitID */
-  0x01,                                 /* bSourceID */
-  0x01,                                 /* bControlSize */
-  AUDIO_CONTROL_MUTE,                   /* bmaControls(0) */
-  0,                                    /* bmaControls(1) */
-  0x00,                                 /* iTerminal */
-  /* 09 byte*/
-
-  /*USB Speaker Output Terminal Descriptor */
-  0x09,      /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_CONTROL_OUTPUT_TERMINAL,        /* bDescriptorSubtype */
-  0x03,                                 /* bTerminalID */
-  0x01,                                 /* wTerminalType  0x0301*/
-  0x03,
-  0x00,                                 /* bAssocTerminal */
-  0x02,                                 /* bSourceID */
-  0x00,                                 /* iTerminal */
-  /* 09 byte*/
-
-  /* USB Speaker Standard AS Interface Descriptor - Audio Streaming Zero Bandwith */
-  /* Interface 1, Alternate Setting 0                                             */
-  AUDIO_INTERFACE_DESC_SIZE,  /* bLength */
-  USB_DESC_TYPE_INTERFACE,        /* bDescriptorType */
-  0x01,                                 /* bInterfaceNumber */
-  0x00,                                 /* bAlternateSetting */
-  0x00,                                 /* bNumEndpoints */
-  USB_DEVICE_CLASS_AUDIO,               /* bInterfaceClass */
-  AUDIO_SUBCLASS_AUDIOSTREAMING,        /* bInterfaceSubClass */
-  AUDIO_PROTOCOL_UNDEFINED,             /* bInterfaceProtocol */
-  0x00,                                 /* iInterface */
-  /* 09 byte*/
-
-  /* USB Speaker Standard AS Interface Descriptor - Audio Streaming Operational */
-  /* Interface 1, Alternate Setting 1                                           */
-  AUDIO_INTERFACE_DESC_SIZE,  /* bLength */
-  USB_DESC_TYPE_INTERFACE,        /* bDescriptorType */
-  0x01,                                 /* bInterfaceNumber */
-  0x01,                                 /* bAlternateSetting */
-  0x01,                                 /* bNumEndpoints */
-  USB_DEVICE_CLASS_AUDIO,               /* bInterfaceClass */
-  AUDIO_SUBCLASS_AUDIOSTREAMING,        /* bInterfaceSubClass */
-  AUDIO_PROTOCOL_UNDEFINED,             /* bInterfaceProtocol */
-  0x00,                                 /* iInterface */
-  /* 09 byte*/
-
-  /* USB Speaker Audio Streaming Interface Descriptor */
-  AUDIO_STREAMING_INTERFACE_DESC_SIZE,  /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_STREAMING_GENERAL,              /* bDescriptorSubtype */
-  0x01,                                 /* bTerminalLink */
-  0x01,                                 /* bDelay */
-  0x01,                                 /* wFormatTag AUDIO_FORMAT_PCM  0x0001*/
-  0x00,
-  /* 07 byte*/
-
-  /* USB Speaker Audio Type III Format Interface Descriptor */
-  0x0B,                                 /* bLength */
-  AUDIO_INTERFACE_DESCRIPTOR_TYPE,      /* bDescriptorType */
-  AUDIO_STREAMING_FORMAT_TYPE,          /* bDescriptorSubtype */
-  AUDIO_FORMAT_TYPE_I,                /* bFormatType */
-  0x02,                                 /* bNrChannels */
-  0x02,                                 /* bSubFrameSize :  2 Bytes per frame (16bits) */
-  16,                                   /* bBitResolution (16-bits per sample) */
-  0x01,                                 /* bSamFreqType only one frequency supported */
-  AUDIO_SAMPLE_FREQ(USBD_AUDIO_FREQ),         /* Audio sampling frequency coded on 3 bytes */
-  /* 11 byte*/
-
-  /* Endpoint 1 - Standard Descriptor */
-  AUDIO_STANDARD_ENDPOINT_DESC_SIZE,    /* bLength */
-  USB_DESC_TYPE_ENDPOINT,               /* bDescriptorType */
-  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 */
-  0x00,                                 /* bRefresh */
-  0x00,                                 /* bSynchAddress */
-  /* 09 byte*/
-
-  /* Endpoint - Audio Streaming Descriptor*/
-  AUDIO_STREAMING_ENDPOINT_DESC_SIZE,   /* bLength */
-  AUDIO_ENDPOINT_DESCRIPTOR_TYPE,       /* bDescriptorType */
-  AUDIO_ENDPOINT_GENERAL,               /* bDescriptor */
-  0x00,                                 /* bmAttributes */
-  0x00,                                 /* bLockDelayUnits */
-  0x00,                                 /* wLockDelay */
-  0x00,
-  /* 07 byte*/
-} ;
-
-/* USB Standard Device Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_AUDIO_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
-{
-  USB_LEN_DEV_QUALIFIER_DESC,
-  USB_DESC_TYPE_DEVICE_QUALIFIER,
-  0x00,
-  0x02,
-  0x00,
-  0x00,
-  0x00,
-  0x40,
-  0x01,
-  0x00,
-};
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_AUDIO_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  USBD_AUDIO_Init
-  *         Initialize the AUDIO interface
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-{
-  USBD_AUDIO_HandleTypeDef   *haudio;
-
-  /* Open EP OUT */
-  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;
-    haudio->rd_ptr = 0U;
-    haudio->rd_enable = 0U;
-
-    /* Initialize the Audio output Hardware layer */
-    if (((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->Init(USBD_AUDIO_FREQ,
-                                                         AUDIO_DEFAULT_VOLUME,
-                                                         0U) != 0)
-    {
-      return USBD_FAIL;
-    }
-
-    /* Prepare Out endpoint to receive 1st packet */
-    USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP, haudio->buffer,
-                           AUDIO_OUT_PACKET);
-  }
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_AUDIO_Init
-  *         DeInitialize the AUDIO layer
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_DeInit(USBD_HandleTypeDef *pdev,
-                                  uint8_t cfgidx)
-{
-  /* Open EP OUT */
-  USBD_LL_CloseEP(pdev, AUDIO_OUT_EP);
-  pdev->ep_out[AUDIO_OUT_EP & 0xFU].is_used = 0U;
-
-  /* DeInit  physical Interface components */
-  if (pdev->pClassData != NULL)
-  {
-    ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->DeInit(0U);
-    USBD_free(pdev->pClassData);
-    pdev->pClassData = NULL;
-  }
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_AUDIO_Setup
-  *         Handle the AUDIO specific requests
-  * @param  pdev: instance
-  * @param  req: usb requests
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_Setup(USBD_HandleTypeDef *pdev,
-                                 USBD_SetupReqTypedef *req)
-{
-  USBD_AUDIO_HandleTypeDef *haudio;
-  uint16_t len;
-  uint8_t *pbuf;
-  uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
-
-  haudio = (USBD_AUDIO_HandleTypeDef *)pdev->pClassData;
-
-  switch (req->bmRequest & USB_REQ_TYPE_MASK)
-  {
-    case USB_REQ_TYPE_CLASS :
-      switch (req->bRequest)
-      {
-        case AUDIO_REQ_GET_CUR:
-          AUDIO_REQ_GetCurrent(pdev, req);
-          break;
-
-        case AUDIO_REQ_SET_CUR:
-          AUDIO_REQ_SetCurrent(pdev, req);
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    case USB_REQ_TYPE_STANDARD:
-      switch (req->bRequest)
-      {
-        case USB_REQ_GET_STATUS:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&status_info, 2U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_GET_DESCRIPTOR:
-          if ((req->wValue >> 8) == AUDIO_DESCRIPTOR_TYPE)
-          {
-            pbuf = USBD_AUDIO_CfgDesc + 18;
-            len = MIN(USB_AUDIO_DESC_SIZ, req->wLength);
-
-            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);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_SET_INTERFACE :
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            if ((uint8_t)(req->wValue) <= USBD_MAX_NUM_INTERFACES)
-            {
-              haudio->alt_setting = (uint8_t)(req->wValue);
-            }
-            else
-            {
-              /* Call the error management function (command will be nacked */
-              USBD_CtlError(pdev, req);
-              ret = USBD_FAIL;
-            }
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-    default:
-      USBD_CtlError(pdev, req);
-      ret = USBD_FAIL;
-      break;
-  }
-
-  return ret;
-}
-
-
-/**
-  * @brief  USBD_AUDIO_GetCfgDesc
-  *         return configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_AUDIO_GetCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_AUDIO_CfgDesc);
-
-  return USBD_AUDIO_CfgDesc;
-}
-
-/**
-  * @brief  USBD_AUDIO_DataIn
-  *         handle data IN Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  /* Only OUT data are processed */
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_AUDIO_EP0_RxReady
-  *         handle EP0 Rx Ready event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_EP0_RxReady(USBD_HandleTypeDef *pdev)
-{
-  USBD_AUDIO_HandleTypeDef   *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef *) pdev->pClassData;
-
-  if (haudio->control.cmd == AUDIO_REQ_SET_CUR)
-  {
-    /* In this driver, to simplify code, only SET_CUR request is managed */
-
-    if (haudio->control.unit == AUDIO_OUT_STREAMING_CTRL)
-    {
-      ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->MuteCtl(haudio->control.data[0]);
-      haudio->control.cmd = 0U;
-      haudio->control.len = 0U;
-    }
-  }
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_AUDIO_EP0_TxReady
-  *         handle EP0 TRx Ready event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_EP0_TxReady(USBD_HandleTypeDef *pdev)
-{
-  /* Only OUT control data are processed */
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_AUDIO_SOF
-  *         handle SOF event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_SOF(USBD_HandleTypeDef *pdev)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_AUDIO_SOF
-  *         handle SOF event
-  * @param  pdev: device instance
-  * @retval status
-  */
-void  USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset)
-{
-  uint32_t cmd = 0U;
-  USBD_AUDIO_HandleTypeDef   *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef *) pdev->pClassData;
-
-  haudio->offset =  offset;
-
-  if (haudio->rd_enable == 1U)
-  {
-    haudio->rd_ptr += (uint16_t)(AUDIO_TOTAL_BUF_SIZE / 2U);
-
-    if (haudio->rd_ptr == AUDIO_TOTAL_BUF_SIZE)
-    {
-      /* roll back */
-      haudio->rd_ptr = 0U;
-    }
-  }
-
-  if (haudio->rd_ptr > haudio->wr_ptr)
-  {
-    if ((haudio->rd_ptr - haudio->wr_ptr) < AUDIO_OUT_PACKET)
-    {
-      cmd = AUDIO_TOTAL_BUF_SIZE / 2U + 4U;
-    }
-    else
-    {
-      if ((haudio->rd_ptr - haudio->wr_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
-      {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U - 4U;
-      }
-    }
-  }
-  else
-  {
-    if ((haudio->wr_ptr - haudio->rd_ptr) < AUDIO_OUT_PACKET)
-    {
-      cmd = AUDIO_TOTAL_BUF_SIZE / 2U - 4U;
-    }
-    else
-    {
-      if ((haudio->wr_ptr - haudio->rd_ptr) > (AUDIO_TOTAL_BUF_SIZE - AUDIO_OUT_PACKET))
-      {
-        cmd = AUDIO_TOTAL_BUF_SIZE / 2U + 4U;
-      }
-    }
-  }
-
-  if (haudio->offset == AUDIO_OFFSET_FULL)
-  {
-    ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->AudioCmd(&haudio->buffer[0],
-                                                         cmd,
-                                                         AUDIO_CMD_PLAY);
-    haudio->offset = AUDIO_OFFSET_NONE;
-  }
-}
-
-/**
-  * @brief  USBD_AUDIO_IsoINIncomplete
-  *         handle data ISO IN Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_AUDIO_IsoOutIncomplete
-  *         handle data ISO OUT Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_AUDIO_DataOut
-  *         handle data OUT Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_AUDIO_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  USBD_AUDIO_HandleTypeDef   *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef *) pdev->pClassData;
-
-  if (epnum == AUDIO_OUT_EP)
-  {
-    /* Increment the Buffer pointer or roll it back when all buffers are full */
-
-    haudio->wr_ptr += AUDIO_OUT_PACKET;
-
-    if (haudio->wr_ptr == AUDIO_TOTAL_BUF_SIZE)
-    {
-      /* All buffers are full: roll back */
-      haudio->wr_ptr = 0U;
-
-      if (haudio->offset == AUDIO_OFFSET_UNKNOWN)
-      {
-        ((USBD_AUDIO_ItfTypeDef *)pdev->pUserData)->AudioCmd(&haudio->buffer[0],
-                                                             AUDIO_TOTAL_BUF_SIZE / 2U,
-                                                             AUDIO_CMD_START);
-        haudio->offset = AUDIO_OFFSET_NONE;
-      }
-    }
-
-    if (haudio->rd_enable == 0U)
-    {
-      if (haudio->wr_ptr == (AUDIO_TOTAL_BUF_SIZE / 2U))
-      {
-        haudio->rd_enable = 1U;
-      }
-    }
-
-    /* Prepare Out endpoint to receive next audio packet */
-    USBD_LL_PrepareReceive(pdev, AUDIO_OUT_EP, &haudio->buffer[haudio->wr_ptr],
-                           AUDIO_OUT_PACKET);
-  }
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  AUDIO_Req_GetCurrent
-  *         Handles the GET_CUR Audio control request.
-  * @param  pdev: instance
-  * @param  req: setup class request
-  * @retval status
-  */
-static void AUDIO_REQ_GetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-{
-  USBD_AUDIO_HandleTypeDef   *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef *) pdev->pClassData;
-
-  memset(haudio->control.data, 0, 64U);
-
-  /* Send the current mute state */
-  USBD_CtlSendData(pdev, haudio->control.data, req->wLength);
-}
-
-/**
-  * @brief  AUDIO_Req_SetCurrent
-  *         Handles the SET_CUR Audio control request.
-  * @param  pdev: instance
-  * @param  req: setup class request
-  * @retval status
-  */
-static void AUDIO_REQ_SetCurrent(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-{
-  USBD_AUDIO_HandleTypeDef   *haudio;
-  haudio = (USBD_AUDIO_HandleTypeDef *) pdev->pClassData;
-
-  if (req->wLength)
-  {
-    /* Prepare the reception of the buffer over EP0 */
-    USBD_CtlPrepareRx(pdev, haudio->control.data, req->wLength);
-
-    haudio->control.cmd = AUDIO_REQ_SET_CUR;     /* Set the request value */
-    haudio->control.len = (uint8_t)req->wLength; /* Set the request data length */
-    haudio->control.unit = HIBYTE(req->wIndex);  /* Set the request target unit */
-  }
-}
-
-
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-static uint8_t  *USBD_AUDIO_GetDeviceQualifierDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_AUDIO_DeviceQualifierDesc);
-
-  return USBD_AUDIO_DeviceQualifierDesc;
-}
-
-/**
-* @brief  USBD_AUDIO_RegisterInterface
-* @param  fops: Audio interface callback
-* @retval status
-*/
-uint8_t  USBD_AUDIO_RegisterInterface(USBD_HandleTypeDef *pdev,
-                                      USBD_AUDIO_ItfTypeDef *fops)
-{
-  if (fops != NULL)
-  {
-    pdev->pUserData = fops;
-  }
-
-  return USBD_OK;
-}
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/AUDIO/Src/usbd_audio_if_template.c

@@ -1,183 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_cdc_if_template.c
-  * @author  MCD Application Team
-  * @brief   Generic media access Layer.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}_audio.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_audio_if_template.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_AUDIO
-  * @brief usbd core module
-  * @{
-  */
-
-/** @defgroup USBD_AUDIO_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_AUDIO_Private_FunctionPrototypes
-  * @{
-  */
-
-static int8_t  TEMPLATE_Init(uint32_t  AudioFreq, uint32_t Volume, uint32_t options);
-static int8_t  TEMPLATE_DeInit(uint32_t options);
-static int8_t  TEMPLATE_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_GetState(void);
-
-USBD_AUDIO_ItfTypeDef USBD_AUDIO_Template_fops =
-{
-  TEMPLATE_Init,
-  TEMPLATE_DeInit,
-  TEMPLATE_AudioCmd,
-  TEMPLATE_VolumeCtl,
-  TEMPLATE_MuteCtl,
-  TEMPLATE_PeriodicTC,
-  TEMPLATE_GetState,
-};
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TEMPLATE_Init
-  *         Initializes the AUDIO 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(uint32_t  AudioFreq, uint32_t Volume, uint32_t options)
-{
-  /*
-     Add your initialization code here
-  */
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_DeInit
-  *         DeInitializes the AUDIO 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(uint32_t options)
-{
-  /*
-     Add your deinitialization code here
-  */
-  return (0);
-}
-
-
-/**
-  * @brief  TEMPLATE_AudioCmd
-  *         AUDIO command handler
-  * @param  Buf: Buffer of data to be sent
-  * @param  size: Number of data to be sent (in bytes)
-  * @param  cmd: command opcode
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_AudioCmd(uint8_t *pbuf, uint32_t size, uint8_t cmd)
-{
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_VolumeCtl
-  * @param  vol: volume level (0..100)
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_VolumeCtl(uint8_t vol)
-{
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_MuteCtl
-  * @param  cmd: vmute command
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_MuteCtl(uint8_t cmd)
-{
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_PeriodicTC
-  * @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)
-{
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_GetState
-  * @param  None
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_GetState(void)
-{
-  return (0);
-}
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/CDC/Inc/usbd_cdc.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -41,22 +40,31 @@ extern "C" {
 /** @defgroup usbd_cdc_Exported_Defines
   * @{
   */
+#ifndef CDC_IN_EP
 #define CDC_IN_EP                                   0x81U  /* EP1 for data IN */
+#endif /* CDC_IN_EP */
+#ifndef CDC_OUT_EP
 #define CDC_OUT_EP                                  0x01U  /* EP1 for data OUT */
+#endif /* CDC_OUT_EP */
+#ifndef CDC_CMD_EP
 #define CDC_CMD_EP                                  0x82U  /* EP2 for CDC commands */
+#endif /* CDC_CMD_EP  */
 
 #ifndef CDC_HS_BINTERVAL
-#define CDC_HS_BINTERVAL                          0x10U
+#define CDC_HS_BINTERVAL                            0x10U
 #endif /* CDC_HS_BINTERVAL */
 
 #ifndef CDC_FS_BINTERVAL
-#define CDC_FS_BINTERVAL                          0x10U
+#define CDC_FS_BINTERVAL                            0x10U
 #endif /* CDC_FS_BINTERVAL */
 
+#ifndef CDC_CMD_PACKET_SIZE
+#define CDC_CMD_PACKET_SIZE                         8U  /* Control Endpoint Packet size */
+#endif /* CDC_CMD_PACKET_SIZE */
+
 /* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
 #define CDC_DATA_HS_MAX_PACKET_SIZE                 512U  /* Endpoint IN & OUT Packet size */
 #define CDC_DATA_FS_MAX_PACKET_SIZE                 64U  /* Endpoint IN & OUT Packet size */
-#define CDC_CMD_PACKET_SIZE                         8U  /* Control Endpoint Packet size */
 
 #define USB_CDC_CONFIG_DESC_SIZ                     67U
 #define CDC_DATA_HS_IN_PACKET_SIZE                  CDC_DATA_HS_MAX_PACKET_SIZE
@@ -65,6 +73,7 @@ extern "C" {
 #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 +113,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 +129,7 @@ typedef struct
 
   __IO uint32_t TxState;
   __IO uint32_t RxState;
-}
+} USBD_CDC_HandleTypeDef;
-USBD_CDC_HandleTypeDef;
 
 
 
@@ -137,8 +145,8 @@ USBD_CDC_HandleTypeDef;
   * @{
   */
 
-extern USBD_ClassTypeDef  USBD_CDC;
+extern USBD_ClassTypeDef USBD_CDC;
-#define USBD_CDC_CLASS    &USBD_CDC
+#define USBD_CDC_CLASS &USBD_CDC
 /**
   * @}
   */
@@ -146,19 +154,20 @@ extern USBD_ClassTypeDef  USBD_CDC;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t  USBD_CDC_RegisterInterface(USBD_HandleTypeDef   *pdev,
+uint8_t USBD_CDC_RegisterInterface(USBD_HandleTypeDef *pdev,
-                                    USBD_CDC_ItfTypeDef *fops);
+                                   USBD_CDC_ItfTypeDef *fops);
 
-uint8_t  USBD_CDC_SetTxBuffer(USBD_HandleTypeDef   *pdev,
+#ifdef USE_USBD_COMPOSITE
-                              uint8_t  *pbuff,
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
-                              uint16_t length);
+                             uint32_t length, uint8_t ClassId);
-
+uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev, uint8_t ClassId);
-uint8_t  USBD_CDC_SetRxBuffer(USBD_HandleTypeDef   *pdev,
+#else
-                              uint8_t  *pbuff);
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
-
+                             uint32_t length);
-uint8_t  USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
-
+#endif /* USE_USBD_COMPOSITE */
-uint8_t  USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
+uint8_t USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev);
 /**
   * @}
   */
@@ -176,4 +185,3 @@ uint8_t  USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
   * @}
   */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC/Inc/usbd_cdc_if.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -30,11 +29,14 @@ extern "C" {
 
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
+#define APP_RX_DATA_SIZE  64
+#define APP_TX_DATA_SIZE  64
 
 extern USBD_CDC_ItfTypeDef  USBD_CDC_Template_fops;
 
 /* Exported macro ------------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */
+uint8_t TEMPLATE_Transmit(uint8_t* Buf, uint16_t Len);
 
 #ifdef __cplusplus
 }
@@ -42,4 +44,3 @@ extern USBD_CDC_ItfTypeDef  USBD_CDC_Template_fops;
 
 #endif /* __USBD_CDC_IF_TEMPLATE_H */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CDC/Src/usbd_cdc_if.c

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -23,7 +22,7 @@
 EndBSPDependencies */
 
 /* Includes ------------------------------------------------------------------*/
-#include "usbd_cdc_if_template.h"
+#include "usbd_cdc_if.h"
 
 /** @addtogroup STM32_USB_DEVICE_LIBRARY
   * @{
@@ -68,13 +67,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 =
@@ -85,8 +86,21 @@ USBD_CDC_LineCodingTypeDef linecoding =
   0x08    /* nb. of bits 8*/
 };
 
+/* Create buffer for reception and transmission           */
+/* It's up to user to redefine and/or remove those define */
+/** Received data over USB are stored in this buffer      */
+uint8_t UserRxBufferFS[APP_RX_DATA_SIZE];
+/** Data to send over USB CDC are stored in this buffer   */
+uint8_t UserTxBufferFS[APP_TX_DATA_SIZE];
+extern USBD_HandleTypeDef hUsbDeviceFS;
+
 /* Private functions ---------------------------------------------------------*/
 
+__weak void TEMPLATE_ReceiveUserspace(uint8_t *Buf, uint32_t *Len)
+{
+
+}
+
 /**
   * @brief  TEMPLATE_Init
   *         Initializes the CDC media low layer
@@ -95,9 +109,8 @@ USBD_CDC_LineCodingTypeDef linecoding =
   */
 static int8_t TEMPLATE_Init(void)
 {
-  /*
+  USBD_CDC_SetTxBuffer(&hUsbDeviceFS, UserTxBufferFS, 0);
-     Add your initialization code here
+  USBD_CDC_SetRxBuffer(&hUsbDeviceFS, UserRxBufferFS);
-  */
   return (0);
 }
 
@@ -126,6 +139,8 @@ static int8_t TEMPLATE_DeInit(void)
   */
 static int8_t TEMPLATE_Control(uint8_t cmd, uint8_t *pbuf, uint16_t length)
 {
+  UNUSED(length);
+
   switch (cmd)
   {
     case CDC_SEND_ENCAPSULATED_COMMAND:
@@ -192,7 +207,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 +218,45 @@ 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);
+  
+  TEMPLATE_ReceiveUserspace(Buf, Len);
+  
+  USBD_CDC_ReceivePacket(&hUsbDeviceFS);
+  return (USBD_OK);
+}
+
+uint8_t TEMPLATE_Transmit(uint8_t* Buf, uint16_t Len)
+{
+  uint8_t result = USBD_OK;
+  USBD_CDC_HandleTypeDef *hcdc = (USBD_CDC_HandleTypeDef*)hUsbDeviceFS.pClassData;
+  if (hcdc->TxState != 0){
+    return
+             USBD_BUSY;
+  }
+  USBD_CDC_SetTxBuffer(&hUsbDeviceFS, Buf, Len);
+  result = USBD_CDC_TransmitPacket(&hUsbDeviceFS);
+  return result;
+}
+
+/**
+  * @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);
 }
@@ -219,5 +273,3 @@ static int8_t TEMPLATE_Receive(uint8_t *Buf, uint32_t *Len)
   * @}
   */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/CustomHID/Inc/usbd_customhid.h

@@ -1,166 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_customhid.h
-  * @author  MCD Application Team
-  * @brief   header file for the usbd_customhid.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_CUSTOMHID_H
-#define __USB_CUSTOMHID_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_CUSTOM_HID
-  * @brief This file is the Header file for USBD_customhid.c
-  * @{
-  */
-
-
-/** @defgroup USBD_CUSTOM_HID_Exported_Defines
-  * @{
-  */
-#define CUSTOM_HID_EPIN_ADDR                 0x81U
-#define CUSTOM_HID_EPIN_SIZE                 0x02U
-
-#define CUSTOM_HID_EPOUT_ADDR                0x01U
-#define CUSTOM_HID_EPOUT_SIZE                0x02U
-
-#define USB_CUSTOM_HID_CONFIG_DESC_SIZ       41U
-#define USB_CUSTOM_HID_DESC_SIZ              9U
-
-#ifndef CUSTOM_HID_HS_BINTERVAL
-#define CUSTOM_HID_HS_BINTERVAL            0x05U
-#endif /* CUSTOM_HID_HS_BINTERVAL */
-
-#ifndef CUSTOM_HID_FS_BINTERVAL
-#define CUSTOM_HID_FS_BINTERVAL            0x05U
-#endif /* CUSTOM_HID_FS_BINTERVAL */
-
-#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 */
-
-#define CUSTOM_HID_DESCRIPTOR_TYPE           0x21U
-#define CUSTOM_HID_REPORT_DESC               0x22U
-
-#define CUSTOM_HID_REQ_SET_PROTOCOL          0x0BU
-#define CUSTOM_HID_REQ_GET_PROTOCOL          0x03U
-
-#define CUSTOM_HID_REQ_SET_IDLE              0x0AU
-#define CUSTOM_HID_REQ_GET_IDLE              0x02U
-
-#define CUSTOM_HID_REQ_SET_REPORT            0x09U
-#define CUSTOM_HID_REQ_GET_REPORT            0x01U
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_TypesDefinitions
-  * @{
-  */
-typedef enum
-{
-  CUSTOM_HID_IDLE = 0U,
-  CUSTOM_HID_BUSY,
-}
-CUSTOM_HID_StateTypeDef;
-
-typedef struct _USBD_CUSTOM_HID_Itf
-{
-  uint8_t                  *pReport;
-  int8_t (* Init)(void);
-  int8_t (* DeInit)(void);
-  int8_t (* OutEvent)(uint8_t event_idx, uint8_t state);
-
-} USBD_CUSTOM_HID_ItfTypeDef;
-
-typedef struct
-{
-  uint8_t              Report_buf[USBD_CUSTOMHID_OUTREPORT_BUF_SIZE];
-  uint32_t             Protocol;
-  uint32_t             IdleState;
-  uint32_t             AltSetting;
-  uint32_t             IsReportAvailable;
-  CUSTOM_HID_StateTypeDef     state;
-}
-USBD_CUSTOM_HID_HandleTypeDef;
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_CORE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CORE_Exported_Variables
-  * @{
-  */
-
-extern USBD_ClassTypeDef  USBD_CUSTOM_HID;
-#define USBD_CUSTOM_HID_CLASS    &USBD_CUSTOM_HID
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Functions
-  * @{
-  */
-uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef *pdev,
-                                   uint8_t *report,
-                                   uint16_t len);
-
-
-
-uint8_t  USBD_CUSTOM_HID_RegisterInterface(USBD_HandleTypeDef   *pdev,
-                                           USBD_CUSTOM_HID_ItfTypeDef *fops);
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USB_CUSTOMHID_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CustomHID/Inc/usbd_customhid_if_template.h

@@ -1,43 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_customhid_if_template.h
-  * @author  MCD Application Team
-  * @brief   Header for usbd_customhid_if_template.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 __USBD_CUSTOMHID_IF_TEMPLATE_H
-#define __USBD_CUSTOMHID_IF_TEMPLATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_customhid.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-extern USBD_CUSTOM_HID_ItfTypeDef USBD_CustomHID_template_fops;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_CUSTOMHID_IF_TEMPLATE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CustomHID/Src/usbd_customhid.c

@@ -1,716 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_customhid.c
-  * @author  MCD Application Team
-  * @brief   This file provides the CUSTOM_HID core functions.
-  *
-  * @verbatim
-  *
-  *          ===================================================================
-  *                                CUSTOM_HID Class  Description
-  *          ===================================================================
-  *           This module manages the CUSTOM_HID class V1.11 following the "Device Class Definition
-  *           for Human Interface Devices (CUSTOM_HID) Version 1.11 Jun 27, 2001".
-  *           This driver implements the following aspects of the specification:
-  *             - The Boot Interface Subclass
-  *             - Usage Page : Generic Desktop
-  *             - Usage : Vendor
-  *             - Collection : Application
-  *
-  * @note     In HS mode and when the DMA is used, all variables and data structures
-  *           dealing with the DMA during the transaction process should be 32-bit aligned.
-  *
-  *
-  *  @endverbatim
-  *
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_customhid.h"
-#include "usbd_ctlreq.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_CUSTOM_HID
-  * @brief usbd core module
-  * @{
-  */
-
-/** @defgroup USBD_CUSTOM_HID_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CUSTOM_HID_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CUSTOM_HID_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-/** @defgroup USBD_CUSTOM_HID_Private_FunctionPrototypes
-  * @{
-  */
-
-
-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_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);
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CUSTOM_HID_Private_Variables
-  * @{
-  */
-
-USBD_ClassTypeDef  USBD_CUSTOM_HID =
-{
-  USBD_CUSTOM_HID_Init,
-  USBD_CUSTOM_HID_DeInit,
-  USBD_CUSTOM_HID_Setup,
-  NULL, /*EP0_TxSent*/
-  USBD_CUSTOM_HID_EP0_RxReady, /*EP0_RxReady*/ /* STATUS STAGE IN */
-  USBD_CUSTOM_HID_DataIn, /*DataIn*/
-  USBD_CUSTOM_HID_DataOut,
-  NULL, /*SOF */
-  NULL,
-  NULL,
-  USBD_CUSTOM_HID_GetHSCfgDesc,
-  USBD_CUSTOM_HID_GetFSCfgDesc,
-  USBD_CUSTOM_HID_GetOtherSpeedCfgDesc,
-  USBD_CUSTOM_HID_GetDeviceQualifierDesc,
-};
-
-/* USB CUSTOM_HID device FS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgFSDesc[USB_CUSTOM_HID_CONFIG_DESC_SIZ] __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  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*/
-
-  /************** Descriptor of CUSTOM HID interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x02,         /*bNumEndpoints*/
-  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*/
-  /******************** Descriptor of CUSTOM_HID *************************/
-  /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Custom HID endpoints ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  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 */
-  0x00,
-  CUSTOM_HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-
-  0x07,          /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
-  0x03, /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPOUT_SIZE,  /* wMaxPacketSize: 2 Bytes max  */
-  0x00,
-  CUSTOM_HID_FS_BINTERVAL,  /* bInterval: Polling Interval */
-  /* 41 */
-};
-
-/* USB CUSTOM_HID device HS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_CfgHSDesc[USB_CUSTOM_HID_CONFIG_DESC_SIZ] __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  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*/
-
-  /************** Descriptor of CUSTOM HID interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x02,         /*bNumEndpoints*/
-  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*/
-  /******************** Descriptor of CUSTOM_HID *************************/
-  /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Custom HID endpoints ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  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 */
-  0x00,
-  CUSTOM_HID_HS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-
-  0x07,          /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
-  0x03, /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPOUT_SIZE,  /* wMaxPacketSize: 2 Bytes max  */
-  0x00,
-  CUSTOM_HID_HS_BINTERVAL,  /* bInterval: Polling Interval */
-  /* 41 */
-};
-
-/* USB CUSTOM_HID device Other Speed Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_OtherSpeedCfgDesc[USB_CUSTOM_HID_CONFIG_DESC_SIZ] __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  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*/
-
-  /************** Descriptor of CUSTOM HID interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x02,         /*bNumEndpoints*/
-  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*/
-  /******************** Descriptor of CUSTOM_HID *************************/
-  /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Custom HID endpoints ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  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 */
-  0x00,
-  CUSTOM_HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-
-  0x07,          /* bLength: Endpoint Descriptor size */
-  USB_DESC_TYPE_ENDPOINT, /* bDescriptorType: */
-  CUSTOM_HID_EPOUT_ADDR,  /*bEndpointAddress: Endpoint Address (OUT)*/
-  0x03, /* bmAttributes: Interrupt endpoint */
-  CUSTOM_HID_EPOUT_SIZE,  /* wMaxPacketSize: 2 Bytes max  */
-  0x00,
-  CUSTOM_HID_FS_BINTERVAL,  /* bInterval: Polling Interval */
-  /* 41 */
-};
-
-/* USB CUSTOM_HID device Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_Desc[USB_CUSTOM_HID_DESC_SIZ] __ALIGN_END =
-{
-  /* 18 */
-  0x09,         /*bLength: CUSTOM_HID Descriptor size*/
-  CUSTOM_HID_DESCRIPTOR_TYPE, /*bDescriptorType: CUSTOM_HID*/
-  0x11,         /*bCUSTOM_HIDUSTOM_HID: CUSTOM_HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of CUSTOM_HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  USBD_CUSTOM_HID_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-};
-
-/* USB Standard Device Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_CUSTOM_HID_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_CUSTOM_HID_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  USBD_CUSTOM_HID_Init
-  *         Initialize the CUSTOM_HID interface
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_CUSTOM_HID_Init(USBD_HandleTypeDef *pdev,
-                                     uint8_t cfgidx)
-{
-  uint8_t ret = 0U;
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid;
-
-  /* Open EP IN */
-  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,
-                 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,
-                           USBD_CUSTOMHID_OUTREPORT_BUF_SIZE);
-  }
-
-  return ret;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_Init
-  *         DeInitialize the CUSTOM_HID layer
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_CUSTOM_HID_DeInit(USBD_HandleTypeDef *pdev,
-                                       uint8_t cfgidx)
-{
-  /* Close CUSTOM_HID EP IN */
-  USBD_LL_CloseEP(pdev, CUSTOM_HID_EPIN_ADDR);
-  pdev->ep_in[CUSTOM_HID_EPIN_ADDR & 0xFU].is_used = 0U;
-
-  /* Close CUSTOM_HID EP OUT */
-  USBD_LL_CloseEP(pdev, CUSTOM_HID_EPOUT_ADDR);
-  pdev->ep_out[CUSTOM_HID_EPOUT_ADDR & 0xFU].is_used = 0U;
-
-  /* FRee allocated memory */
-  if (pdev->pClassData != NULL)
-  {
-    ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->DeInit();
-    USBD_free(pdev->pClassData);
-    pdev->pClassData = NULL;
-  }
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_Setup
-  *         Handle the CUSTOM_HID specific requests
-  * @param  pdev: instance
-  * @param  req: usb requests
-  * @retval status
-  */
-static uint8_t  USBD_CUSTOM_HID_Setup(USBD_HandleTypeDef *pdev,
-                                      USBD_SetupReqTypedef *req)
-{
-  USBD_CUSTOM_HID_HandleTypeDef *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
-  uint16_t len = 0U;
-  uint8_t  *pbuf = NULL;
-  uint16_t status_info = 0U;
-  uint8_t ret = USBD_OK;
-
-  switch (req->bmRequest & USB_REQ_TYPE_MASK)
-  {
-    case USB_REQ_TYPE_CLASS :
-      switch (req->bRequest)
-      {
-        case CUSTOM_HID_REQ_SET_PROTOCOL:
-          hhid->Protocol = (uint8_t)(req->wValue);
-          break;
-
-        case CUSTOM_HID_REQ_GET_PROTOCOL:
-          USBD_CtlSendData(pdev, (uint8_t *)(void *)&hhid->Protocol, 1U);
-          break;
-
-        case CUSTOM_HID_REQ_SET_IDLE:
-          hhid->IdleState = (uint8_t)(req->wValue >> 8);
-          break;
-
-        case CUSTOM_HID_REQ_GET_IDLE:
-          USBD_CtlSendData(pdev, (uint8_t *)(void *)&hhid->IdleState, 1U);
-          break;
-
-        case CUSTOM_HID_REQ_SET_REPORT:
-          hhid->IsReportAvailable = 1U;
-          USBD_CtlPrepareRx(pdev, hhid->Report_buf, req->wLength);
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    case USB_REQ_TYPE_STANDARD:
-      switch (req->bRequest)
-      {
-        case USB_REQ_GET_STATUS:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&status_info, 2U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_GET_DESCRIPTOR:
-          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)
-            {
-              pbuf = USBD_CUSTOM_HID_Desc;
-              len = MIN(USB_CUSTOM_HID_DESC_SIZ, req->wLength);
-            }
-          }
-
-          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);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_SET_INTERFACE :
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            hhid->AltSetting = (uint8_t)(req->wValue);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    default:
-      USBD_CtlError(pdev, req);
-      ret = USBD_FAIL;
-      break;
-  }
-  return ret;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_SendReport
-  *         Send CUSTOM_HID Report
-  * @param  pdev: device instance
-  * @param  buff: pointer to report
-  * @retval status
-  */
-uint8_t USBD_CUSTOM_HID_SendReport(USBD_HandleTypeDef  *pdev,
-                                   uint8_t *report,
-                                   uint16_t len)
-{
-  USBD_CUSTOM_HID_HandleTypeDef     *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);
-    }
-    else
-    {
-      return USBD_BUSY;
-    }
-  }
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_GetFSCfgDesc
-  *         return FS configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_CUSTOM_HID_GetFSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_CUSTOM_HID_CfgFSDesc);
-  return USBD_CUSTOM_HID_CfgFSDesc;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_GetHSCfgDesc
-  *         return HS configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_CUSTOM_HID_GetHSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_CUSTOM_HID_CfgHSDesc);
-  return USBD_CUSTOM_HID_CfgHSDesc;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_GetOtherSpeedCfgDesc
-  *         return other speed configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_CUSTOM_HID_GetOtherSpeedCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_CUSTOM_HID_OtherSpeedCfgDesc);
-  return USBD_CUSTOM_HID_OtherSpeedCfgDesc;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_DataIn
-  *         handle data IN Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_CUSTOM_HID_DataIn(USBD_HandleTypeDef *pdev,
-                                       uint8_t 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;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_DataOut
-  *         handle data OUT Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_CUSTOM_HID_DataOut(USBD_HandleTypeDef *pdev,
-                                        uint8_t epnum)
-{
-
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
-
-  ((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,
-                         USBD_CUSTOMHID_OUTREPORT_BUF_SIZE);
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_CUSTOM_HID_EP0_RxReady
-  *         Handles control request data.
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t USBD_CUSTOM_HID_EP0_RxReady(USBD_HandleTypeDef *pdev)
-{
-  USBD_CUSTOM_HID_HandleTypeDef     *hhid = (USBD_CUSTOM_HID_HandleTypeDef *)pdev->pClassData;
-
-  if (hhid->IsReportAvailable == 1U)
-  {
-    ((USBD_CUSTOM_HID_ItfTypeDef *)pdev->pUserData)->OutEvent(hhid->Report_buf[0],
-                                                              hhid->Report_buf[1]);
-    hhid->IsReportAvailable = 0U;
-  }
-
-  return USBD_OK;
-}
-
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-static uint8_t  *USBD_CUSTOM_HID_GetDeviceQualifierDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_CUSTOM_HID_DeviceQualifierDesc);
-  return USBD_CUSTOM_HID_DeviceQualifierDesc;
-}
-
-/**
-* @brief  USBD_CUSTOM_HID_RegisterInterface
-  * @param  pdev: device instance
-  * @param  fops: CUSTOMHID Interface callback
-  * @retval status
-  */
-uint8_t  USBD_CUSTOM_HID_RegisterInterface(USBD_HandleTypeDef   *pdev,
-                                           USBD_CUSTOM_HID_ItfTypeDef *fops)
-{
-  uint8_t  ret = USBD_FAIL;
-
-  if (fops != NULL)
-  {
-    pdev->pUserData = fops;
-    ret = USBD_OK;
-  }
-
-  return ret;
-}
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/CustomHID/Src/usbd_customhid_if_template.c

@@ -1,87 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_customhid_if_template.c
-  * @author  MCD Application Team
-  * @brief   USB Device Custom HID interface file.
-  *        This template should be copied to the user folder, renamed and customized
-  *          following user needs.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_customhid_if_template.h"
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-static int8_t TEMPLATE_CUSTOM_HID_Init(void);
-static int8_t TEMPLATE_CUSTOM_HID_DeInit(void);
-static int8_t TEMPLATE_CUSTOM_HID_OutEvent(uint8_t event_idx, uint8_t state);
-/* Private variables ---------------------------------------------------------*/
-USBD_CUSTOM_HID_ItfTypeDef USBD_CustomHID_template_fops =
-{
-  TEMPLATE_CUSTOM_HID_ReportDesc,
-  TEMPLATE_CUSTOM_HID_Init,
-  TEMPLATE_CUSTOM_HID_DeInit,
-  TEMPLATE_CUSTOM_HID_OutEvent,
-};
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TEMPLATE_CUSTOM_HID_Init
-  *         Initializes the CUSTOM HID media low layer
-  * @param  None
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_CUSTOM_HID_Init(void)
-{
-
-  return (0);
-}
-
-/**
-  * @brief  TEMPLATE_CUSTOM_HID_DeInit
-  *         DeInitializes the CUSTOM HID media low layer
-  * @param  None
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_CUSTOM_HID_DeInit(void)
-{
-  /*
-     Add your deinitialization code here
-  */
-  return (0);
-}
-
-
-/**
-  * @brief  TEMPLATE_CUSTOM_HID_Control
-  *         Manage the CUSTOM HID class events
-  * @param  event_idx: event index
-  * @param  state: event state
-  * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
-  */
-static int8_t TEMPLATE_CUSTOM_HID_OutEvent(uint8_t event_idx, uint8_t state)
-{
-
-  return (0);
-}
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/DFU/Inc/usbd_dfu.h

@@ -1,237 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_dfu.h
-  * @author  MCD Application Team
-  * @brief   Header file for the usbd_dfu.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_DFU_H
-#define __USB_DFU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_DFU
-  * @brief This file is the Header file for usbd_dfu.c
-  * @{
-  */
-
-
-/** @defgroup USBD_DFU_Exported_Defines
-  * @{
-  */
-#ifndef USBD_DFU_MAX_ITF_NUM
-#define USBD_DFU_MAX_ITF_NUM            1U
-#endif /* USBD_DFU_MAX_ITF_NUM */
-
-#ifndef USBD_DFU_XFER_SIZE
-#define USBD_DFU_XFER_SIZE             1024U
-#endif /* USBD_DFU_XFER_SIZE */
-
-#ifndef USBD_DFU_APP_DEFAULT_ADD
-#define USBD_DFU_APP_DEFAULT_ADD       0x08008000U /* The first sector (32 KB) is reserved for DFU code */
-#endif /* USBD_DFU_APP_DEFAULT_ADD */
-
-#define USB_DFU_CONFIG_DESC_SIZ        (18U + (9U * USBD_DFU_MAX_ITF_NUM))
-#define USB_DFU_DESC_SIZ               9U
-
-#define DFU_DESCRIPTOR_TYPE            0x21U
-
-
-/**************************************************/
-/* DFU Requests  DFU states                       */
-/**************************************************/
-#define APP_STATE_IDLE                 0U
-#define APP_STATE_DETACH               1U
-#define DFU_STATE_IDLE                 2U
-#define DFU_STATE_DNLOAD_SYNC          3U
-#define DFU_STATE_DNLOAD_BUSY          4U
-#define DFU_STATE_DNLOAD_IDLE          5U
-#define DFU_STATE_MANIFEST_SYNC        6U
-#define DFU_STATE_MANIFEST             7U
-#define DFU_STATE_MANIFEST_WAIT_RESET  8U
-#define DFU_STATE_UPLOAD_IDLE          9U
-#define DFU_STATE_ERROR                10U
-
-/**************************************************/
-/* DFU errors                                     */
-/**************************************************/
-#define DFU_ERROR_NONE                 0x00U
-#define DFU_ERROR_TARGET               0x01U
-#define DFU_ERROR_FILE                 0x02U
-#define DFU_ERROR_WRITE                0x03U
-#define DFU_ERROR_ERASE                0x04U
-#define DFU_ERROR_CHECK_ERASED         0x05U
-#define DFU_ERROR_PROG                 0x06U
-#define DFU_ERROR_VERIFY               0x07U
-#define DFU_ERROR_ADDRESS              0x08U
-#define DFU_ERROR_NOTDONE              0x09U
-#define DFU_ERROR_FIRMWARE             0x0AU
-#define DFU_ERROR_VENDOR               0x0BU
-#define DFU_ERROR_USB                  0x0CU
-#define DFU_ERROR_POR                  0x0DU
-#define DFU_ERROR_UNKNOWN              0x0EU
-#define DFU_ERROR_STALLEDPKT           0x0FU
-
-/**************************************************/
-/* DFU Manifestation State                        */
-/**************************************************/
-#define DFU_MANIFEST_COMPLETE          0x00U
-#define DFU_MANIFEST_IN_PROGRESS       0x01U
-
-
-/**************************************************/
-/* Special Commands  with Download Request        */
-/**************************************************/
-#define DFU_CMD_GETCOMMANDS            0x00U
-#define DFU_CMD_SETADDRESSPOINTER      0x21U
-#define DFU_CMD_ERASE                  0x41U
-
-#define DFU_MEDIA_ERASE                0x00U
-#define DFU_MEDIA_PROGRAM              0x01U
-
-/**************************************************/
-/* Other defines                                  */
-/**************************************************/
-/* Bit Detach capable = bit 3 in bmAttributes field */
-#define DFU_DETACH_MASK                (uint8_t)(1 << 4)
-#define DFU_STATUS_DEPTH               6U
-
-typedef enum
-{
-  DFU_DETACH = 0U,
-  DFU_DNLOAD,
-  DFU_UPLOAD,
-  DFU_GETSTATUS,
-  DFU_CLRSTATUS,
-  DFU_GETSTATE,
-  DFU_ABORT
-} DFU_RequestTypeDef;
-
-typedef  void (*pFunction)(void);
-
-
-/**********  Descriptor of DFU interface 0 Alternate setting n ****************/
-#define USBD_DFU_IF_DESC(n)            0x09,   /* bLength: Interface Descriptor size */ \
-                                      USB_DESC_TYPE_INTERFACE,   /* bDescriptorType */ \
-                                      0x00,   /* bInterfaceNumber: Number of Interface */ \
-                                      (n),      /* bAlternateSetting: Alternate setting */ \
-                                      0x00,   /* bNumEndpoints*/ \
-                                      0xFE,   /* bInterfaceClass: Application Specific Class Code */ \
-                                      0x01,   /* bInterfaceSubClass : Device Firmware Upgrade Code */ \
-                                      0x02,   /* nInterfaceProtocol: DFU mode protocol */ \
-                                      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 */
-
-#define IS_PROTECTED_AREA(add)         (uint8_t)((((add) >= 0x08000000) && ((add) < (APP_DEFAULT_ADD)))? 1:0)
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_TypesDefinitions
-  * @{
-  */
-
-typedef struct
-{
-  union
-  {
-    uint32_t d32[USBD_DFU_XFER_SIZE / 4U];
-    uint8_t  d8[USBD_DFU_XFER_SIZE];
-  } buffer;
-
-  uint32_t             wblock_num;
-  uint32_t             wlength;
-  uint32_t             data_ptr;
-  uint32_t             alt_setting;
-
-  uint8_t              dev_status[DFU_STATUS_DEPTH];
-  uint8_t              ReservedForAlign[2];
-  uint8_t              dev_state;
-  uint8_t              manif_state;
-}
-USBD_DFU_HandleTypeDef;
-
-typedef struct
-{
-  const uint8_t *pStrDesc;
-  uint16_t (* Init)(void);
-  uint16_t (* DeInit)(void);
-  uint16_t (* Erase)(uint32_t Add);
-  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;
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_CORE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CORE_Exported_Variables
-  * @{
-  */
-
-extern USBD_ClassTypeDef  USBD_DFU;
-#define USBD_DFU_CLASS    &USBD_DFU
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Functions
-  * @{
-  */
-uint8_t  USBD_DFU_RegisterMedia(USBD_HandleTypeDef   *pdev,
-                                USBD_DFU_MediaTypeDef *fops);
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USB_DFU_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/DFU/Inc/usbd_dfu_media_template.h

@@ -1,97 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_dfu_media_template.h
-  * @author  MCD Application Team
-  * @brief   header file for the usbd_dfu_media_template.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 __USBD_DFU_MEDIA_TEMPLATE_H
-#define __USBD_DFU_MEDIA_TEMPLATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_dfu.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_MEDIA
-  * @brief header file for the usbd_dfu_media_template.c file
-  * @{
-  */
-
-/** @defgroup USBD_MEDIA_Exported_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_MEDIA_Exported_Types
-  * @{
-  */
-
-
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_MEDIA_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_MEDIA_Exported_Variables
-  * @{
-  */
-extern USBD_DFU_MediaTypeDef  USBD_DFU_MEDIA_Template_fops;
-/**
-  * @}
-  */
-
-/** @defgroup USBD_MEDIA_Exported_FunctionsPrototype
-  * @{
-  */
-
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_DFU_MEDIA_TEMPLATE_H */
-
-/**
-  * @}
-  */
-
-/**
-* @}
-*/
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/DFU/Src/usbd_dfu_media_template.c

@@ -1,135 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_dfu_media_template.c
-  * @author  MCD Application Team
-  * @brief   Memory management layer
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_dfu_media_template.h"
-
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Extern function prototypes ------------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-uint16_t MEM_If_Init(void);
-uint16_t MEM_If_Erase(uint32_t Add);
-uint16_t MEM_If_Write(uint8_t *src, uint8_t *dest, uint32_t Len);
-uint8_t *MEM_If_Read(uint8_t *src, uint8_t *dest, uint32_t Len);
-uint16_t MEM_If_DeInit(void);
-uint16_t MEM_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t *buffer);
-
-USBD_DFU_MediaTypeDef USBD_DFU_MEDIA_Template_fops =
-{
-  (uint8_t *)"DFU MEDIA",
-  MEM_If_Init,
-  MEM_If_DeInit,
-  MEM_If_Erase,
-  MEM_If_Write,
-  MEM_If_Read,
-  MEM_If_GetStatus,
-
-};
-/**
-  * @brief  MEM_If_Init
-  *         Memory initialization routine.
-  * @param  None
-  * @retval 0 if operation is successful, MAL_FAIL else.
-  */
-uint16_t MEM_If_Init(void)
-{
-  return 0;
-}
-
-/**
-  * @brief  MEM_If_DeInit
-  *         Memory deinitialization routine.
-  * @param  None
-  * @retval 0 if operation is successful, MAL_FAIL else.
-  */
-uint16_t MEM_If_DeInit(void)
-{
-  return 0;
-}
-
-/**
-  * @brief  MEM_If_Erase
-  *         Erase sector.
-  * @param  Add: Address of sector to be erased.
-  * @retval 0 if operation is successful, MAL_FAIL else.
-  */
-uint16_t MEM_If_Erase(uint32_t Add)
-{
-  return 0;
-}
-
-/**
-  * @brief  MEM_If_Write
-  *         Memory write routine.
-  * @param  Add: Address to be written to.
-  * @param  Len: Number of data to be written (in bytes).
-  * @retval 0 if operation is successful, MAL_FAIL else.
-  */
-uint16_t MEM_If_Write(uint8_t *src, uint8_t *dest, uint32_t Len)
-{
-  return 0;
-}
-
-/**
-  * @brief  MEM_If_Read
-  *         Memory read routine.
-  * @param  Add: Address to be read from.
-  * @param  Len: Number of data to be read (in bytes).
-  * @retval Pointer to the physical address where data should be read.
-  */
-uint8_t *MEM_If_Read(uint8_t *src, uint8_t *dest, uint32_t Len)
-{
-  /* Return a valid address to avoid HardFault */
-  return (uint8_t *)(0);
-}
-
-/**
-  * @brief  Flash_If_GetStatus
-  *         Memory read routine.
-  * @param  Add: Address to be read from.
-  * @param  cmd: Number of data to be read (in bytes).
-  * @retval Pointer to the physical address where data should be read.
-  */
-uint16_t MEM_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t *buffer)
-{
-  switch (Cmd)
-  {
-    case DFU_MEDIA_PROGRAM:
-
-      break;
-
-    case DFU_MEDIA_ERASE:
-    default:
-
-      break;
-  }
-  return (0);
-}
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/HID/Inc/usbd_hid.h

@@ -1,144 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_hid.h
-  * @author  MCD Application Team
-  * @brief   Header file for the usbd_hid_core.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_HID_H
-#define __USB_HID_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_HID
-  * @brief This file is the Header file for usbd_hid.c
-  * @{
-  */
-
-
-/** @defgroup USBD_HID_Exported_Defines
-  * @{
-  */
-#define HID_EPIN_ADDR                 0x81U
-#define HID_EPIN_SIZE                 0x04U
-
-#define USB_HID_CONFIG_DESC_SIZ       34U
-#define USB_HID_DESC_SIZ              9U
-#define HID_MOUSE_REPORT_DESC_SIZE    74U
-
-#define HID_DESCRIPTOR_TYPE           0x21U
-#define HID_REPORT_DESC               0x22U
-
-#ifndef HID_HS_BINTERVAL
-#define HID_HS_BINTERVAL            0x07U
-#endif /* HID_HS_BINTERVAL */
-
-#ifndef HID_FS_BINTERVAL
-#define HID_FS_BINTERVAL            0x0AU
-#endif /* HID_FS_BINTERVAL */
-
-#define HID_REQ_SET_PROTOCOL          0x0BU
-#define HID_REQ_GET_PROTOCOL          0x03U
-
-#define HID_REQ_SET_IDLE              0x0AU
-#define HID_REQ_GET_IDLE              0x02U
-
-#define HID_REQ_SET_REPORT            0x09U
-#define HID_REQ_GET_REPORT            0x01U
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_TypesDefinitions
-  * @{
-  */
-typedef enum
-{
-  HID_IDLE = 0,
-  HID_BUSY,
-}
-HID_StateTypeDef;
-
-
-typedef struct
-{
-  uint32_t             Protocol;
-  uint32_t             IdleState;
-  uint32_t             AltSetting;
-  HID_StateTypeDef     state;
-}
-USBD_HID_HandleTypeDef;
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_CORE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CORE_Exported_Variables
-  * @{
-  */
-
-extern USBD_ClassTypeDef  USBD_HID;
-#define USBD_HID_CLASS    &USBD_HID
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Functions
-  * @{
-  */
-uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev,
-                            uint8_t *report,
-                            uint16_t len);
-
-uint32_t USBD_HID_GetPollingInterval(USBD_HandleTypeDef *pdev);
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USB_HID_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/HID/Src/usbd_hid.c

@@ -1,681 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_hid.c
-  * @author  MCD Application Team
-  * @brief   This file provides the HID core functions.
-  *
-  * @verbatim
-  *
-  *          ===================================================================
-  *                                HID Class  Description
-  *          ===================================================================
-  *           This module manages the HID class V1.11 following the "Device Class Definition
-  *           for Human Interface Devices (HID) Version 1.11 Jun 27, 2001".
-  *           This driver implements the following aspects of the specification:
-  *             - The Boot Interface Subclass
-  *             - The Mouse protocol
-  *             - Usage Page : Generic Desktop
-  *             - Usage : Joystick
-  *             - Collection : Application
-  *
-  * @note     In HS mode and when the DMA is used, all variables and data structures
-  *           dealing with the DMA during the transaction process should be 32-bit aligned.
-  *
-  *
-  *  @endverbatim
-  *
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_hid.h"
-#include "usbd_ctlreq.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_HID
-  * @brief usbd core module
-  * @{
-  */
-
-/** @defgroup USBD_HID_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_HID_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_HID_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-
-
-/** @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_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);
-/**
-  * @}
-  */
-
-/** @defgroup USBD_HID_Private_Variables
-  * @{
-  */
-
-USBD_ClassTypeDef  USBD_HID =
-{
-  USBD_HID_Init,
-  USBD_HID_DeInit,
-  USBD_HID_Setup,
-  NULL, /*EP0_TxSent*/
-  NULL, /*EP0_RxReady*/
-  USBD_HID_DataIn, /*DataIn*/
-  NULL, /*DataOut*/
-  NULL, /*SOF */
-  NULL,
-  NULL,
-  USBD_HID_GetHSCfgDesc,
-  USBD_HID_GetFSCfgDesc,
-  USBD_HID_GetOtherSpeedCfgDesc,
-  USBD_HID_GetDeviceQualifierDesc,
-};
-
-/* USB HID device FS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_CfgFSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
-  0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
-  0x01,         /*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*/
-
-  /************** Descriptor of Joystick Mouse interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x01,         /*bNumEndpoints*/
-  0x03,         /*bInterfaceClass: HID*/
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
-  0,            /*iInterface: Index of string descriptor*/
-  /******************** Descriptor of Joystick Mouse HID ********************/
-  /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
-  0x11,         /*bcdHID: HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Mouse endpoint ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
-
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
-  0x03,          /*bmAttributes: Interrupt endpoint*/
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
-  0x00,
-  HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-};
-
-/* USB HID device HS Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_CfgHSDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
-  0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
-  0x01,         /*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*/
-
-  /************** Descriptor of Joystick Mouse interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x01,         /*bNumEndpoints*/
-  0x03,         /*bInterfaceClass: HID*/
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
-  0,            /*iInterface: Index of string descriptor*/
-  /******************** Descriptor of Joystick Mouse HID ********************/
-  /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
-  0x11,         /*bcdHID: HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Mouse endpoint ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
-
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
-  0x03,          /*bmAttributes: Interrupt endpoint*/
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
-  0x00,
-  HID_HS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-};
-
-/* USB HID device Other Speed Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_OtherSpeedCfgDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
-{
-  0x09, /* bLength: Configuration Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
-  USB_HID_CONFIG_DESC_SIZ,
-  /* wTotalLength: Bytes returned */
-  0x00,
-  0x01,         /*bNumInterfaces: 1 interface*/
-  0x01,         /*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*/
-
-  /************** Descriptor of Joystick Mouse interface ****************/
-  /* 09 */
-  0x09,         /*bLength: Interface Descriptor size*/
-  USB_DESC_TYPE_INTERFACE,/*bDescriptorType: Interface descriptor type*/
-  0x00,         /*bInterfaceNumber: Number of Interface*/
-  0x00,         /*bAlternateSetting: Alternate setting*/
-  0x01,         /*bNumEndpoints*/
-  0x03,         /*bInterfaceClass: HID*/
-  0x01,         /*bInterfaceSubClass : 1=BOOT, 0=no boot*/
-  0x02,         /*nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse*/
-  0,            /*iInterface: Index of string descriptor*/
-  /******************** Descriptor of Joystick Mouse HID ********************/
-  /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
-  0x11,         /*bcdHID: HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-  /******************** Descriptor of Mouse endpoint ********************/
-  /* 27 */
-  0x07,          /*bLength: Endpoint Descriptor size*/
-  USB_DESC_TYPE_ENDPOINT, /*bDescriptorType:*/
-
-  HID_EPIN_ADDR,     /*bEndpointAddress: Endpoint Address (IN)*/
-  0x03,          /*bmAttributes: Interrupt endpoint*/
-  HID_EPIN_SIZE, /*wMaxPacketSize: 4 Byte max */
-  0x00,
-  HID_FS_BINTERVAL,          /*bInterval: Polling Interval */
-  /* 34 */
-};
-
-
-/* USB HID device Configuration Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_Desc[USB_HID_DESC_SIZ]  __ALIGN_END  =
-{
-  /* 18 */
-  0x09,         /*bLength: HID Descriptor size*/
-  HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
-  0x11,         /*bcdHID: HID Class Spec release number*/
-  0x01,
-  0x00,         /*bCountryCode: Hardware target country*/
-  0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
-  0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
-  0x00,
-};
-
-/* USB Standard Device Descriptor */
-__ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
-{
-  USB_LEN_DEV_QUALIFIER_DESC,
-  USB_DESC_TYPE_DEVICE_QUALIFIER,
-  0x00,
-  0x02,
-  0x00,
-  0x00,
-  0x00,
-  0x40,
-  0x01,
-  0x00,
-};
-
-__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
-};
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_HID_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  USBD_HID_Init
-  *         Initialize the HID interface
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-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;
-
-  pdev->pClassData = USBD_malloc(sizeof(USBD_HID_HandleTypeDef));
-
-  if (pdev->pClassData == NULL)
-  {
-    return USBD_FAIL;
-  }
-
-  ((USBD_HID_HandleTypeDef *)pdev->pClassData)->state = HID_IDLE;
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_HID_Init
-  *         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)
-{
-  /* Close HID EPs */
-  USBD_LL_CloseEP(pdev, HID_EPIN_ADDR);
-  pdev->ep_in[HID_EPIN_ADDR & 0xFU].is_used = 0U;
-
-  /* FRee allocated memory */
-  if (pdev->pClassData != NULL)
-  {
-    USBD_free(pdev->pClassData);
-    pdev->pClassData = NULL;
-  }
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_HID_Setup
-  *         Handle the HID specific requests
-  * @param  pdev: instance
-  * @param  req: usb requests
-  * @retval status
-  */
-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;
-
-  switch (req->bmRequest & USB_REQ_TYPE_MASK)
-  {
-    case USB_REQ_TYPE_CLASS :
-      switch (req->bRequest)
-      {
-        case HID_REQ_SET_PROTOCOL:
-          hhid->Protocol = (uint8_t)(req->wValue);
-          break;
-
-        case HID_REQ_GET_PROTOCOL:
-          USBD_CtlSendData(pdev, (uint8_t *)(void *)&hhid->Protocol, 1U);
-          break;
-
-        case HID_REQ_SET_IDLE:
-          hhid->IdleState = (uint8_t)(req->wValue >> 8);
-          break;
-
-        case HID_REQ_GET_IDLE:
-          USBD_CtlSendData(pdev, (uint8_t *)(void *)&hhid->IdleState, 1U);
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-    case USB_REQ_TYPE_STANDARD:
-      switch (req->bRequest)
-      {
-        case USB_REQ_GET_STATUS:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&status_info, 2U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_GET_DESCRIPTOR:
-          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)
-          {
-            pbuf = USBD_HID_Desc;
-            len = MIN(USB_HID_DESC_SIZ, req->wLength);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-            break;
-          }
-          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);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_SET_INTERFACE :
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            hhid->AltSetting = (uint8_t)(req->wValue);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    default:
-      USBD_CtlError(pdev, req);
-      ret = USBD_FAIL;
-      break;
-  }
-
-  return ret;
-}
-
-/**
-  * @brief  USBD_HID_SendReport
-  *         Send HID Report
-  * @param  pdev: device instance
-  * @param  buff: pointer to report
-  * @retval status
-  */
-uint8_t USBD_HID_SendReport(USBD_HandleTypeDef  *pdev,
-                            uint8_t *report,
-                            uint16_t len)
-{
-  USBD_HID_HandleTypeDef     *hhid = (USBD_HID_HandleTypeDef *)pdev->pClassData;
-
-  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);
-    }
-  }
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_HID_GetPollingInterval
-  *         return polling interval from endpoint descriptor
-  * @param  pdev: device instance
-  * @retval polling interval
-  */
-uint32_t USBD_HID_GetPollingInterval(USBD_HandleTypeDef *pdev)
-{
-  uint32_t polling_interval = 0U;
-
-  /* HIGH-speed endpoints */
-  if (pdev->dev_speed == USBD_SPEED_HIGH)
-  {
-    /* Sets the data transfer polling interval for high speed transfers.
-     Values between 1..16 are allowed. Values correspond to interval
-     of 2 ^ (bInterval-1). This option (8 ms, corresponds to HID_HS_BINTERVAL */
-    polling_interval = (((1U << (HID_HS_BINTERVAL - 1U))) / 8U);
-  }
-  else   /* LOW and FULL-speed endpoints */
-  {
-    /* Sets the data transfer polling interval for low and full
-    speed transfers */
-    polling_interval =  HID_FS_BINTERVAL;
-  }
-
-  return ((uint32_t)(polling_interval));
-}
-
-/**
-  * @brief  USBD_HID_GetCfgFSDesc
-  *         return FS configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_HID_GetFSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_HID_CfgFSDesc);
-  return USBD_HID_CfgFSDesc;
-}
-
-/**
-  * @brief  USBD_HID_GetCfgHSDesc
-  *         return HS configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_HID_GetHSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_HID_CfgHSDesc);
-  return USBD_HID_CfgHSDesc;
-}
-
-/**
-  * @brief  USBD_HID_GetOtherSpeedCfgDesc
-  *         return other speed configuration descriptor
-  * @param  speed : current device speed
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_HID_GetOtherSpeedCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_HID_OtherSpeedCfgDesc);
-  return USBD_HID_OtherSpeedCfgDesc;
-}
-
-/**
-  * @brief  USBD_HID_DataIn
-  *         handle data IN Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_HID_DataIn(USBD_HandleTypeDef *pdev,
-                                uint8_t 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;
-}
-
-
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-static uint8_t  *USBD_HID_GetDeviceQualifierDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_HID_DeviceQualifierDesc);
-  return USBD_HID_DeviceQualifierDesc;
-}
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Inc/usbd_msc.h

@@ -1,129 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc.h
-  * @author  MCD Application Team
-  * @brief   Header for the usbd_msc.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 __USBD_MSC_H
-#define __USBD_MSC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_msc_bot.h"
-#include  "usbd_msc_scsi.h"
-#include  "usbd_ioreq.h"
-
-/** @addtogroup USBD_MSC_BOT
-  * @{
-  */
-
-/** @defgroup USBD_MSC
-  * @brief This file is the Header file for usbd_msc.c
-  * @{
-  */
-
-
-/** @defgroup USBD_BOT_Exported_Defines
-  * @{
-  */
-/* MSC Class Config */
-#ifndef MSC_MEDIA_PACKET
-#define MSC_MEDIA_PACKET             512U
-#endif /* MSC_MEDIA_PACKET */
-
-#define MSC_MAX_FS_PACKET            0x40U
-#define MSC_MAX_HS_PACKET            0x200U
-
-#define BOT_GET_MAX_LUN              0xFE
-#define BOT_RESET                    0xFF
-#define USB_MSC_CONFIG_DESC_SIZ      32
-
-
-#define MSC_EPIN_ADDR                0x81U
-#define MSC_EPOUT_ADDR               0x01U
-
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Types
-  * @{
-  */
-typedef struct _USBD_STORAGE
-{
-  int8_t (* Init)(uint8_t lun);
-  int8_t (* GetCapacity)(uint8_t lun, uint32_t *block_num, uint16_t *block_size);
-  int8_t (* IsReady)(uint8_t lun);
-  int8_t (* IsWriteProtected)(uint8_t lun);
-  int8_t (* Read)(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
-  int8_t (* Write)(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len);
-  int8_t (* GetMaxLun)(void);
-  int8_t *pInquiry;
-
-} USBD_StorageTypeDef;
-
-
-typedef struct
-{
-  uint32_t                 max_lun;
-  uint32_t                 interface;
-  uint8_t                  bot_state;
-  uint8_t                  bot_status;
-  uint16_t                 bot_data_length;
-  uint8_t                  bot_data[MSC_MEDIA_PACKET];
-  USBD_MSC_BOT_CBWTypeDef  cbw;
-  USBD_MSC_BOT_CSWTypeDef  csw;
-
-  USBD_SCSI_SenseTypeDef   scsi_sense [SENSE_LIST_DEEPTH];
-  uint8_t                  scsi_sense_head;
-  uint8_t                  scsi_sense_tail;
-
-  uint16_t                 scsi_blk_size;
-  uint32_t                 scsi_blk_nbr;
-
-  uint32_t                 scsi_blk_addr;
-  uint32_t                 scsi_blk_len;
-}
-USBD_MSC_BOT_HandleTypeDef;
-
-/* Structure for MSC process */
-extern USBD_ClassTypeDef  USBD_MSC;
-#define USBD_MSC_CLASS    &USBD_MSC
-
-uint8_t  USBD_MSC_RegisterStorage(USBD_HandleTypeDef   *pdev,
-                                  USBD_StorageTypeDef *fops);
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USBD_MSC_H */
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Inc/usbd_msc_bot.h

@@ -1,150 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_bot.h
-  * @author  MCD Application Team
-  * @brief   Header for the usbd_msc_bot.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 __USBD_MSC_BOT_H
-#define __USBD_MSC_BOT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_core.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup MSC_BOT
-  * @brief This file is the Header file for usbd_msc_bot.c
-  * @{
-  */
-
-
-/** @defgroup USBD_CORE_Exported_Defines
-  * @{
-  */
-#define USBD_BOT_IDLE                      0U       /* Idle state */
-#define USBD_BOT_DATA_OUT                  1U       /* Data Out state */
-#define USBD_BOT_DATA_IN                   2U       /* Data In state */
-#define USBD_BOT_LAST_DATA_IN              3U       /* Last Data In Last */
-#define USBD_BOT_SEND_DATA                 4U       /* Send Immediate data */
-#define USBD_BOT_NO_DATA                   5U       /* No data Stage */
-
-#define USBD_BOT_CBW_SIGNATURE             0x43425355U
-#define USBD_BOT_CSW_SIGNATURE             0x53425355U
-#define USBD_BOT_CBW_LENGTH                31U
-#define USBD_BOT_CSW_LENGTH                13U
-#define USBD_BOT_MAX_DATA                  256U
-
-/* CSW Status Definitions */
-#define USBD_CSW_CMD_PASSED                0x00U
-#define USBD_CSW_CMD_FAILED                0x01U
-#define USBD_CSW_PHASE_ERROR               0x02U
-
-/* BOT Status */
-#define USBD_BOT_STATUS_NORMAL             0U
-#define USBD_BOT_STATUS_RECOVERY           1U
-#define USBD_BOT_STATUS_ERROR              2U
-
-
-#define USBD_DIR_IN                        0U
-#define USBD_DIR_OUT                       1U
-#define USBD_BOTH_DIR                      2U
-
-/**
-  * @}
-  */
-
-/** @defgroup MSC_CORE_Private_TypesDefinitions
-  * @{
-  */
-
-typedef struct
-{
-  uint32_t dSignature;
-  uint32_t dTag;
-  uint32_t dDataLength;
-  uint8_t  bmFlags;
-  uint8_t  bLUN;
-  uint8_t  bCBLength;
-  uint8_t  CB[16];
-  uint8_t  ReservedForAlign;
-}
-USBD_MSC_BOT_CBWTypeDef;
-
-
-typedef struct
-{
-  uint32_t dSignature;
-  uint32_t dTag;
-  uint32_t dDataResidue;
-  uint8_t  bStatus;
-  uint8_t  ReservedForAlign[3];
-}
-USBD_MSC_BOT_CSWTypeDef;
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_Types
-  * @{
-  */
-
-/**
-  * @}
-  */
-/** @defgroup USBD_CORE_Exported_FunctionsPrototypes
-  * @{
-  */
-void MSC_BOT_Init(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_Reset(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_DeInit(USBD_HandleTypeDef  *pdev);
-void MSC_BOT_DataIn(USBD_HandleTypeDef  *pdev,
-                    uint8_t epnum);
-
-void MSC_BOT_DataOut(USBD_HandleTypeDef  *pdev,
-                     uint8_t epnum);
-
-void MSC_BOT_SendCSW(USBD_HandleTypeDef  *pdev,
-                     uint8_t CSW_Status);
-
-void  MSC_BOT_CplClrFeature(USBD_HandleTypeDef  *pdev,
-                            uint8_t epnum);
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_MSC_BOT_H */
-/**
-  * @}
-  */
-
-/**
-* @}
-*/
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/MSC/Inc/usbd_msc_data.h

@@ -1,103 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_data.h
-  * @author  MCD Application Team
-  * @brief   Header for the usbd_msc_data.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 __USBD_MSC_DATA_H
-#define __USBD_MSC_DATA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_conf.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USB_INFO
-  * @brief general defines for the usb device library file
-  * @{
-  */
-
-/** @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
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_INFO_Exported_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_INFO_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @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[] ;
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_INFO_Exported_FunctionsPrototype
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_MSC_DATA_H */
-
-/**
-  * @}
-  */
-
-/**
-* @}
-*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Inc/usbd_msc_scsi.h

@@ -1,192 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_scsi.h
-  * @author  MCD Application Team
-  * @brief   Header for the usbd_msc_scsi.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 __USBD_MSC_SCSI_H
-#define __USBD_MSC_SCSI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_def.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_SCSI
-  * @brief header file for the storage disk file
-  * @{
-  */
-
-/** @defgroup USBD_SCSI_Exported_Defines
-  * @{
-  */
-
-#define SENSE_LIST_DEEPTH                           4U
-
-/* SCSI Commands */
-#define SCSI_FORMAT_UNIT                            0x04U
-#define SCSI_INQUIRY                                0x12U
-#define SCSI_MODE_SELECT6                           0x15U
-#define SCSI_MODE_SELECT10                          0x55U
-#define SCSI_MODE_SENSE6                            0x1AU
-#define SCSI_MODE_SENSE10                           0x5AU
-#define SCSI_ALLOW_MEDIUM_REMOVAL                   0x1EU
-#define SCSI_READ6                                  0x08U
-#define SCSI_READ10                                 0x28U
-#define SCSI_READ12                                 0xA8U
-#define SCSI_READ16                                 0x88U
-
-#define SCSI_READ_CAPACITY10                        0x25U
-#define SCSI_READ_CAPACITY16                        0x9EU
-
-#define SCSI_REQUEST_SENSE                          0x03U
-#define SCSI_START_STOP_UNIT                        0x1BU
-#define SCSI_TEST_UNIT_READY                        0x00U
-#define SCSI_WRITE6                                 0x0AU
-#define SCSI_WRITE10                                0x2AU
-#define SCSI_WRITE12                                0xAAU
-#define SCSI_WRITE16                                0x8AU
-
-#define SCSI_VERIFY10                               0x2FU
-#define SCSI_VERIFY12                               0xAFU
-#define SCSI_VERIFY16                               0x8FU
-
-#define SCSI_SEND_DIAGNOSTIC                        0x1DU
-#define SCSI_READ_FORMAT_CAPACITIES                 0x23U
-
-#define NO_SENSE                                    0U
-#define RECOVERED_ERROR                             1U
-#define NOT_READY                                   2U
-#define MEDIUM_ERROR                                3U
-#define HARDWARE_ERROR                              4U
-#define ILLEGAL_REQUEST                             5U
-#define UNIT_ATTENTION                              6U
-#define DATA_PROTECT                                7U
-#define BLANK_CHECK                                 8U
-#define VENDOR_SPECIFIC                             9U
-#define COPY_ABORTED                                10U
-#define ABORTED_COMMAND                             11U
-#define VOLUME_OVERFLOW                             13U
-#define MISCOMPARE                                  14U
-
-
-#define INVALID_CDB                                 0x20U
-#define INVALID_FIELED_IN_COMMAND                   0x24U
-#define PARAMETER_LIST_LENGTH_ERROR                 0x1AU
-#define INVALID_FIELD_IN_PARAMETER_LIST             0x26U
-#define ADDRESS_OUT_OF_RANGE                        0x21U
-#define MEDIUM_NOT_PRESENT                          0x3AU
-#define MEDIUM_HAVE_CHANGED                         0x28U
-#define WRITE_PROTECTED                             0x27U
-#define UNRECOVERED_READ_ERROR                      0x11U
-#define WRITE_FAULT                                 0x03U
-
-#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 [];
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_SCSI_Exported_TypesDefinitions
-  * @{
-  */
-
-typedef struct _SENSE_ITEM
-{
-  char Skey;
-  union
-  {
-    struct _ASCs
-    {
-      char ASC;
-      char ASCQ;
-    } b;
-    uint8_t ASC;
-    char *pData;
-  } w;
-} USBD_SCSI_SenseTypeDef;
-/**
-  * @}
-  */
-
-/** @defgroup USBD_SCSI_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_SCSI_Exported_Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-/** @defgroup USBD_SCSI_Exported_FunctionsPrototype
-  * @{
-  */
-int8_t SCSI_ProcessCmd(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *cmd);
-
-void SCSI_SenseCode(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t sKey,
-                    uint8_t ASC);
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_MSC_SCSI_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-* @}
-*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/MSC/Inc/usbd_msc_storage_template.h

@@ -1,97 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_storage.h
-  * @author  MCD Application Team
-  * @brief   Header file for the usbd_msc_storage.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 __USBD_MSC_STORAGE_H
-#define __USBD_MSC_STORAGE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_STORAGE
-  * @brief header file for the usbd_msc_storage.c file
-  * @{
-  */
-
-/** @defgroup USBD_STORAGE_Exported_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_STORAGE_Exported_Types
-  * @{
-  */
-
-
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_STORAGE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_STORAGE_Exported_Variables
-  * @{
-  */
-extern USBD_StorageTypeDef  USBD_MSC_Template_fops;
-/**
-  * @}
-  */
-
-/** @defgroup USBD_STORAGE_Exported_FunctionsPrototype
-  * @{
-  */
-
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_MSC_STORAGE_H */
-
-/**
-  * @}
-  */
-
-/**
-* @}
-*/
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Src/usbd_msc.c

@@ -1,608 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc.c
-  * @author  MCD Application Team
-  * @brief   This file provides all the MSC core functions.
-  *
-  * @verbatim
-  *
-  *          ===================================================================
-  *                                MSC Class  Description
-  *          ===================================================================
-  *           This module manages the MSC class V1.0 following the "Universal
-  *           Serial Bus Mass Storage Class (MSC) Bulk-Only Transport (BOT) Version 1.0
-  *           Sep. 31, 1999".
-  *           This driver implements the following aspects of the specification:
-  *             - Bulk-Only Transport protocol
-  *             - Subclass : SCSI transparent command set (ref. SCSI Primary Commands - 3 (SPC-3))
-  *
-  *  @endverbatim
-  *
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup MSC_CORE
-  * @brief Mass storage core module
-  * @{
-  */
-
-/** @defgroup MSC_CORE_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_CORE_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_CORE_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @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_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);
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_CORE_Private_Variables
-  * @{
-  */
-
-
-USBD_ClassTypeDef  USBD_MSC =
-{
-  USBD_MSC_Init,
-  USBD_MSC_DeInit,
-  USBD_MSC_Setup,
-  NULL, /*EP0_TxSent*/
-  NULL, /*EP0_RxReady*/
-  USBD_MSC_DataIn,
-  USBD_MSC_DataOut,
-  NULL, /*SOF */
-  NULL,
-  NULL,
-  USBD_MSC_GetHSCfgDesc,
-  USBD_MSC_GetFSCfgDesc,
-  USBD_MSC_GetOtherSpeedCfgDesc,
-  USBD_MSC_GetDeviceQualifierDescriptor,
-};
-
-/* 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 =
-{
-
-  0x09,   /* bLength: Configuation 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 */
-
-  /********************  Mass Storage interface ********************/
-  0x09,   /* bLength: Interface Descriptor size */
-  0x04,   /* bDescriptorType: */
-  0x00,   /* bInterfaceNumber: Number of Interface */
-  0x00,   /* bAlternateSetting: Alternate setting */
-  0x02,   /* bNumEndpoints*/
-  0x08,   /* bInterfaceClass: MSC Class */
-  0x06,   /* bInterfaceSubClass : SCSI transparent*/
-  0x50,   /* nInterfaceProtocol */
-  0x05,          /* iInterface: */
-  /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
-  LOBYTE(MSC_MAX_HS_PACKET),
-  HIBYTE(MSC_MAX_HS_PACKET),
-  0x00,   /*Polling interval in milliseconds */
-
-  0x07,   /*Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
-  LOBYTE(MSC_MAX_HS_PACKET),
-  HIBYTE(MSC_MAX_HS_PACKET),
-  0x00     /*Polling interval in milliseconds*/
-};
-
-/* USB Mass storage device Configuration Descriptor */
-/*   All Descriptors (Configuration, Interface, Endpoint, Class, Vendor */
-__ALIGN_BEGIN uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ]  __ALIGN_END =
-{
-  0x09,   /* bLength: Configuation Descriptor size */
-  USB_DESC_TYPE_CONFIGURATION,   /* bDescriptorType: Configuration */
-  USB_MSC_CONFIG_DESC_SIZ,
-
-  0x00,
-  0x01,   /* bNumInterfaces: 1 interface */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
-
-  /********************  Mass Storage interface ********************/
-  0x09,   /* bLength: Interface Descriptor size */
-  0x04,   /* bDescriptorType: */
-  0x00,   /* bInterfaceNumber: Number of Interface */
-  0x00,   /* bAlternateSetting: Alternate setting */
-  0x02,   /* bNumEndpoints*/
-  0x08,   /* bInterfaceClass: MSC Class */
-  0x06,   /* bInterfaceSubClass : SCSI transparent*/
-  0x50,   /* nInterfaceProtocol */
-  0x05,          /* iInterface: */
-  /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
-  LOBYTE(MSC_MAX_FS_PACKET),
-  HIBYTE(MSC_MAX_FS_PACKET),
-  0x00,   /*Polling interval in milliseconds */
-
-  0x07,   /*Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
-  LOBYTE(MSC_MAX_FS_PACKET),
-  HIBYTE(MSC_MAX_FS_PACKET),
-  0x00     /*Polling interval in milliseconds*/
-};
-
-__ALIGN_BEGIN uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ]   __ALIGN_END  =
-{
-  0x09,   /* bLength: Configuation Descriptor size */
-  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
-  USB_MSC_CONFIG_DESC_SIZ,
-
-  0x00,
-  0x01,   /* bNumInterfaces: 1 interface */
-  0x01,   /* bConfigurationValue: */
-  0x04,   /* iConfiguration: */
-  0xC0,   /* bmAttributes: */
-  0x32,   /* MaxPower 100 mA */
-
-  /********************  Mass Storage interface ********************/
-  0x09,   /* bLength: Interface Descriptor size */
-  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: */
-  /********************  Mass Storage Endpoints ********************/
-  0x07,   /*Endpoint descriptor length = 7*/
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPIN_ADDR,   /*Endpoint address (IN, address 1) */
-  0x02,   /*Bulk endpoint type */
-  0x40,
-  0x00,
-  0x00,   /*Polling interval in milliseconds */
-
-  0x07,   /*Endpoint descriptor length = 7 */
-  0x05,   /*Endpoint descriptor type */
-  MSC_EPOUT_ADDR,   /*Endpoint address (OUT, address 1) */
-  0x02,   /*Bulk endpoint type */
-  0x40,
-  0x00,
-  0x00     /*Polling interval in milliseconds*/
-};
-
-/* USB Standard Device Descriptor */
-__ALIGN_BEGIN  uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC]  __ALIGN_END =
-{
-  USB_LEN_DEV_QUALIFIER_DESC,
-  USB_DESC_TYPE_DEVICE_QUALIFIER,
-  0x00,
-  0x02,
-  0x00,
-  0x00,
-  0x00,
-  MSC_MAX_FS_PACKET,
-  0x01,
-  0x00,
-};
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_CORE_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  USBD_MSC_Init
-  *         Initialize  the mass storage configuration
-  * @param  pdev: device instance
-  * @param  cfgidx: configuration index
-  * @retval status
-  */
-uint8_t USBD_MSC_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx)
-{
-  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);
-    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);
-    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);
-    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);
-    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;
-}
-
-/**
-  * @brief  USBD_MSC_DeInit
-  *         DeInitilaize  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)
-{
-  /* Close MSC EPs */
-  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);
-  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);
-    pdev->pClassData  = NULL;
-  }
-
-  return USBD_OK;
-}
-/**
-* @brief  USBD_MSC_Setup
-*         Handle the MSC specific requests
-* @param  pdev: device instance
-* @param  req: USB request
-* @retval status
-*/
-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;
-  uint16_t status_info = 0U;
-
-  switch (req->bmRequest & USB_REQ_TYPE_MASK)
-  {
-    /* Class request */
-    case USB_REQ_TYPE_CLASS:
-      switch (req->bRequest)
-      {
-        case BOT_GET_MAX_LUN:
-          if ((req->wValue  == 0U) && (req->wLength == 1U) &&
-              ((req->bmRequest & 0x80U) == 0x80U))
-          {
-            hmsc->max_lun = (uint32_t)((USBD_StorageTypeDef *)pdev->pUserData)->GetMaxLun();
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&hmsc->max_lun, 1U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case BOT_RESET :
-          if ((req->wValue  == 0U) && (req->wLength == 0U) &&
-              ((req->bmRequest & 0x80U) != 0x80U))
-          {
-            MSC_BOT_Reset(pdev);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-    /* Interface & Endpoint request */
-    case USB_REQ_TYPE_STANDARD:
-      switch (req->bRequest)
-      {
-        case USB_REQ_GET_STATUS:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&status_info, 2U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_GET_INTERFACE:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            USBD_CtlSendData(pdev, (uint8_t *)(void *)&hmsc->interface, 1U);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          break;
-
-        case USB_REQ_SET_INTERFACE:
-          if (pdev->dev_state == USBD_STATE_CONFIGURED)
-          {
-            hmsc->interface = (uint8_t)(req->wValue);
-          }
-          else
-          {
-            USBD_CtlError(pdev, req);
-            ret = USBD_FAIL;
-          }
-          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)
-          {
-            pdev->ep_in[(uint8_t)req->wIndex & 0xFU].is_used = 0U;
-            if (pdev->dev_speed == USBD_SPEED_HIGH)
-            {
-              /* 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;
-          }
-
-          /* Handle BOT error */
-          MSC_BOT_CplClrFeature(pdev, (uint8_t)req->wIndex);
-          break;
-
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    default:
-      USBD_CtlError(pdev, req);
-      ret = USBD_FAIL;
-      break;
-  }
-
-  return ret;
-}
-
-/**
-* @brief  USBD_MSC_DataIn
-*         handle data IN Stage
-* @param  pdev: device instance
-* @param  epnum: endpoint index
-* @retval status
-*/
-uint8_t USBD_MSC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  MSC_BOT_DataIn(pdev, epnum);
-
-  return USBD_OK;
-}
-
-/**
-* @brief  USBD_MSC_DataOut
-*         handle data OUT Stage
-* @param  pdev: device instance
-* @param  epnum: endpoint index
-* @retval status
-*/
-uint8_t USBD_MSC_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-  MSC_BOT_DataOut(pdev, epnum);
-
-  return USBD_OK;
-}
-
-/**
-* @brief  USBD_MSC_GetHSCfgDesc
-*         return configuration descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t *USBD_MSC_GetHSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_MSC_CfgHSDesc);
-
-  return USBD_MSC_CfgHSDesc;
-}
-
-/**
-* @brief  USBD_MSC_GetFSCfgDesc
-*         return configuration descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t *USBD_MSC_GetFSCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_MSC_CfgFSDesc);
-
-  return USBD_MSC_CfgFSDesc;
-}
-
-/**
-* @brief  USBD_MSC_GetOtherSpeedCfgDesc
-*         return other speed configuration descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t *USBD_MSC_GetOtherSpeedCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_MSC_OtherSpeedCfgDesc);
-
-  return USBD_MSC_OtherSpeedCfgDesc;
-}
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t *USBD_MSC_GetDeviceQualifierDescriptor(uint16_t *length)
-{
-  *length = sizeof(USBD_MSC_DeviceQualifierDesc);
-
-  return USBD_MSC_DeviceQualifierDesc;
-}
-
-/**
-* @brief  USBD_MSC_RegisterStorage
-* @param  fops: storage callback
-* @retval status
-*/
-uint8_t USBD_MSC_RegisterStorage(USBD_HandleTypeDef *pdev,
-                                 USBD_StorageTypeDef *fops)
-{
-  if (fops != NULL)
-  {
-    pdev->pUserData = fops;
-  }
-
-  return USBD_OK;
-}
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Src/usbd_msc_bot.c

@@ -1,387 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_bot.c
-  * @author  MCD Application Team
-  * @brief   This file provides all the BOT protocol core functions.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc_bot.h"
-#include "usbd_msc.h"
-#include "usbd_msc_scsi.h"
-#include "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup MSC_BOT
-  * @brief BOT protocol module
-  * @{
-  */
-
-/** @defgroup MSC_BOT_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_BOT_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_BOT_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_BOT_Private_Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_BOT_Private_FunctionPrototypes
-  * @{
-  */
-static void MSC_BOT_CBW_Decode(USBD_HandleTypeDef  *pdev);
-static void MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf,
-                             uint16_t len);
-
-static void MSC_BOT_Abort(USBD_HandleTypeDef  *pdev);
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_BOT_Private_Functions
-  * @{
-  */
-
-
-
-/**
-* @brief  MSC_BOT_Init
-*         Initialize the BOT Process
-* @param  pdev: device instance
-* @retval None
-*/
-void MSC_BOT_Init(USBD_HandleTypeDef  *pdev)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  hmsc->bot_state = USBD_BOT_IDLE;
-  hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
-
-  hmsc->scsi_sense_tail = 0U;
-  hmsc->scsi_sense_head = 0U;
-
-  ((USBD_StorageTypeDef *)pdev->pUserData)->Init(0U);
-
-  USBD_LL_FlushEP(pdev, MSC_EPOUT_ADDR);
-  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,
-                         USBD_BOT_CBW_LENGTH);
-}
-
-/**
-* @brief  MSC_BOT_Reset
-*         Reset the BOT Machine
-* @param  pdev: device instance
-* @retval  None
-*/
-void MSC_BOT_Reset(USBD_HandleTypeDef  *pdev)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  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,
-                         USBD_BOT_CBW_LENGTH);
-}
-
-/**
-* @brief  MSC_BOT_DeInit
-*         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;
-  hmsc->bot_state = USBD_BOT_IDLE;
-}
-
-/**
-* @brief  MSC_BOT_DataIn
-*         Handle BOT IN data stage
-* @param  pdev: device instance
-* @param  epnum: endpoint index
-* @retval None
-*/
-void MSC_BOT_DataIn(USBD_HandleTypeDef  *pdev,
-                    uint8_t epnum)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  switch (hmsc->bot_state)
-  {
-    case USBD_BOT_DATA_IN:
-      if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
-      {
-        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
-      }
-      break;
-
-    case USBD_BOT_SEND_DATA:
-    case USBD_BOT_LAST_DATA_IN:
-      MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
-      break;
-
-    default:
-      break;
-  }
-}
-/**
-* @brief  MSC_BOT_DataOut
-*         Process MSC OUT data
-* @param  pdev: device instance
-* @param  epnum: endpoint index
-* @retval None
-*/
-void MSC_BOT_DataOut(USBD_HandleTypeDef  *pdev,
-                     uint8_t epnum)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  switch (hmsc->bot_state)
-  {
-    case USBD_BOT_IDLE:
-      MSC_BOT_CBW_Decode(pdev);
-      break;
-
-    case USBD_BOT_DATA_OUT:
-
-      if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
-      {
-        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
-      }
-      break;
-
-    default:
-      break;
-  }
-}
-
-/**
-* @brief  MSC_BOT_CBW_Decode
-*         Decode the CBW command and set the BOT state machine accordingly
-* @param  pdev: device instance
-* @retval None
-*/
-static void  MSC_BOT_CBW_Decode(USBD_HandleTypeDef  *pdev)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  hmsc->csw.dTag = hmsc->cbw.dTag;
-  hmsc->csw.dDataResidue = hmsc->cbw.dDataLength;
-
-  if ((USBD_LL_GetRxDataSize(pdev, MSC_EPOUT_ADDR) != USBD_BOT_CBW_LENGTH) ||
-      (hmsc->cbw.dSignature != USBD_BOT_CBW_SIGNATURE) ||
-      (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;
-    MSC_BOT_Abort(pdev);
-  }
-  else
-  {
-    if (SCSI_ProcessCmd(pdev, hmsc->cbw.bLUN, &hmsc->cbw.CB[0]) < 0)
-    {
-      if (hmsc->bot_state == USBD_BOT_NO_DATA)
-      {
-        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
-      }
-      else
-      {
-        MSC_BOT_Abort(pdev);
-      }
-    }
-    /*Burst xfer handled internally*/
-    else if ((hmsc->bot_state != USBD_BOT_DATA_IN) &&
-             (hmsc->bot_state != USBD_BOT_DATA_OUT) &&
-             (hmsc->bot_state != USBD_BOT_LAST_DATA_IN))
-    {
-      if (hmsc->bot_data_length > 0U)
-      {
-        MSC_BOT_SendData(pdev, hmsc->bot_data, hmsc->bot_data_length);
-      }
-      else if (hmsc->bot_data_length == 0U)
-      {
-        MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
-      }
-      else
-      {
-        MSC_BOT_Abort(pdev);
-      }
-    }
-    else
-    {
-      return;
-    }
-  }
-}
-
-/**
-* @brief  MSC_BOT_SendData
-*         Send the requested data
-* @param  pdev: device instance
-* @param  buf: pointer to data buffer
-* @param  len: Data Length
-* @retval None
-*/
-static void  MSC_BOT_SendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf,
-                              uint16_t len)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  uint16_t length = (uint16_t)MIN(hmsc->cbw.dDataLength, len);
-
-  hmsc->csw.dDataResidue -= len;
-  hmsc->csw.bStatus = USBD_CSW_CMD_PASSED;
-  hmsc->bot_state = USBD_BOT_SEND_DATA;
-
-  USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, pbuf, length);
-}
-
-/**
-* @brief  MSC_BOT_SendCSW
-*         Send the Command Status Wrapper
-* @param  pdev: device instance
-* @param  status : CSW status
-* @retval None
-*/
-void  MSC_BOT_SendCSW(USBD_HandleTypeDef  *pdev,
-                      uint8_t CSW_Status)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  hmsc->csw.dSignature = USBD_BOT_CSW_SIGNATURE;
-  hmsc->csw.bStatus = CSW_Status;
-  hmsc->bot_state = USBD_BOT_IDLE;
-
-  USBD_LL_Transmit(pdev, MSC_EPIN_ADDR, (uint8_t *)(void *)&hmsc->csw,
-                   USBD_BOT_CSW_LENGTH);
-
-  /* Prepare EP to Receive next Cmd */
-  USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, (uint8_t *)(void *)&hmsc->cbw,
-                         USBD_BOT_CBW_LENGTH);
-}
-
-/**
-* @brief  MSC_BOT_Abort
-*         Abort the current transfer
-* @param  pdev: device instance
-* @retval status
-*/
-
-static void  MSC_BOT_Abort(USBD_HandleTypeDef  *pdev)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  if ((hmsc->cbw.bmFlags == 0U) &&
-      (hmsc->cbw.dDataLength != 0U) &&
-      (hmsc->bot_status == USBD_BOT_STATUS_NORMAL))
-  {
-    USBD_LL_StallEP(pdev, MSC_EPOUT_ADDR);
-  }
-
-  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);
-  }
-}
-
-/**
-* @brief  MSC_BOT_CplClrFeature
-*         Complete the clear feature request
-* @param  pdev: device instance
-* @param  epnum: endpoint index
-* @retval None
-*/
-
-void  MSC_BOT_CplClrFeature(USBD_HandleTypeDef  *pdev, uint8_t epnum)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  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;
-  }
-  else if (((epnum & 0x80U) == 0x80U) && (hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))
-  {
-    MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_FAILED);
-  }
-  else
-  {
-    return;
-  }
-}
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Src/usbd_msc_data.c

@@ -1,135 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_data.c
-  * @author  MCD Application Team
-  * @brief   This file provides all the vital inquiry pages and sense data.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc_data.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup MSC_DATA
-  * @brief Mass storage info/data module
-  * @{
-  */
-
-/** @defgroup MSC_DATA_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_DATA_Private_Defines
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_DATA_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_DATA_Private_Variables
-  * @{
-  */
-
-
-/* USB Mass storage Page 0 Inquiry Data */
-const uint8_t  MSC_Page00_Inquiry_Data[] =
-{
-  0x00,
-  0x00,
-  0x00,
-  (LENGTH_INQUIRY_PAGE00 - 4U),
-  0x00,
-  0x80,
-  0x83
-};
-/* USB Mass storage sense 6  Data */
-const uint8_t  MSC_Mode_Sense6_data[] =
-{
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00
-};
-/* USB Mass storage sense 10  Data */
-const uint8_t  MSC_Mode_Sense10_data[] =
-{
-  0x00,
-  0x06,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00
-};
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_DATA_Private_FunctionPrototypes
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_DATA_Private_Functions
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Src/usbd_msc_scsi.c

@@ -1,716 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_scsi.c
-  * @author  MCD Application Team
-  * @brief   This file provides all the USBD SCSI layer functions.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc_bot.h"
-#include "usbd_msc_scsi.h"
-#include "usbd_msc.h"
-#include "usbd_msc_data.h"
-
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup MSC_SCSI
-  * @brief Mass storage SCSI layer module
-  * @{
-  */
-
-/** @defgroup MSC_SCSI_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_SCSI_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_SCSI_Private_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_SCSI_Private_Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_SCSI_Private_FunctionPrototypes
-  * @{
-  */
-static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *params);
-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_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_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_Read10(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);
-/**
-  * @}
-  */
-
-
-/** @defgroup MSC_SCSI_Private_Functions
-  * @{
-  */
-
-
-/**
-* @brief  SCSI_ProcessCmd
-*         Process SCSI commands
-* @param  pdev: device instance
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-int8_t SCSI_ProcessCmd(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t *cmd)
-{
-  switch (cmd[0])
-  {
-    case SCSI_TEST_UNIT_READY:
-      SCSI_TestUnitReady(pdev, lun, cmd);
-      break;
-
-    case SCSI_REQUEST_SENSE:
-      SCSI_RequestSense(pdev, lun, cmd);
-      break;
-    case SCSI_INQUIRY:
-      SCSI_Inquiry(pdev, lun, cmd);
-      break;
-
-    case SCSI_START_STOP_UNIT:
-      SCSI_StartStopUnit(pdev, lun, cmd);
-      break;
-
-    case SCSI_ALLOW_MEDIUM_REMOVAL:
-      SCSI_StartStopUnit(pdev, lun, cmd);
-      break;
-
-    case SCSI_MODE_SENSE6:
-      SCSI_ModeSense6(pdev, lun, cmd);
-      break;
-
-    case SCSI_MODE_SENSE10:
-      SCSI_ModeSense10(pdev, lun, cmd);
-      break;
-
-    case SCSI_READ_FORMAT_CAPACITIES:
-      SCSI_ReadFormatCapacity(pdev, lun, cmd);
-      break;
-
-    case SCSI_READ_CAPACITY10:
-      SCSI_ReadCapacity10(pdev, lun, cmd);
-      break;
-
-    case SCSI_READ10:
-      SCSI_Read10(pdev, lun, cmd);
-      break;
-
-    case SCSI_WRITE10:
-      SCSI_Write10(pdev, lun, cmd);
-      break;
-
-    case SCSI_VERIFY10:
-      SCSI_Verify10(pdev, lun, cmd);
-      break;
-
-    default:
-      SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, INVALID_CDB);
-      return -1;
-  }
-
-  return 0;
-}
-
-
-/**
-* @brief  SCSI_TestUnitReady
-*         Process SCSI Test Unit Ready Command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  /* case 9 : Hi > D0 */
-  if (hmsc->cbw.dDataLength != 0U)
-  {
-    SCSI_SenseCode(pdev, hmsc->cbw.bLUN, ILLEGAL_REQUEST, INVALID_CDB);
-
-    return -1;
-  }
-
-  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;
-  }
-  hmsc->bot_data_length = 0U;
-
-  return 0;
-}
-
-/**
-* @brief  SCSI_Inquiry
-*         Process Inquiry command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t  SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  uint8_t *pPage;
-  uint16_t len;
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  if (params[1] & 0x01U)/*Evpd is set*/
-  {
-    len = LENGTH_INQUIRY_PAGE00;
-    hmsc->bot_data_length = len;
-
-    while (len)
-    {
-      len--;
-      hmsc->bot_data[len] = MSC_Page00_Inquiry_Data[len];
-    }
-  }
-  else
-  {
-    pPage = (uint8_t *)(void *) & ((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];
-    }
-  }
-
-  return 0;
-}
-
-/**
-* @brief  SCSI_ReadCapacity10
-*         Process Read Capacity 10 command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  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)
-  {
-    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);
-    hmsc->bot_data[2] = (uint8_t)((hmsc->scsi_blk_nbr - 1U) >>  8);
-    hmsc->bot_data[3] = (uint8_t)(hmsc->scsi_blk_nbr - 1U);
-
-    hmsc->bot_data[4] = (uint8_t)(hmsc->scsi_blk_size >>  24);
-    hmsc->bot_data[5] = (uint8_t)(hmsc->scsi_blk_size >>  16);
-    hmsc->bot_data[6] = (uint8_t)(hmsc->scsi_blk_size >>  8);
-    hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_size);
-
-    hmsc->bot_data_length = 8U;
-    return 0;
-  }
-}
-/**
-* @brief  SCSI_ReadFormatCapacity
-*         Process Read Format Capacity command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-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;
-
-  uint16_t blk_size;
-  uint32_t blk_nbr;
-  uint16_t i;
-
-  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);
-    hmsc->bot_data[6] = (uint8_t)((blk_nbr - 1U) >>  8);
-    hmsc->bot_data[7] = (uint8_t)(blk_nbr - 1U);
-
-    hmsc->bot_data[8] = 0x02U;
-    hmsc->bot_data[9] = (uint8_t)(blk_size >>  16);
-    hmsc->bot_data[10] = (uint8_t)(blk_size >>  8);
-    hmsc->bot_data[11] = (uint8_t)(blk_size);
-
-    hmsc->bot_data_length = 12U;
-    return 0;
-  }
-}
-/**
-* @brief  SCSI_ModeSense6
-*         Process Mode Sense6 command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t SCSI_ModeSense6(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-  uint16_t len = 8U;
-  hmsc->bot_data_length = len;
-
-  while (len)
-  {
-    len--;
-    hmsc->bot_data[len] = MSC_Mode_Sense6_data[len];
-  }
-  return 0;
-}
-
-/**
-* @brief  SCSI_ModeSense10
-*         Process Mode Sense10 command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t SCSI_ModeSense10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  uint16_t len = 8U;
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  hmsc->bot_data_length = len;
-
-  while (len)
-  {
-    len--;
-    hmsc->bot_data[len] = MSC_Mode_Sense10_data[len];
-  }
-
-  return 0;
-}
-
-/**
-* @brief  SCSI_RequestSense
-*         Process Request Sense command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-
-static int8_t SCSI_RequestSense(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  uint8_t i;
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  for (i = 0U ; i < REQUEST_SENSE_DATA_LEN; i++)
-  {
-    hmsc->bot_data[i] = 0U;
-  }
-
-  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;
-    hmsc->scsi_sense_head++;
-
-    if (hmsc->scsi_sense_head == SENSE_LIST_DEEPTH)
-    {
-      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
-* @retval none
-
-*/
-void SCSI_SenseCode(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t sKey, uint8_t ASC)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *)pdev->pClassData;
-
-  hmsc->scsi_sense[hmsc->scsi_sense_tail].Skey  = sKey;
-  hmsc->scsi_sense[hmsc->scsi_sense_tail].w.ASC = ASC << 8;
-  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
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-static int8_t SCSI_StartStopUnit(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *) pdev->pClassData;
-  hmsc->bot_data_length = 0U;
-  return 0;
-}
-
-/**
-* @brief  SCSI_Read10
-*         Process Read10 command
-* @param  lun: Logical unit number
-* @param  params: Command parameters
-* @retval status
-*/
-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->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 (((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[7] <<  8) | (uint32_t)params[8];
-
-    if (SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr,
-                               hmsc->scsi_blk_len) < 0)
-    {
-      return -1; /* error */
-    }
-
-    hmsc->bot_state = USBD_BOT_DATA_IN;
-
-    /* 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_data_length = MSC_MEDIA_PACKET;
-
-  return SCSI_ProcessRead(pdev, lun);
-}
-
-/**
-* @brief  SCSI_Write10
-*         Process Write10 command
-* @param  lun: Logical unit number
-* @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->bot_state == USBD_BOT_IDLE) /* Idle */
-  {
-    /* 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);
-      return -1;
-    }
-
-    /* Check If media is write-protected */
-    if (((USBD_StorageTypeDef *)pdev->pUserData)->IsWriteProtected(lun) != 0)
-    {
-      SCSI_SenseCode(pdev, lun, NOT_READY, WRITE_PROTECTED);
-      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[7] << 8) |
-                         (uint32_t)params[8];
-
-    /* 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;
-    USBD_LL_PrepareReceive(pdev, MSC_EPOUT_ADDR, hmsc->bot_data, len);
-  }
-  else /* Write Process ongoing */
-  {
-    return SCSI_ProcessWrite(pdev, lun);
-  }
-  return 0;
-}
-
-
-/**
-* @brief  SCSI_Verify10
-*         Process Verify10 command
-* @param  lun: Logical unit number
-* @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 ((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)
-  {
-    return -1; /* error */
-  }
-  hmsc->bot_data_length = 0U;
-  return 0;
-}
-
-/**
-* @brief  SCSI_CheckAddressRange
-*         Check address range
-* @param  lun: Logical unit number
-* @param  blk_offset: first block address
-* @param  blk_nbr: number of block to be processed
-* @retval status
-*/
-static int8_t SCSI_CheckAddressRange(USBD_HandleTypeDef *pdev, uint8_t lun,
-                                     uint32_t blk_offset, uint32_t blk_nbr)
-{
-  USBD_MSC_BOT_HandleTypeDef  *hmsc = (USBD_MSC_BOT_HandleTypeDef *) pdev->pClassData;
-
-  if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr)
-  {
-    SCSI_SenseCode(pdev, lun, ILLEGAL_REQUEST, ADDRESS_OUT_OF_RANGE);
-    return -1;
-  }
-  return 0;
-}
-
-/**
-* @brief  SCSI_ProcessRead
-*         Handle Read Process
-* @param  lun: Logical unit number
-* @retval status
-*/
-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;
-
-  len = MIN(len, MSC_MEDIA_PACKET);
-
-  if (((USBD_StorageTypeDef *)pdev->pUserData)->Read(lun,
-                                                     hmsc->bot_data,
-                                                     hmsc->scsi_blk_addr,
-                                                     (len / hmsc->scsi_blk_size)) < 0)
-  {
-    SCSI_SenseCode(pdev, lun, HARDWARE_ERROR, UNRECOVERED_READ_ERROR);
-    return -1;
-  }
-
-  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);
-
-  /* case 6 : Hi = Di */
-  hmsc->csw.dDataResidue -= len;
-
-  if (hmsc->scsi_blk_len == 0U)
-  {
-    hmsc->bot_state = USBD_BOT_LAST_DATA_IN;
-  }
-  return 0;
-}
-
-/**
-* @brief  SCSI_ProcessWrite
-*         Handle Write Process
-* @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;
-
-  len = MIN(len, MSC_MEDIA_PACKET);
-
-  if (((USBD_StorageTypeDef *)pdev->pUserData)->Write(lun, hmsc->bot_data,
-                                                      hmsc->scsi_blk_addr,
-                                                      (len / hmsc->scsi_blk_size)) < 0)
-  {
-    SCSI_SenseCode(pdev, lun, HARDWARE_ERROR, WRITE_FAULT);
-
-    return -1;
-  }
-
-  hmsc->scsi_blk_addr += (len / hmsc->scsi_blk_size);
-  hmsc->scsi_blk_len -= (len / hmsc->scsi_blk_size);
-
-  /* case 12 : Ho = Do */
-  hmsc->csw.dDataResidue -= len;
-
-  if (hmsc->scsi_blk_len == 0U)
-  {
-    MSC_BOT_SendCSW(pdev, USBD_CSW_CMD_PASSED);
-  }
-  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);
-  }
-
-  return 0;
-}
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/MSC/Src/usbd_msc_storage_template.c

@@ -1,177 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_msc_storage_template.c
-  * @author  MCD Application Team
-  * @brief   Memory management layer
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* BSPDependencies
-- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
-- "stm32xxxxx_{eval}{discovery}_io.c"
-- "stm32xxxxx_{eval}{discovery}{adafruit}_sd.c"
-EndBSPDependencies */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_msc_storage_template.h"
-
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Extern function prototypes ------------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-#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,
-                           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,
-                    uint16_t blk_len);
-
-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 */
-{
-
-  /* LUN 0 */
-  0x00,
-  0x80,
-  0x02,
-  0x02,
-  (STANDARD_INQUIRY_DATA_LEN - 5),
-  0x00,
-  0x00,
-  0x00,
-  'S', 'T', 'M', ' ', ' ', ' ', ' ', ' ', /* Manufacturer : 8 bytes */
-  'P', 'r', 'o', 'd', 'u', 'c', 't', ' ', /* Product      : 16 Bytes */
-  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
-  '0', '.', '0', '1',                     /* Version      : 4 Bytes */
-};
-
-USBD_StorageTypeDef USBD_MSC_Template_fops =
-{
-  STORAGE_Init,
-  STORAGE_GetCapacity,
-  STORAGE_IsReady,
-  STORAGE_IsWriteProtected,
-  STORAGE_Read,
-  STORAGE_Write,
-  STORAGE_GetMaxLun,
-  STORAGE_Inquirydata,
-
-};
-/*******************************************************************************
-* Function Name  : Read_Memory
-* Description    : Handle the Read operation from the microSD card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t STORAGE_Init(uint8_t lun)
-{
-  return (0);
-}
-
-/*******************************************************************************
-* Function Name  : Read_Memory
-* Description    : Handle the Read operation from the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t STORAGE_GetCapacity(uint8_t lun, uint32_t *block_num, uint16_t *block_size)
-{
-  *block_num  = STORAGE_BLK_NBR;
-  *block_size = STORAGE_BLK_SIZ;
-  return (0);
-}
-
-/*******************************************************************************
-* Function Name  : Read_Memory
-* Description    : Handle the Read operation from the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t  STORAGE_IsReady(uint8_t lun)
-{
-  return (0);
-}
-
-/*******************************************************************************
-* Function Name  : Read_Memory
-* Description    : Handle the Read operation from the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t  STORAGE_IsWriteProtected(uint8_t lun)
-{
-  return  0;
-}
-
-/*******************************************************************************
-* Function Name  : Read_Memory
-* Description    : Handle the Read operation from the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t STORAGE_Read(uint8_t lun, uint8_t *buf,
-                    uint32_t blk_addr, uint16_t blk_len)
-{
-  return 0;
-}
-/*******************************************************************************
-* Function Name  : Write_Memory
-* Description    : Handle the Write operation to the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t STORAGE_Write(uint8_t lun, uint8_t *buf,
-                     uint32_t blk_addr, uint16_t blk_len)
-{
-  return (0);
-}
-/*******************************************************************************
-* Function Name  : Write_Memory
-* Description    : Handle the Write operation to the STORAGE card.
-* Input          : None.
-* Output         : None.
-* Return         : None.
-*******************************************************************************/
-int8_t STORAGE_GetMaxLun(void)
-{
-  return (STORAGE_LUN_NBR - 1);
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Class/Template/Inc/usbd_template.h

@@ -1,101 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_template_core.h
-  * @author  MCD Application Team
-  * @brief   Header file for the usbd_template_core.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_TEMPLATE_CORE_H
-#define __USB_TEMPLATE_CORE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include  "usbd_ioreq.h"
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_TEMPLATE
-  * @brief This file is the header file for usbd_template_core.c
-  * @{
-  */
-
-
-/** @defgroup USBD_TEMPLATE_Exported_Defines
-  * @{
-  */
-#define TEMPLATE_EPIN_ADDR                 0x81
-#define TEMPLATE_EPIN_SIZE                 0x10
-
-#define USB_TEMPLATE_CONFIG_DESC_SIZ       64
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CORE_Exported_TypesDefinitions
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-
-/** @defgroup USBD_CORE_Exported_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CORE_Exported_Variables
-  * @{
-  */
-
-extern USBD_ClassTypeDef  USBD_TEMPLATE_ClassDriver;
-/**
-  * @}
-  */
-
-/** @defgroup USB_CORE_Exported_Functions
-  * @{
-  */
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __USB_TEMPLATE_CORE_H */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Class/Template/Src/usbd_template.c

@@ -1,397 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_template.c
-  * @author  MCD Application Team
-  * @brief   This file provides the HID core functions.
-  *
-  * @verbatim
-  *
-  *          ===================================================================
-  *                                TEMPLATE Class  Description
-  *          ===================================================================
-  *
-  *
-  *
-  *
-  *
-  *
-  * @note     In HS mode and when the DMA is used, all variables and data structures
-  *           dealing with the DMA during the transaction process should be 32-bit aligned.
-  *
-  *
-  *  @endverbatim
-  *
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_template.h"
-#include "usbd_ctlreq.h"
-
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_TEMPLATE
-  * @brief usbd core module
-  * @{
-  */
-
-/** @defgroup USBD_TEMPLATE_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_TEMPLATE_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_TEMPLATE_Private_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-
-
-
-/** @defgroup USBD_TEMPLATE_Private_FunctionPrototypes
-  * @{
-  */
-
-
-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_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);
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_TEMPLATE_Private_Variables
-  * @{
-  */
-
-USBD_ClassTypeDef  USBD_TEMPLATE_ClassDriver =
-{
-  USBD_TEMPLATE_Init,
-  USBD_TEMPLATE_DeInit,
-  USBD_TEMPLATE_Setup,
-  USBD_TEMPLATE_EP0_TxReady,
-  USBD_TEMPLATE_EP0_RxReady,
-  USBD_TEMPLATE_DataIn,
-  USBD_TEMPLATE_DataOut,
-  USBD_TEMPLATE_SOF,
-  USBD_TEMPLATE_IsoINIncomplete,
-  USBD_TEMPLATE_IsoOutIncomplete,
-  USBD_TEMPLATE_GetCfgDesc,
-  USBD_TEMPLATE_GetCfgDesc,
-  USBD_TEMPLATE_GetCfgDesc,
-  USBD_TEMPLATE_GetDeviceQualifierDesc,
-};
-
-#if defined ( __ICCARM__ ) /*!< IAR Compiler */
-#pragma data_alignment=4
-#endif
-/* USB TEMPLATE device Configuration Descriptor */
-static uint8_t USBD_TEMPLATE_CfgDesc[USB_TEMPLATE_CONFIG_DESC_SIZ] =
-{
-  0x09, /* bLength: Configuation Descriptor size */
-  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION, /* bDescriptorType: Configuration */
-  USB_TEMPLATE_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 Supports Remote Wakeup */
-  0x32,         /*MaxPower 100 mA: this current is used for detecting Vbus*/
-  /* 09 */
-
-  /**********  Descriptor of TEMPLATE interface 0 Alternate setting 0 **************/
-
-};
-
-#if defined ( __ICCARM__ ) /*!< IAR Compiler */
-#pragma data_alignment=4
-#endif
-/* USB Standard Device Descriptor */
-static uint8_t USBD_TEMPLATE_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] =
-{
-  USB_LEN_DEV_QUALIFIER_DESC,
-  USB_DESC_TYPE_DEVICE_QUALIFIER,
-  0x00,
-  0x02,
-  0x00,
-  0x00,
-  0x00,
-  0x40,
-  0x01,
-  0x00,
-};
-
-/**
-  * @}
-  */
-
-/** @defgroup USBD_TEMPLATE_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  USBD_TEMPLATE_Init
-  *         Initialize the TEMPLATE interface
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_Init(USBD_HandleTypeDef *pdev,
-                                   uint8_t cfgidx)
-{
-  uint8_t ret = 0;
-
-
-  return ret;
-}
-
-/**
-  * @brief  USBD_TEMPLATE_Init
-  *         DeInitialize the TEMPLATE layer
-  * @param  pdev: device instance
-  * @param  cfgidx: Configuration index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_DeInit(USBD_HandleTypeDef *pdev,
-                                     uint8_t cfgidx)
-{
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_TEMPLATE_Setup
-  *         Handle the TEMPLATE specific requests
-  * @param  pdev: instance
-  * @param  req: usb requests
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_Setup(USBD_HandleTypeDef *pdev,
-                                    USBD_SetupReqTypedef *req)
-{
-  USBD_StatusTypeDef ret = USBD_OK;
-
-  switch (req->bmRequest & USB_REQ_TYPE_MASK)
-  {
-    case USB_REQ_TYPE_CLASS :
-      switch (req->bRequest)
-      {
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    case USB_REQ_TYPE_STANDARD:
-      switch (req->bRequest)
-      {
-        default:
-          USBD_CtlError(pdev, req);
-          ret = USBD_FAIL;
-          break;
-      }
-      break;
-
-    default:
-      USBD_CtlError(pdev, req);
-      ret = USBD_FAIL;
-      break;
-  }
-
-  return ret;
-}
-
-
-/**
-  * @brief  USBD_TEMPLATE_GetCfgDesc
-  *         return configuration descriptor
-  * @param  length : pointer data length
-  * @retval pointer to descriptor buffer
-  */
-static uint8_t  *USBD_TEMPLATE_GetCfgDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_TEMPLATE_CfgDesc);
-  return USBD_TEMPLATE_CfgDesc;
-}
-
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t  *USBD_TEMPLATE_DeviceQualifierDescriptor(uint16_t *length)
-{
-  *length = sizeof(USBD_TEMPLATE_DeviceQualifierDesc);
-  return USBD_TEMPLATE_DeviceQualifierDesc;
-}
-
-
-/**
-  * @brief  USBD_TEMPLATE_DataIn
-  *         handle data IN Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_DataIn(USBD_HandleTypeDef *pdev,
-                                     uint8_t epnum)
-{
-
-  return USBD_OK;
-}
-
-/**
-  * @brief  USBD_TEMPLATE_EP0_RxReady
-  *         handle EP0 Rx Ready event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_EP0_RxReady(USBD_HandleTypeDef *pdev)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_TEMPLATE_EP0_TxReady
-  *         handle EP0 TRx Ready event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_EP0_TxReady(USBD_HandleTypeDef *pdev)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_TEMPLATE_SOF
-  *         handle SOF event
-  * @param  pdev: device instance
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_SOF(USBD_HandleTypeDef *pdev)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_TEMPLATE_IsoINIncomplete
-  *         handle data ISO IN Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_TEMPLATE_IsoOutIncomplete
-  *         handle data ISO OUT Incomplete event
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_IsoOutIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum)
-{
-
-  return USBD_OK;
-}
-/**
-  * @brief  USBD_TEMPLATE_DataOut
-  *         handle data OUT Stage
-  * @param  pdev: device instance
-  * @param  epnum: endpoint index
-  * @retval status
-  */
-static uint8_t  USBD_TEMPLATE_DataOut(USBD_HandleTypeDef *pdev,
-                                      uint8_t epnum)
-{
-
-  return USBD_OK;
-}
-
-/**
-* @brief  DeviceQualifierDescriptor
-*         return Device Qualifier descriptor
-* @param  length : pointer data length
-* @retval pointer to descriptor buffer
-*/
-uint8_t  *USBD_TEMPLATE_GetDeviceQualifierDesc(uint16_t *length)
-{
-  *length = sizeof(USBD_TEMPLATE_DeviceQualifierDesc);
-  return USBD_TEMPLATE_DeviceQualifierDesc;
-}
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Inc/usbd_conf.h

@@ -0,0 +1,232 @@
+/**
+  ******************************************************************************
+  * @file    usbd_conf_template.h
+  * @author  MCD Application Team
+  * @brief   Header file for the usbd_conf_template.c file
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_CONF_TEMPLATE_H
+#define __USBD_CONF_TEMPLATE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32f0xx_hal.h"  /* replace 'stm32xxx' with your HAL driver header filename, ex: stm32f4xx.h */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_CONF
+  * @brief USB device low level driver configuration file
+  * @{
+  */
+
+/** @defgroup USBD_CONF_Exported_Defines
+  * @{
+  */
+
+#define USBD_MAX_NUM_INTERFACES                     1U
+#define USBD_MAX_NUM_CONFIGURATION                  1U
+#define USBD_MAX_STR_DESC_SIZ                       0x100U
+#define USBD_SELF_POWERED                           1U
+#define USBD_DEBUG_LEVEL                            0U
+/* #define USBD_USER_REGISTER_CALLBACK                 1U */
+
+/* ECM, RNDIS, DFU Class Config */
+#define USBD_SUPPORT_USER_STRING_DESC               0U
+
+/* BillBoard Class Config */
+#define USBD_CLASS_USER_STRING_DESC                 0U
+#define USBD_CLASS_BOS_ENABLED                      0U
+#define USB_BB_MAX_NUM_ALT_MODE                     0x2U
+
+/* MSC Class Config */
+#define MSC_MEDIA_PACKET                            8192U
+
+/* CDC Class Config */
+#define USBD_CDC_INTERVAL                           2000U
+
+/* DFU Class Config */
+/* #define USBD_DFU_VENDOR_CMD_ENABLED                 1U */
+/* #define USBD_DFU_VENDOR_EXIT_ENABLED                1U */
+#define USBD_DFU_MAX_ITF_NUM                        1U
+#define USBD_DFU_XFERS_IZE                          1024U
+
+/* 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
+
+/* #define USBD_CUSTOMHID_REPORT_DESC_SIZE_ENABLED */
+/* #define USBD_CUSTOMHID_CTRL_REQ_GET_REPORT_ENABLED */
+/* #define USBD_CUSTOMHID_OUT_PREPARE_RECEIVE_DISABLED */
+/* #define USBD_CUSTOMHID_EP0_OUT_PREPARE_RECEIVE_DISABLED */
+/* #define USBD_CUSTOMHID_CTRL_REQ_COMPLETE_CALLBACK_ENABLED */
+/* #define USBD_CUSTOMHID_REPORT_BUFFER_EVENT_ENABLED */
+
+/* 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 /* USBD_UVC_FORMAT_UNCOMPRESSED */
+
+/* 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 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 { \
+                                 printf(__VA_ARGS__); \
+                                 printf("\n"); \
+                               } while (0)
+#else
+#define USBD_UsrLog(...) do {} while (0)
+#endif /* (USBD_DEBUG_LEVEL > 0U) */
+
+#if (USBD_DEBUG_LEVEL > 1U)
+
+#define  USBD_ErrLog(...) do { \
+                               printf("ERROR: ") ; \
+                               printf(__VA_ARGS__); \
+                               printf("\n"); \
+                             } while (0)
+#else
+#define USBD_ErrLog(...) do {} while (0)
+#endif /* (USBD_DEBUG_LEVEL > 1U) */
+
+#if (USBD_DEBUG_LEVEL > 2U)
+#define  USBD_DbgLog(...)   do { \
+                                 printf("DEBUG : ") ; \
+                                 printf(__VA_ARGS__); \
+                                 printf("\n"); \
+                               } while (0)
+#else
+#define USBD_DbgLog(...) do {} while (0)
+#endif /* (USBD_DEBUG_LEVEL > 2U) */
+
+/**
+  * @}
+  */
+
+
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CONF_Exported_Types
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CONF_Exported_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CONF_Exported_Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CONF_Exported_FunctionsPrototype
+  * @{
+  */
+/* Exported functions -------------------------------------------------------*/
+void *USBD_static_malloc(uint32_t size);
+void USBD_static_free(void *p);
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_CONF_TEMPLATE_H */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */

Core/Inc/usbd_conf_template.h

@@ -1,162 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_conf_template.h
-  * @author  MCD Application Team
-  * @brief   Header file for the usbd_conf_template.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 __USBD_CONF_TEMPLATE_H
-#define __USBD_CONF_TEMPLATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32fxxx.h"  /* replace 'stm32xxx' with your HAL driver header filename, ex: stm32f4xx.h */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-/** @defgroup USBD_CONF
-  * @brief USB device low level driver configuration file
-  * @{
-  */
-
-/** @defgroup USBD_CONF_Exported_Defines
-  * @{
-  */
-
-#define USBD_MAX_NUM_INTERFACES               1U
-#define USBD_MAX_NUM_CONFIGURATION            1U
-#define USBD_MAX_STR_DESC_SIZ                 0x100U
-#define USBD_SUPPORT_USER_STRING_DESC         0U
-#define USBD_SELF_POWERED                     1U
-#define USBD_DEBUG_LEVEL                      2U
-
-/* MSC Class Config */
-#define MSC_MEDIA_PACKET                       8192U
-
-/* CDC Class Config */
-#define USBD_CDC_INTERVAL                      2000U
-
-/* DFU Class Config */
-#define USBD_DFU_MAX_ITF_NUM                   1U
-#define USBD_DFU_XFERS_IZE                     1024U
-
-/* AUDIO Class Config */
-#define USBD_AUDIO_FREQ                       22100U
-
-/** @defgroup USBD_Exported_Macros
-  * @{
-  */
-
-/* Memory management macros */
-#define USBD_malloc               malloc
-#define USBD_free                 free
-#define USBD_memset               memset
-#define USBD_memcpy               memcpy
-
-/* DEBUG macros */
-#if (USBD_DEBUG_LEVEL > 0U)
-#define  USBD_UsrLog(...)   do { \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
-#else
-#define USBD_UsrLog(...) do {} while (0)
-#endif
-
-#if (USBD_DEBUG_LEVEL > 1U)
-
-#define  USBD_ErrLog(...) do { \
-                            printf("ERROR: ") ; \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
-#else
-#define USBD_ErrLog(...) do {} while (0)
-#endif
-
-#if (USBD_DEBUG_LEVEL > 2U)
-#define  USBD_DbgLog(...)   do { \
-                            printf("DEBUG : ") ; \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
-#else
-#define USBD_DbgLog(...) do {} while (0)
-#endif
-
-/**
-  * @}
-  */
-
-
-
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CONF_Exported_Types
-  * @{
-  */
-/**
-  * @}
-  */
-
-
-/** @defgroup USBD_CONF_Exported_Macros
-  * @{
-  */
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CONF_Exported_Variables
-  * @{
-  */
-/**
-  * @}
-  */
-
-/** @defgroup USBD_CONF_Exported_FunctionsPrototype
-  * @{
-  */
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBD_CONF_TEMPLATE_H */
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Inc/usbd_core.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -87,56 +86,74 @@ USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_Start(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_Stop(USBD_HandleTypeDef *pdev);
 USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass);
+#if (USBD_USER_REGISTER_CALLBACK == 1U)
+USBD_StatusTypeDef USBD_RegisterDevStateCallback(USBD_HandleTypeDef *pdev, USBD_DevStateCallbackTypeDef pUserCallback);
+#endif /* USBD_USER_REGISTER_CALLBACK */
 
-USBD_StatusTypeDef USBD_RunTestMode(USBD_HandleTypeDef  *pdev);
+#ifdef USE_USBD_COMPOSITE
-USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx);
+USBD_StatusTypeDef  USBD_RegisterClassComposite(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass,
-USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx);
+                                                USBD_CompositeClassTypeDef classtype, uint8_t *EpAddr);
+
+USBD_StatusTypeDef  USBD_UnRegisterClassComposite(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CoreGetEPAdd(USBD_HandleTypeDef *pdev, uint8_t ep_dir, uint8_t ep_type, uint8_t ClassId);
+#endif /* USE_USBD_COMPOSITE */
+
+uint8_t USBD_CoreFindIF(USBD_HandleTypeDef *pdev, uint8_t index);
+uint8_t USBD_CoreFindEP(USBD_HandleTypeDef *pdev, uint8_t index);
+
+USBD_StatusTypeDef USBD_RunTestMode(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
 
 USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);
 USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev, uint8_t epnum, uint8_t *pdata);
 USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum, uint8_t *pdata);
 
-USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed);
+USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef *pdev, USBD_SpeedTypeDef speed);
-USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef *pdev);
 
 USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev);
-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
+USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
+USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
 
-USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef *pdev);
 
 /* USBD Low Level Driver */
-USBD_StatusTypeDef  USBD_LL_Init(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_DeInit(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_Start(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_Stop(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev);
-USBD_StatusTypeDef  USBD_LL_OpenEP(USBD_HandleTypeDef *pdev,
-                                   uint8_t  ep_addr,
-                                   uint8_t  ep_type,
-                                   uint16_t ep_mps);
 
-USBD_StatusTypeDef  USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-USBD_StatusTypeDef  USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+                                  uint8_t ep_type, uint16_t ep_mps);
-USBD_StatusTypeDef  USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-USBD_StatusTypeDef  USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-uint8_t             USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-USBD_StatusTypeDef  USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr);
-USBD_StatusTypeDef  USBD_LL_Transmit(USBD_HandleTypeDef *pdev,
-                                     uint8_t  ep_addr,
-                                     uint8_t  *pbuf,
-                                     uint16_t  size);
 
-USBD_StatusTypeDef  USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint8_t  ep_addr,
+USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint8_t  *pbuf,
+USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-                                           uint16_t  size);
+USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr);
 
+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);
+
+#ifdef USBD_HS_TESTMODE_ENABLE
+USBD_StatusTypeDef USBD_LL_SetTestMode(USBD_HandleTypeDef *pdev, uint8_t testmode);
+#endif /* USBD_HS_TESTMODE_ENABLE */
+
+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);
 
+void *USBD_GetEpDesc(uint8_t *pConfDesc, uint8_t EpAddr);
+USBD_DescHeaderTypeDef *USBD_GetNextDesc(uint8_t *pbuf, uint16_t *ptr);
+
 /**
   * @}
   */
@@ -152,10 +169,7 @@ void  USBD_LL_Delay(uint32_t Delay);
   */
 
 /**
-* @}
+  * @}
-*/
+  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
 
 

Core/Inc/usbd_ctlreq.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -73,16 +72,14 @@ extern "C" {
   * @{
   */
 
-USBD_StatusTypeDef  USBD_StdDevReq(USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdDevReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-USBD_StatusTypeDef  USBD_StdItfReq(USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdItfReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
-
-void USBD_CtlError(USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef *req);
 
+void USBD_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);
+
 /**
   * @}
   */
@@ -98,8 +95,7 @@ void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len);
   */
 
 /**
-* @}
+  * @}
-*/
+  */
 
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Inc/usbd_def.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -53,6 +52,24 @@ extern "C" {
 #define USBD_MAX_NUM_CONFIGURATION                      1U
 #endif /* USBD_MAX_NUM_CONFIGURATION */
 
+#ifdef USE_USBD_COMPOSITE
+#ifndef USBD_MAX_SUPPORTED_CLASS
+#define USBD_MAX_SUPPORTED_CLASS                       4U
+#endif /* USBD_MAX_SUPPORTED_CLASS */
+#else
+#ifndef USBD_MAX_SUPPORTED_CLASS
+#define USBD_MAX_SUPPORTED_CLASS                       1U
+#endif /* USBD_MAX_SUPPORTED_CLASS */
+#endif /* USE_USBD_COMPOSITE */
+
+#ifndef USBD_MAX_CLASS_ENDPOINTS
+#define USBD_MAX_CLASS_ENDPOINTS                       5U
+#endif /* USBD_MAX_CLASS_ENDPOINTS */
+
+#ifndef USBD_MAX_CLASS_INTERFACES
+#define USBD_MAX_CLASS_INTERFACES                      5U
+#endif /* USBD_MAX_CLASS_INTERFACES */
+
 #ifndef USBD_LPM_ENABLED
 #define USBD_LPM_ENABLED                                0U
 #endif /* USBD_LPM_ENABLED */
@@ -61,10 +78,18 @@ extern "C" {
 #define USBD_SELF_POWERED                               1U
 #endif /*USBD_SELF_POWERED */
 
+#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
 #define  USB_LEN_CFG_DESC                               0x09U
@@ -110,6 +135,7 @@ extern "C" {
 #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 +147,11 @@ extern "C" {
 
 #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 +177,14 @@ extern "C" {
 #define USBD_EP_TYPE_BULK                               0x02U
 #define USBD_EP_TYPE_INTR                               0x03U
 
-
+#ifdef USE_USBD_COMPOSITE
+#define USBD_EP_IN                                      0x80U
+#define USBD_EP_OUT                                     0x00U
+#define USBD_FUNC_DESCRIPTOR_TYPE                       0x24U
+#define USBD_DESC_SUBTYPE_ACM                           0x0FU
+#define USBD_DESC_ECM_BCD_LOW                           0x00U
+#define USBD_DESC_ECM_BCD_HIGH                          0x10U
+#endif /* USE_USBD_COMPOSITE */
 /**
   * @}
   */
@@ -165,6 +203,43 @@ 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;
+} __PACKED 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;
+} __PACKED USBD_EpDescTypeDef;
+
+typedef  struct
+{
+  uint8_t  bLength;
+  uint8_t  bDescriptorType;
+  uint8_t  bDescriptorSubType;
+} USBD_DescHeaderTypeDef;
+
 struct _USBD_HandleTypeDef;
 
 typedef struct _Device_cb
@@ -188,7 +263,7 @@ typedef struct _Device_cb
   uint8_t  *(*GetDeviceQualifierDescriptor)(uint16_t *length);
 #if (USBD_SUPPORT_USER_STRING_DESC == 1U)
   uint8_t  *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev, uint8_t index,  uint16_t *length);
-#endif
+#endif /* USBD_SUPPORT_USER_STRING_DESC  */
 
 } USBD_ClassTypeDef;
 
@@ -203,36 +278,85 @@ typedef enum
 /* Following USB Device status */
 typedef enum
 {
-  USBD_OK   = 0U,
+  USBD_OK = 0U,
   USBD_BUSY,
+  USBD_EMEM,
   USBD_FAIL,
 } USBD_StatusTypeDef;
 
 /* USB Device descriptors structure */
 typedef struct
 {
-  uint8_t  *(*GetDeviceDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetDeviceDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetLangIDStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetLangIDStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetManufacturerStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetManufacturerStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetProductStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetProductStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetSerialStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetSerialStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetConfigurationStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetConfigurationStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-  uint8_t  *(*GetInterfaceStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetInterfaceStrDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
-#if (USBD_LPM_ENABLED == 1U)
+#if (USBD_CLASS_USER_STRING_DESC == 1)
-  uint8_t  *(*GetBOSDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+  uint8_t *(*GetUserStrDescriptor)(USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length);
-#endif
+#endif /* USBD_CLASS_USER_STRING_DESC */
+#if ((USBD_LPM_ENABLED == 1U) || (USBD_CLASS_BOS_ENABLED == 1))
+  uint8_t *(*GetBOSDescriptor)(USBD_SpeedTypeDef speed, uint16_t *length);
+#endif /* (USBD_LPM_ENABLED == 1U) || (USBD_CLASS_BOS_ENABLED == 1) */
 } USBD_DescriptorsTypeDef;
 
 /* USB Device handle structure */
 typedef struct
 {
-  uint32_t                status;
+  uint32_t total_length;
-  uint32_t                is_used;
+  uint32_t rem_length;
-  uint32_t                total_length;
+  uint32_t bInterval;
-  uint32_t                rem_length;
+  uint16_t maxpacket;
-  uint32_t                maxpacket;
+  uint8_t status;
+  uint8_t is_used;
+  uint8_t *pbuffer;
 } USBD_EndpointTypeDef;
 
+#ifdef USE_USBD_COMPOSITE
+typedef enum
+{
+  CLASS_TYPE_NONE    = 0,
+  CLASS_TYPE_HID     = 1,
+  CLASS_TYPE_CDC     = 2,
+  CLASS_TYPE_MSC     = 3,
+  CLASS_TYPE_DFU     = 4,
+  CLASS_TYPE_CHID    = 5,
+  CLASS_TYPE_AUDIO   = 6,
+  CLASS_TYPE_ECM     = 7,
+  CLASS_TYPE_RNDIS   = 8,
+  CLASS_TYPE_MTP     = 9,
+  CLASS_TYPE_VIDEO   = 10,
+  CLASS_TYPE_PRINTER = 11,
+  CLASS_TYPE_CCID    = 12,
+} USBD_CompositeClassTypeDef;
+
+
+/* USB Device handle structure */
+typedef struct
+{
+  uint8_t                     add;
+  uint8_t                     type;
+  uint8_t                     size;
+  uint8_t                     is_used;
+} USBD_EPTypeDef;
+
+/* USB Device handle structure */
+typedef struct
+{
+  USBD_CompositeClassTypeDef   ClassType;
+  uint32_t                     ClassId;
+  uint32_t                     Active;
+  uint32_t                     NumEps;
+  USBD_EPTypeDef               Eps[USBD_MAX_CLASS_ENDPOINTS];
+  uint8_t                      *EpAdd;
+  uint32_t                     NumIf;
+  uint8_t                      Ifs[USBD_MAX_CLASS_INTERFACES];
+  uint32_t                     CurrPcktSze;
+} USBD_CompositeElementTypeDef;
+#endif /* USE_USBD_COMPOSITE */
+
 /* USB Device handle structure */
 typedef struct _USBD_HandleTypeDef
 {
@@ -243,23 +367,52 @@ typedef struct _USBD_HandleTypeDef
   USBD_SpeedTypeDef       dev_speed;
   USBD_EndpointTypeDef    ep_in[16];
   USBD_EndpointTypeDef    ep_out[16];
-  uint32_t                ep0_state;
+  __IO uint32_t           ep0_state;
   uint32_t                ep0_data_len;
-  uint8_t                 dev_state;
+  __IO uint8_t            dev_state;
-  uint8_t                 dev_old_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;
-  USBD_ClassTypeDef       *pClass;
+  USBD_ClassTypeDef       *pClass[USBD_MAX_SUPPORTED_CLASS];
   void                    *pClassData;
-  void                    *pUserData;
+  void                    *pClassDataCmsit[USBD_MAX_SUPPORTED_CLASS];
+  void                    *pUserData[USBD_MAX_SUPPORTED_CLASS];
   void                    *pData;
+  void                    *pBosDesc;
+  void                    *pConfDesc;
+  uint32_t                classId;
+  uint32_t                NumClasses;
+#ifdef USE_USBD_COMPOSITE
+  USBD_CompositeElementTypeDef tclasslist[USBD_MAX_SUPPORTED_CLASS];
+#endif /* USE_USBD_COMPOSITE */
+#if (USBD_USER_REGISTER_CALLBACK == 1U)
+  void (* DevStateCallback)(uint8_t dev_state, uint8_t cfgidx);                    /*!< User Notification callback      */
+#endif /* USBD_USER_REGISTER_CALLBACK */
 } USBD_HandleTypeDef;
 
+#if (USBD_USER_REGISTER_CALLBACK == 1U)
+typedef void (*USBD_DevStateCallbackTypeDef)(uint8_t dev_state, uint8_t cfgidx);   /*!< pointer to User callback function  */
+#endif /* USBD_USER_REGISTER_CALLBACK */
+
+/* USB Device endpoint direction */
+typedef enum
+{
+  OUT   = 0x00,
+  IN    = 0x80,
+} USBD_EPDirectionTypeDef;
+
+typedef enum
+{
+  NETWORK_CONNECTION = 0x00,
+  RESPONSE_AVAILABLE = 0x01,
+  CONNECTION_SPEED_CHANGE = 0x2A
+} USBD_CDC_NotifCodeTypeDef;
 /**
   * @}
   */
@@ -269,14 +422,37 @@ typedef struct _USBD_HandleTypeDef
 /** @defgroup USBD_DEF_Exported_Macros
   * @{
   */
-#define  SWAPBYTE(addr)        (((uint16_t)(*((uint8_t *)(addr)))) + \
+__STATIC_INLINE uint16_t SWAPBYTE(uint8_t *addr)
-                               (((uint16_t)(*(((uint8_t *)(addr)) + 1U))) << 8U))
+{
+  uint16_t _SwapVal;
+  uint16_t _Byte1;
+  uint16_t _Byte2;
+  uint8_t *_pbuff = addr;
 
+  _Byte1 = *(uint8_t *)_pbuff;
+  _pbuff++;
+  _Byte2 = *(uint8_t *)_pbuff;
+
+  _SwapVal = (_Byte2 << 8) | _Byte1;
+
+  return _SwapVal;
+}
+
+#ifndef LOBYTE
 #define LOBYTE(x)  ((uint8_t)((x) & 0x00FFU))
-#define HIBYTE(x)  ((uint8_t)(((x) & 0xFF00U) >> 8U))
+#endif /* LOBYTE */
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
+#ifndef HIBYTE
+#define HIBYTE(x)  ((uint8_t)(((x) & 0xFF00U) >> 8U))
+#endif /* HIBYTE */
+
+#ifndef MIN
+#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+#endif /* MIN */
+
+#ifndef MAX
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+#endif /* MAX */
 
 #if  defined ( __GNUC__ )
 #ifndef __weak
@@ -343,6 +519,6 @@ typedef struct _USBD_HandleTypeDef
   */
 
 /**
-* @}
+  * @}
-*/
+  */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+

Core/Inc/usbd_desc.h

@@ -0,0 +1,65 @@
+/**
+  ******************************************************************************
+  * @file    usbd_desc_template.h
+  * @author  MCD Application Team
+  * @brief   Header for usbd_desc_template.c module
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_DESC_TEMPLATE_H
+#define __USBD_DESC_TEMPLATE_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/*
+ * User to provide a unique ID to define the USB device serial number
+ * The use of UID_BASE register can be considered as an example
+ */
+#define         DEVICE_ID1          (UID_BASE)
+#define         DEVICE_ID2          (UID_BASE + 0x4U)
+#define         DEVICE_ID3          (UID_BASE + 0x8U)
+
+/*
+ * 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 /* USBD_CLASS_USER_STRING_DESC  */
+
+#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 /* USBD_LPM_ENABLED  */
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+extern USBD_DescriptorsTypeDef Class_Desc; /* Replace 'XXX_Desc' with your active USB device class, ex: HID_Desc */
+
+#endif /* __USBD_DESC_TEMPLATE_H*/
+

Core/Inc/usbd_desc_template.h

@@ -1,41 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usbd_desc_template.h
-  * @author  MCD Application Team
-  * @brief   Header for usbd_desc_template.c module
-  ******************************************************************************
-  * @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 __USBD_DESC_TEMPLATE_H
-#define __USBD_DESC_TEMPLATE_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-#define         DEVICE_ID1          (0x1FFF7A10)
-#define         DEVICE_ID2          (0x1FFF7A14)
-#define         DEVICE_ID3          (0x1FFF7A18)
-
-#define  USB_SIZ_STRING_SERIAL       0x1A
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-extern USBD_DescriptorsTypeDef XXX_Desc; /* Replace 'XXX_Desc' with your active USB device class, ex: HID_Desc */
-
-#endif /* __USBD_DESC_TEMPLATE_H*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Inc/usbd_ioreq.h

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -77,27 +76,22 @@ extern "C" {
   * @{
   */
 
-USBD_StatusTypeDef  USBD_CtlSendData(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
-                                     uint8_t *pbuf,
+                                    uint8_t *pbuf, uint32_t len);
-                                     uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlContinueSendData(USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlContinueSendData(USBD_HandleTypeDef *pdev,
-                                             uint8_t *pbuf,
+                                            uint8_t *pbuf, uint32_t len);
-                                             uint16_t len);
 
-USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
-                                     uint8_t *pbuf,
+                                     uint8_t *pbuf, uint32_t len);
-                                     uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlContinueRx(USBD_HandleTypeDef  *pdev,
+USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
-                                       uint8_t *pbuf,
+                                      uint8_t *pbuf, uint32_t len);
-                                       uint16_t len);
 
-USBD_StatusTypeDef  USBD_CtlSendStatus(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_CtlSendStatus(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_CtlReceiveStatus(USBD_HandleTypeDef *pdev);
 
-USBD_StatusTypeDef  USBD_CtlReceiveStatus(USBD_HandleTypeDef  *pdev);
+uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
-
-uint32_t  USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
 
 /**
   * @}
@@ -114,6 +108,6 @@ uint32_t  USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
   */
 
 /**
-* @}
+  * @}
-*/
+  */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+

Core/Src/usbd_conf.c

@@ -0,0 +1,230 @@
+/**
+  ******************************************************************************
+  * @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.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "usbd_core.h"
+#include "usbd_cdc.h" /* Include class header file */
+//#include "usbd_hid.h" /* Include class header file */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+extern PCD_HandleTypeDef hpcd_USB_FS;
+/* Private function prototypes -----------------------------------------------*/
+static USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status);
+/* Private functions ---------------------------------------------------------*/
+void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_LL_SetupStage((USBD_HandleTypeDef*)hpcd->pData, (uint8_t *)hpcd->Setup);
+}
+
+void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
+{
+  USBD_LL_DataOutStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
+}
+
+void HAL_PCD_DataInStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
+{
+  USBD_LL_DataInStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->IN_ep[epnum].xfer_buff);
+}
+
+void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_LL_SOF((USBD_HandleTypeDef*)hpcd->pData);
+}
+
+void HAL_PCD_ResetCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_SpeedTypeDef speed = USBD_SPEED_FULL;
+  if ( hpcd->Init.speed != PCD_SPEED_FULL)
+  {
+    Error_Handler();
+  }
+    /* Set Speed. */
+  USBD_LL_SetSpeed((USBD_HandleTypeDef*)hpcd->pData, speed);
+  /* Reset Device. */
+  USBD_LL_Reset((USBD_HandleTypeDef*)hpcd->pData);
+}
+
+void HAL_PCD_ConnectCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_LL_DevConnected((USBD_HandleTypeDef*)hpcd->pData);
+}
+
+void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd)
+{
+  USBD_LL_DevDisconnected((USBD_HandleTypeDef*)hpcd->pData);
+}
+/* Private functions ---------------------------------------------------------*/
+
+
+USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
+{
+      pdev->pData  = &hpcd_USB_FS;
+      HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x00 , PCD_SNG_BUF, 0x40);
+      HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , 0x80 , PCD_SNG_BUF, 0x80);
+      HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_IN_EP , PCD_SNG_BUF, 0xC0);
+      HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_OUT_EP , PCD_SNG_BUF, 0x100);
+      HAL_PCDEx_PMAConfig((PCD_HandleTypeDef*)pdev->pData , CDC_CMD_EP , PCD_SNG_BUF, 0x140);
+      return USBD_OK;
+}
+
+USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_DeInit(pdev->pData);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_Start(pdev->pData);
+      return  USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_Stop(pdev->pData);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+             uint8_t ep_type, uint16_t ep_mps)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_Open(pdev->pData, ep_addr, ep_mps, ep_type);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_Close(pdev->pData, ep_addr);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_Flush(pdev->pData, ep_addr);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_SetStall(pdev->pData, ep_addr);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev,
+             uint8_t ep_addr)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_ClrStall(pdev->pData, ep_addr);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+{
+      PCD_HandleTypeDef *hpcd = (PCD_HandleTypeDef*) pdev->pData;
+      if((ep_addr & 0x80) == 0x80)
+      {
+             return hpcd->IN_ep[ep_addr & 0x7F].is_stall;
+      }
+      else
+      {
+             return hpcd->OUT_ep[ep_addr & 0x7F].is_stall;
+      }
+}
+
+USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev,
+             uint8_t dev_addr)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_SetAddress(pdev->pData, dev_addr);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
+             uint8_t *pbuf, uint32_t size)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_Transmit(pdev->pData, ep_addr, pbuf, size);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
+             uint8_t ep_addr, uint8_t *pbuf,
+             uint32_t size)
+{
+      HAL_StatusTypeDef hal_status;
+      hal_status = HAL_PCD_EP_Receive(pdev->pData, ep_addr, pbuf, size);
+      return USBD_Get_USB_Status(hal_status);
+}
+
+uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
+{
+      return HAL_PCD_EP_GetRxCount((PCD_HandleTypeDef*) pdev->pData, ep_addr);
+}
+
+void *USBD_static_malloc(uint32_t size)
+{
+      UNUSED(size);
+      static uint32_t mem[(sizeof(USBD_CDC_HandleTypeDef) / 4) + 1]; /* On 32-bit boundary */
+      return mem;
+}
+
+void USBD_static_free(void *p)
+{
+      UNUSED(p);
+}
+
+void USBD_LL_Delay(uint32_t Delay)
+{
+      HAL_Delay(Delay);
+}
+
+USBD_StatusTypeDef USBD_Get_USB_Status(HAL_StatusTypeDef hal_status)
+{
+      USBD_StatusTypeDef usb_status = USBD_OK;
+      switch (hal_status)
+      {
+      case HAL_OK :
+             usb_status = USBD_OK;
+             break;
+      case HAL_ERROR :
+             usb_status = USBD_FAIL;
+             break;
+      case HAL_BUSY :
+             usb_status = USBD_BUSY;
+             break;
+      case HAL_TIMEOUT :
+             usb_status = USBD_FAIL;
+             break;
+      default :
+             usb_status = USBD_FAIL;
+             break;
+      }
+      return usb_status;
+}

Core/Src/usbd_conf_template.c

@@ -1,201 +0,0 @@
-/**
-  ******************************************************************************
-  * @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.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_core.h"
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Initializes the Low Level portion of the Device driver.
-  * @param  pdev: Device handle
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  De-Initializes the Low Level portion of the Device driver.
-  * @param  pdev: Device handle
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Starts the Low Level portion of the Device driver.
-  * @param  pdev: Device handle
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Stops the Low Level portion of the Device driver.
-  * @param  pdev: Device handle
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_Stop(USBD_HandleTypeDef *pdev)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Opens an endpoint of the Low Level Driver.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @param  ep_type: Endpoint Type
-  * @param  ep_mps: Endpoint Max Packet Size
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_OpenEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-                                  uint8_t ep_type, uint16_t ep_mps)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Closes an endpoint of the Low Level Driver.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_CloseEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Flushes an endpoint of the Low Level Driver.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_FlushEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Sets a Stall condition on an endpoint of the Low Level Driver.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_StallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Clears a Stall condition on an endpoint of the Low Level Driver.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_ClearStallEP(USBD_HandleTypeDef *pdev,
-                                        uint8_t ep_addr)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Returns Stall condition.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval Stall (1: Yes, 0: No)
-  */
-uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
-{
-  return 0;
-}
-
-/**
-  * @brief  Assigns a USB address to the device.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev,
-                                         uint8_t dev_addr)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Transmits data over an endpoint.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @param  pbuf: Pointer to data to be sent
-  * @param  size: Data size
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_Transmit(USBD_HandleTypeDef *pdev, uint8_t ep_addr,
-                                    uint8_t *pbuf, uint16_t size)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Prepares an endpoint for reception.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @param  pbuf: Pointer to data to be received
-  * @param  size: Data size
-  * @retval USBD Status
-  */
-USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
-                                          uint8_t ep_addr, uint8_t *pbuf,
-                                          uint16_t size)
-{
-  return USBD_OK;
-}
-
-/**
-  * @brief  Returns the last transferred packet size.
-  * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
-  * @retval Recived Data Size
-  */
-uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
-{
-  return 0U;
-}
-
-/**
-  * @brief  Delays routine for the USB Device Library.
-  * @param  Delay: Delay in ms
-  * @retval None
-  */
-void USBD_LL_Delay(uint32_t Delay)
-{
-}
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-

Core/Src/usbd_ctlreq.c

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -21,6 +20,9 @@
 #include "usbd_ctlreq.h"
 #include "usbd_ioreq.h"
 
+#ifdef USE_USBD_COMPOSITE
+#include "usbd_composite_builder.h"
+#endif /* USE_USBD_COMPOSITE */
 
 /** @addtogroup STM32_USBD_STATE_DEVICE_LIBRARY
   * @{
@@ -44,7 +46,9 @@
 /** @defgroup USBD_REQ_Private_Defines
   * @{
   */
-
+#ifndef USBD_MAX_STR_DESC_SIZ
+#define USBD_MAX_STR_DESC_SIZ                          64U
+#endif /* USBD_MAX_STR_DESC_SIZ */
 /**
   * @}
   */
@@ -71,27 +75,13 @@
 /** @defgroup USBD_REQ_Private_FunctionPrototypes
   * @{
   */
-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                               USBD_SetupReqTypedef *req);
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static USBD_StatusTypeDef USBD_SetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev,
+static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                            USBD_SetupReqTypedef *req);
+static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-static void USBD_SetConfig(USBD_HandleTypeDef *pdev,
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_GetConfig(USBD_HandleTypeDef *pdev,
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_GetStatus(USBD_HandleTypeDef *pdev,
-                           USBD_SetupReqTypedef *req);
-
-static void USBD_SetFeature(USBD_HandleTypeDef *pdev,
-                            USBD_SetupReqTypedef *req);
-
-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev,
-                            USBD_SetupReqTypedef *req);
-
 static uint8_t USBD_GetLen(uint8_t *buf);
 
 /**
@@ -105,14 +95,13 @@ static uint8_t USBD_GetLen(uint8_t *buf);
 
 
 /**
-* @brief  USBD_StdDevReq
+  * @brief  USBD_StdDevReq
-*         Handle standard usb device requests
+  *         Handle standard usb device requests
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval status
-*/
+  */
-USBD_StatusTypeDef  USBD_StdDevReq(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_StdDevReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                                   USBD_SetupReqTypedef *req)
 {
   USBD_StatusTypeDef ret = USBD_OK;
 
@@ -120,7 +109,7 @@ USBD_StatusTypeDef  USBD_StdDevReq(USBD_HandleTypeDef *pdev,
   {
     case USB_REQ_TYPE_CLASS:
     case USB_REQ_TYPE_VENDOR:
-      pdev->pClass->Setup(pdev, req);
+      ret = (USBD_StatusTypeDef)pdev->pClass[pdev->classId]->Setup(pdev, req);
       break;
 
     case USB_REQ_TYPE_STANDARD:
@@ -135,7 +124,7 @@ USBD_StatusTypeDef  USBD_StdDevReq(USBD_HandleTypeDef *pdev,
           break;
 
         case USB_REQ_SET_CONFIGURATION:
-          USBD_SetConfig(pdev, req);
+          ret = USBD_SetConfig(pdev, req);
           break;
 
         case USB_REQ_GET_CONFIGURATION:
@@ -169,16 +158,16 @@ USBD_StatusTypeDef  USBD_StdDevReq(USBD_HandleTypeDef *pdev,
 }
 
 /**
-* @brief  USBD_StdItfReq
+  * @brief  USBD_StdItfReq
-*         Handle standard usb interface requests
+  *         Handle standard usb interface requests
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval status
-*/
+  */
-USBD_StatusTypeDef  USBD_StdItfReq(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_StdItfReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                                   USBD_SetupReqTypedef  *req)
 {
   USBD_StatusTypeDef ret = USBD_OK;
+  uint8_t idx;
 
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
@@ -193,11 +182,31 @@ USBD_StatusTypeDef  USBD_StdItfReq(USBD_HandleTypeDef *pdev,
 
           if (LOBYTE(req->wIndex) <= USBD_MAX_NUM_INTERFACES)
           {
-            ret = (USBD_StatusTypeDef)pdev->pClass->Setup(pdev, req);
+            /* Get the class index relative to this interface */
+            idx = USBD_CoreFindIF(pdev, LOBYTE(req->wIndex));
+            if (((uint8_t)idx != 0xFFU) && (idx < USBD_MAX_SUPPORTED_CLASS))
+            {
+              /* Call the class data out function to manage the request */
+              if (pdev->pClass[idx]->Setup != NULL)
+              {
+                pdev->classId = idx;
+                ret = (USBD_StatusTypeDef)(pdev->pClass[idx]->Setup(pdev, req));
+              }
+              else
+              {
+                /* should never reach this condition */
+                ret = USBD_FAIL;
+              }
+            }
+            else
+            {
+              /* No relative interface found */
+              ret = USBD_FAIL;
+            }
 
             if ((req->wLength == 0U) && (ret == USBD_OK))
             {
-              USBD_CtlSendStatus(pdev);
+              (void)USBD_CtlSendStatus(pdev);
             }
           }
           else
@@ -217,40 +226,43 @@ USBD_StatusTypeDef  USBD_StdItfReq(USBD_HandleTypeDef *pdev,
       break;
   }
 
-  return USBD_OK;
+  return ret;
 }
 
 /**
-* @brief  USBD_StdEPReq
+  * @brief  USBD_StdEPReq
-*         Handle standard usb endpoint requests
+  *         Handle standard usb endpoint requests
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval status
-*/
+  */
-USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
+USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                                  USBD_SetupReqTypedef  *req)
 {
   USBD_EndpointTypeDef *pep;
-  uint8_t   ep_addr;
+  uint8_t ep_addr;
+  uint8_t idx;
   USBD_StatusTypeDef ret = USBD_OK;
-  ep_addr  = LOBYTE(req->wIndex);
+
+  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);
+      /* Get the class index relative to this endpoint */
+      idx = USBD_CoreFindEP(pdev, ep_addr);
+      if (((uint8_t)idx != 0xFFU) && (idx < USBD_MAX_SUPPORTED_CLASS))
+      {
+        pdev->classId = idx;
+        /* Call the class data out function to manage the request */
+        if (pdev->pClass[idx]->Setup != NULL)
+        {
+          ret = (USBD_StatusTypeDef)pdev->pClass[idx]->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:
@@ -259,8 +271,8 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
             case USBD_STATE_ADDRESSED:
               if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
               {
-                USBD_LL_StallEP(pdev, ep_addr);
+                (void)USBD_LL_StallEP(pdev, ep_addr);
-                USBD_LL_StallEP(pdev, 0x80U);
+                (void)USBD_LL_StallEP(pdev, 0x80U);
               }
               else
               {
@@ -271,13 +283,12 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
             case USBD_STATE_CONFIGURED:
               if (req->wValue == USB_FEATURE_EP_HALT)
               {
-                if ((ep_addr != 0x00U) &&
+                if ((ep_addr != 0x00U) && (ep_addr != 0x80U) && (req->wLength == 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 +305,8 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
             case USBD_STATE_ADDRESSED:
               if ((ep_addr != 0x00U) && (ep_addr != 0x80U))
               {
-                USBD_LL_StallEP(pdev, ep_addr);
+                (void)USBD_LL_StallEP(pdev, ep_addr);
-                USBD_LL_StallEP(pdev, 0x80U);
+                (void)USBD_LL_StallEP(pdev, 0x80U);
               }
               else
               {
@@ -308,9 +319,21 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
               {
                 if ((ep_addr & 0x7FU) != 0x00U)
                 {
-                  USBD_LL_ClearStallEP(pdev, ep_addr);
+                  (void)USBD_LL_ClearStallEP(pdev, ep_addr);
+                }
+                (void)USBD_CtlSendStatus(pdev);
+
+                /* Get the class index relative to this interface */
+                idx = USBD_CoreFindEP(pdev, ep_addr);
+                if (((uint8_t)idx != 0xFFU) && (idx < USBD_MAX_SUPPORTED_CLASS))
+                {
+                  pdev->classId = idx;
+                  /* Call the class data out function to manage the request */
+                  if (pdev->pClass[idx]->Setup != NULL)
+                  {
+                    ret = (USBD_StatusTypeDef)(pdev->pClass[idx]->Setup(pdev, req));
+                  }
                 }
-                USBD_CtlSendStatus(pdev);
               }
               break;
 
@@ -334,7 +357,7 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
 
               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 +385,7 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
               {
                 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 +394,7 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
                 pep->status = 0x0000U;
               }
 
-              USBD_CtlSendData(pdev, (uint8_t *)(void *)&pep->status, 2U);
+              (void)USBD_CtlSendData(pdev, (uint8_t *)&pep->status, 2U);
               break;
 
             default:
@@ -396,14 +419,13 @@ USBD_StatusTypeDef  USBD_StdEPReq(USBD_HandleTypeDef *pdev,
 
 
 /**
-* @brief  USBD_GetDescriptor
+  * @brief  USBD_GetDescriptor
-*         Handle Get Descriptor requests
+  *         Handle Get Descriptor requests
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                               USBD_SetupReqTypedef *req)
 {
   uint16_t len = 0U;
   uint8_t *pbuf = NULL;
@@ -411,7 +433,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
 
   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)
       {
@@ -423,7 +445,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
         err++;
       }
       break;
-#endif
+#endif /* (USBD_LPM_ENABLED == 1U) || (USBD_CLASS_BOS_ENABLED == 1U) */
     case USB_DESC_TYPE_DEVICE:
       pbuf = pdev->pDesc->GetDeviceDescriptor(pdev->dev_speed, &len);
       break;
@@ -431,12 +453,30 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
     case USB_DESC_TYPE_CONFIGURATION:
       if (pdev->dev_speed == USBD_SPEED_HIGH)
       {
-        pbuf = pdev->pClass->GetHSConfigDescriptor(&len);
+#ifdef USE_USBD_COMPOSITE
+        if ((uint8_t)(pdev->NumClasses) > 0U)
+        {
+          pbuf = (uint8_t *)USBD_CMPSIT.GetHSConfigDescriptor(&len);
+        }
+        else
+#endif /* USE_USBD_COMPOSITE */
+        {
+          pbuf = (uint8_t *)pdev->pClass[0]->GetHSConfigDescriptor(&len);
+        }
         pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
       }
       else
       {
-        pbuf = pdev->pClass->GetFSConfigDescriptor(&len);
+#ifdef USE_USBD_COMPOSITE
+        if ((uint8_t)(pdev->NumClasses) > 0U)
+        {
+          pbuf = (uint8_t *)USBD_CMPSIT.GetFSConfigDescriptor(&len);
+        }
+        else
+#endif /* USE_USBD_COMPOSITE */
+        {
+          pbuf = (uint8_t *)pdev->pClass[0]->GetFSConfigDescriptor(&len);
+        }
         pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
       }
       break;
@@ -518,27 +558,60 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
 
         default:
 #if (USBD_SUPPORT_USER_STRING_DESC == 1U)
-          if (pdev->pClass->GetUsrStrDescriptor != NULL)
+          pbuf = NULL;
+
+          for (uint32_t idx = 0U; (idx < pdev->NumClasses); idx++)
           {
-            pbuf = pdev->pClass->GetUsrStrDescriptor(pdev, (req->wValue), &len);
+            if (pdev->pClass[idx]->GetUsrStrDescriptor != NULL)
+            {
+              pdev->classId = idx;
+              pbuf = pdev->pClass[idx]->GetUsrStrDescriptor(pdev, LOBYTE(req->wValue), &len);
+
+              if (pbuf == NULL) /* This means that no class recognized the string index */
+              {
+                continue;
+              }
+              else
+              {
+                break;
+              }
+            }
+          }
+#endif /* USBD_SUPPORT_USER_STRING_DESC  */
+
+#if (USBD_CLASS_USER_STRING_DESC == 1U)
+          if (pdev->pDesc->GetUserStrDescriptor != NULL)
+          {
+            pbuf = pdev->pDesc->GetUserStrDescriptor(pdev->dev_speed, LOBYTE(req->wValue), &len);
           }
           else
           {
             USBD_CtlError(pdev, req);
             err++;
           }
-          break;
+#endif /* USBD_SUPPORT_USER_STRING_DESC  */
-#else
+
+#if ((USBD_CLASS_USER_STRING_DESC == 0U) && (USBD_SUPPORT_USER_STRING_DESC == 0U))
           USBD_CtlError(pdev, req);
           err++;
-#endif
+#endif /* (USBD_CLASS_USER_STRING_DESC == 0U) && (USBD_SUPPORT_USER_STRING_DESC == 0U) */
+          break;
       }
       break;
 
     case USB_DESC_TYPE_DEVICE_QUALIFIER:
       if (pdev->dev_speed == USBD_SPEED_HIGH)
       {
-        pbuf = pdev->pClass->GetDeviceQualifierDescriptor(&len);
+#ifdef USE_USBD_COMPOSITE
+        if ((uint8_t)(pdev->NumClasses) > 0U)
+        {
+          pbuf = (uint8_t *)USBD_CMPSIT.GetDeviceQualifierDescriptor(&len);
+        }
+        else
+#endif /* USE_USBD_COMPOSITE */
+        {
+          pbuf = (uint8_t *)pdev->pClass[0]->GetDeviceQualifierDescriptor(&len);
+        }
       }
       else
       {
@@ -550,7 +623,16 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
     case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
       if (pdev->dev_speed == USBD_SPEED_HIGH)
       {
-        pbuf = pdev->pClass->GetOtherSpeedConfigDescriptor(&len);
+#ifdef USE_USBD_COMPOSITE
+        if ((uint8_t)(pdev->NumClasses) > 0U)
+        {
+          pbuf = (uint8_t *)USBD_CMPSIT.GetOtherSpeedConfigDescriptor(&len);
+        }
+        else
+#endif /* USE_USBD_COMPOSITE */
+        {
+          pbuf = (uint8_t *)pdev->pClass[0]->GetOtherSpeedConfigDescriptor(&len);
+        }
         pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;
       }
       else
@@ -570,30 +652,34 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev,
   {
     return;
   }
-  else
+
+  if (req->wLength != 0U)
   {
-    if ((len != 0U) && (req->wLength != 0U))
+    if (len != 0U)
     {
       len = MIN(len, req->wLength);
       (void)USBD_CtlSendData(pdev, pbuf, len);
     }
-
+    else
-    if (req->wLength == 0U)
     {
-      (void)USBD_CtlSendStatus(pdev);
+      USBD_CtlError(pdev, req);
     }
   }
+  else
+  {
+    (void)USBD_CtlSendStatus(pdev);
+  }
 }
 
+
 /**
-* @brief  USBD_SetAddress
+  * @brief  USBD_SetAddress
-*         Set device address
+  *         Set device address
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
-static void USBD_SetAddress(USBD_HandleTypeDef *pdev,
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
   uint8_t  dev_addr;
 
@@ -608,8 +694,8 @@ static void USBD_SetAddress(USBD_HandleTypeDef *pdev,
     else
     {
       pdev->dev_address = dev_addr;
-      USBD_LL_SetUSBAddress(pdev, dev_addr);
+      (void)USBD_LL_SetUSBAddress(pdev, dev_addr);
-      USBD_CtlSendStatus(pdev);
+      (void)USBD_CtlSendStatus(pdev);
 
       if (dev_addr != 0U)
       {
@@ -628,14 +714,15 @@ static void USBD_SetAddress(USBD_HandleTypeDef *pdev,
 }
 
 /**
-* @brief  USBD_SetConfig
+  * @brief  USBD_SetConfig
-*         Handle Set device configuration request
+  *         Handle Set device configuration request
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @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);
@@ -643,72 +730,94 @@ 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)
   {
-    switch (pdev->dev_state)
+    case USBD_STATE_ADDRESSED:
-    {
+      if (cfgidx != 0U)
-      case USBD_STATE_ADDRESSED:
+      {
-        if (cfgidx)
+        pdev->dev_config = cfgidx;
-        {
-          pdev->dev_config = cfgidx;
-          pdev->dev_state = USBD_STATE_CONFIGURED;
-          if (USBD_SetClassConfig(pdev, cfgidx) == USBD_FAIL)
-          {
-            USBD_CtlError(pdev, req);
-            return;
-          }
-          USBD_CtlSendStatus(pdev);
-        }
-        else
-        {
-          USBD_CtlSendStatus(pdev);
-        }
-        break;
 
-      case USBD_STATE_CONFIGURED:
+        ret = USBD_SetClassConfig(pdev, cfgidx);
-        if (cfgidx == 0U)
+
+        if (ret != USBD_OK)
         {
+          USBD_CtlError(pdev, req);
           pdev->dev_state = USBD_STATE_ADDRESSED;
-          pdev->dev_config = cfgidx;
-          USBD_ClrClassConfig(pdev, cfgidx);
-          USBD_CtlSendStatus(pdev);
-        }
-        else if (cfgidx != pdev->dev_config)
-        {
-          /* Clear old configuration */
-          USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
-
-          /* set new configuration */
-          pdev->dev_config = cfgidx;
-          if (USBD_SetClassConfig(pdev, cfgidx) == USBD_FAIL)
-          {
-            USBD_CtlError(pdev, req);
-            return;
-          }
-          USBD_CtlSendStatus(pdev);
         }
         else
         {
-          USBD_CtlSendStatus(pdev);
+          (void)USBD_CtlSendStatus(pdev);
-        }
+          pdev->dev_state = USBD_STATE_CONFIGURED;
-        break;
 
-      default:
+#if (USBD_USER_REGISTER_CALLBACK == 1U)
-        USBD_CtlError(pdev, req);
+          if (pdev->DevStateCallback != NULL)
-        USBD_ClrClassConfig(pdev, cfgidx);
+          {
-        break;
+            pdev->DevStateCallback(USBD_STATE_CONFIGURED, cfgidx);
-    }
+          }
+#endif /* USBD_USER_REGISTER_CALLBACK */
+        }
+      }
+      else
+      {
+        (void)USBD_CtlSendStatus(pdev);
+      }
+      break;
+
+    case USBD_STATE_CONFIGURED:
+      if (cfgidx == 0U)
+      {
+        pdev->dev_state = USBD_STATE_ADDRESSED;
+        pdev->dev_config = cfgidx;
+        (void)USBD_ClrClassConfig(pdev, cfgidx);
+        (void)USBD_CtlSendStatus(pdev);
+      }
+      else if (cfgidx != pdev->dev_config)
+      {
+        /* Clear old configuration */
+        (void)USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
+
+        /* set new configuration */
+        pdev->dev_config = cfgidx;
+
+        ret = USBD_SetClassConfig(pdev, cfgidx);
+
+        if (ret != USBD_OK)
+        {
+          USBD_CtlError(pdev, req);
+          (void)USBD_ClrClassConfig(pdev, (uint8_t)pdev->dev_config);
+          pdev->dev_state = USBD_STATE_ADDRESSED;
+        }
+        else
+        {
+          (void)USBD_CtlSendStatus(pdev);
+        }
+      }
+      else
+      {
+        (void)USBD_CtlSendStatus(pdev);
+      }
+      break;
+
+    default:
+      USBD_CtlError(pdev, req);
+      (void)USBD_ClrClassConfig(pdev, cfgidx);
+      ret = USBD_FAIL;
+      break;
   }
+
+  return ret;
 }
 
 /**
-* @brief  USBD_GetConfig
+  * @brief  USBD_GetConfig
-*         Handle Get device configuration request
+  *         Handle Get device configuration request
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
 static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   if (req->wLength != 1U)
@@ -722,11 +831,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:
@@ -737,12 +846,12 @@ static void USBD_GetConfig(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 }
 
 /**
-* @brief  USBD_GetStatus
+  * @brief  USBD_GetStatus
-*         Handle Get Status request
+  *         Handle Get Status request
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
 static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
   switch (pdev->dev_state)
@@ -760,14 +869,14 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
       pdev->dev_config_status = USB_CONFIG_SELF_POWERED;
 #else
       pdev->dev_config_status = 0U;
-#endif
+#endif /* USBD_SELF_POWERED */
 
-      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:
@@ -778,32 +887,39 @@ static void USBD_GetStatus(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 
 
 /**
-* @brief  USBD_SetFeature
+  * @brief  USBD_SetFeature
-*         Handle Set device feature request
+  *         Handle Set device feature request
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
-static void USBD_SetFeature(USBD_HandleTypeDef *pdev,
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
   if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
   {
     pdev->dev_remote_wakeup = 1U;
-    USBD_CtlSendStatus(pdev);
+    (void)USBD_CtlSendStatus(pdev);
+  }
+  else if (req->wValue == USB_FEATURE_TEST_MODE)
+  {
+    pdev->dev_test_mode = (uint8_t)(req->wIndex >> 8);
+    (void)USBD_CtlSendStatus(pdev);
+  }
+  else
+  {
+    USBD_CtlError(pdev, req);
   }
 }
 
 
 /**
-* @brief  USBD_ClrFeature
+  * @brief  USBD_ClrFeature
-*         Handle clear device feature request
+  *         Handle clear device feature request
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  req: usb request
+  * @param  req: usb request
-* @retval status
+  * @retval None
-*/
+  */
-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev,
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
-                            USBD_SetupReqTypedef *req)
 {
   switch (pdev->dev_state)
   {
@@ -813,7 +929,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;
 
@@ -823,37 +939,49 @@ static void USBD_ClrFeature(USBD_HandleTypeDef *pdev,
   }
 }
 
-/**
-* @brief  USBD_ParseSetupRequest
-*         Copy buffer into setup structure
-* @param  pdev: device instance
-* @param  req: usb request
-* @retval None
-*/
 
+/**
+  * @brief  USBD_ParseSetupRequest
+  *         Copy buffer into setup structure
+  * @param  req: usb request
+  * @param  pdata: setup data pointer
+  * @retval None
+  */
 void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
 {
-  req->bmRequest = *(uint8_t *)(pdata);
+  uint8_t *pbuff = pdata;
-  req->bRequest = *(uint8_t *)(pdata + 1U);
-  req->wValue = SWAPBYTE(pdata + 2U);
-  req->wIndex = SWAPBYTE(pdata + 4U);
-  req->wLength = SWAPBYTE(pdata + 6U);
 
+  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
-* @param  pdev: device instance
-* @param  req: usb request
-* @retval None
-*/
 
-void USBD_CtlError(USBD_HandleTypeDef *pdev,
+/**
-                   USBD_SetupReqTypedef *req)
+  * @brief  USBD_CtlError
+  *         Handle USB low level Error
+  * @param  pdev: device instance
+  * @param  req: usb request
+  * @retval None
+  */
+void USBD_CtlError(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
 {
-  USBD_LL_StallEP(pdev, 0x80U);
+  UNUSED(req);
-  USBD_LL_StallEP(pdev, 0U);
+
+  (void)USBD_LL_StallEP(pdev, 0x80U);
+  (void)USBD_LL_StallEP(pdev, 0U);
 }
 
 
@@ -868,21 +996,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;
+    return;
-    unicode[idx++] = *(uint8_t *)(void *)len;
+  }
-    unicode[idx++] = USB_DESC_TYPE_STRING;
 
-    while (*desc != '\0')
+  pdesc = desc;
-    {
+  *len = MIN(USBD_MAX_STR_DESC_SIZ, ((uint16_t)USBD_GetLen(pdesc) * 2U) + 2U);
-      unicode[idx++] = *desc++;
+
-      unicode[idx++] =  0U;
+  unicode[idx] = *(uint8_t *)len;
-    }
+  idx++;
+  unicode[idx] = USB_DESC_TYPE_STRING;
+  idx++;
+
+  while (*pdesc != (uint8_t)'\0')
+  {
+    unicode[idx] = *pdesc;
+    pdesc++;
+    idx++;
+
+    unicode[idx] = 0U;
+    idx++;
   }
 }
 
+
 /**
   * @brief  USBD_GetLen
   *         return the string length
@@ -892,11 +1032,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;
@@ -915,4 +1056,3 @@ static uint8_t USBD_GetLen(uint8_t *buf)
   * @}
   */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Src/usbd_desc.c

@@ -0,0 +1,454 @@
+/**
+  ******************************************************************************
+  * @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.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2015 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_core.h"
+#include "usbd_desc.h"
+#include "usbd_conf.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define USBD_VID                      0x0483
+#define USBD_PID                      22336  /* Replace '0xaaaa' with your device product ID */
+#define USBD_LANGID_STRING            1033   /* Replace '0xbbb' with your device language ID */
+#define USBD_MANUFACTURER_STRING      "STMicroelectronics" /* Add your manufacturer string */
+#define USBD_PRODUCT_HS_STRING        "STM32 Virtual ComPort" /* Add your product High Speed string */
+#define USBD_PRODUCT_FS_STRING        "STM32 Virtual ComPort" /* Add your product Full Speed string */
+#define USBD_CONFIGURATION_HS_STRING  "CDC Config" /* Add your configuration High Speed string */
+#define USBD_INTERFACE_HS_STRING      "CDC Interface" /* Add your Interface High Speed string */
+#define USBD_CONFIGURATION_FS_STRING  "CDC Config" /* Add your configuration Full Speed string */
+#define USBD_INTERFACE_FS_STRING      "CDC Interface" /* Add your Interface Full Speed string */
+
+/* Private macro -------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
+
+#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 /* (USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1) */
+
+/* Private variables ---------------------------------------------------------*/
+USBD_DescriptorsTypeDef Class_Desc =
+{
+  USBD_Class_DeviceDescriptor,
+  USBD_Class_LangIDStrDescriptor,
+  USBD_Class_ManufacturerStrDescriptor,
+  USBD_Class_ProductStrDescriptor,
+  USBD_Class_SerialStrDescriptor,
+  USBD_Class_ConfigStrDescriptor,
+  USBD_Class_InterfaceStrDescriptor,
+#if (USBD_CLASS_USER_STRING_DESC == 1)
+  USBD_Class_UserStrDescriptor,
+#endif /* USB_CLASS_USER_STRING_DESC */
+
+#if ((USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1))
+  USBD_USR_BOSDescriptor,
+#endif /* (USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1) */
+};
+
+/* USB Standard Device Descriptor */
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif /* __ICCARM__ */
+__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 /* (USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1) */
+  0x02,
+  0x02,                       /* bDeviceClass */
+  0x02,                       /* bDeviceSubClass */
+  0x00,                       /* bDeviceProtocol */
+  USB_MAX_EP0_SIZE,           /* bMaxPacketSize */
+  LOBYTE(USBD_VID),           /* idVendor */
+  HIBYTE(USBD_VID),           /* idVendor */
+  LOBYTE(USBD_PID),           /* idVendor */
+  HIBYTE(USBD_PID),           /* idVendor */
+  0x00,                       /* bcdDevice rel. 2.00 */
+  0x02,
+  USBD_IDX_MFC_STR,           /* Index of manufacturer string */
+  USBD_IDX_PRODUCT_STR,       /* Index of product string */
+  USBD_IDX_SERIAL_STR,        /* Index of serial number string */
+  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 /* __ICCARM__ */
+__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 /* USBD_LPM_ENABLED */
+
+/* USB Device Billboard BOS descriptor Template */
+#if (USBD_CLASS_BOS_ENABLED == 1)
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif /* __ICCARM__ */
+__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  first Mode entry
+                                        1  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  first Mode entry
+                                        1  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 /* USBD_CLASS_BOS_ENABLED */
+
+
+/* USB Standard Device Descriptor */
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif /* __ICCARM__ */
+__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),
+};
+
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif /* __ICCARM__ */
+__ALIGN_BEGIN uint8_t USBD_StringSerial[USB_SIZ_STRING_SERIAL] =
+{
+  USB_SIZ_STRING_SERIAL,
+  USB_DESC_TYPE_STRING,
+};
+
+#if defined ( __ICCARM__ ) /*!< IAR Compiler */
+#pragma data_alignment=4
+#endif /* __ICCARM__ */
+__ALIGN_BEGIN uint8_t USBD_StrDesc[USBD_MAX_STR_DESC_SIZ] __ALIGN_END;
+
+/* Private functions ---------------------------------------------------------*/
+static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len);
+static void Get_SerialNum(void);
+
+/**
+  * @brief  Returns the device descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  UNUSED(speed);
+
+  *length = sizeof(USBD_DeviceDesc);
+  return (uint8_t *)USBD_DeviceDesc;
+}
+
+/**
+  * @brief  Returns the LangID string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  UNUSED(speed);
+
+  *length = sizeof(USBD_LangIDDesc);
+  return (uint8_t *)USBD_LangIDDesc;
+}
+
+/**
+  * @brief  Returns the product string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  if (speed == USBD_SPEED_HIGH)
+  {
+    USBD_GetString((uint8_t *)USBD_PRODUCT_HS_STRING, USBD_StrDesc, length);
+  }
+  else
+  {
+    USBD_GetString((uint8_t *)USBD_PRODUCT_FS_STRING, USBD_StrDesc, length);
+  }
+  return USBD_StrDesc;
+}
+
+/**
+  * @brief  Returns the manufacturer string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+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;
+}
+
+/**
+  * @brief  Returns the serial number string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  UNUSED(speed);
+
+  *length = USB_SIZ_STRING_SERIAL;
+
+  /* Update the serial number string descriptor with the data from the unique ID*/
+  Get_SerialNum();
+
+  return (uint8_t *)USBD_StringSerial;
+}
+
+/**
+  * @brief  Returns the configuration string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  if (speed == USBD_SPEED_HIGH)
+  {
+    USBD_GetString((uint8_t *)USBD_CONFIGURATION_HS_STRING, USBD_StrDesc, length);
+  }
+  else
+  {
+    USBD_GetString((uint8_t *)USBD_CONFIGURATION_FS_STRING, USBD_StrDesc, length);
+  }
+  return USBD_StrDesc;
+}
+
+/**
+  * @brief  Returns the interface string descriptor.
+  * @param  speed: Current device speed
+  * @param  length: Pointer to data length variable
+  * @retval Pointer to descriptor buffer
+  */
+uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
+{
+  if (speed == USBD_SPEED_HIGH)
+  {
+    USBD_GetString((uint8_t *)USBD_INTERFACE_HS_STRING, USBD_StrDesc, length);
+  }
+  else
+  {
+    USBD_GetString((uint8_t *)USBD_INTERFACE_FS_STRING, USBD_StrDesc, length);
+  }
+  return USBD_StrDesc;
+}
+
+/**
+  * @brief  Create the serial number string descriptor
+  * @param  None
+  * @retval None
+  */
+static void Get_SerialNum(void)
+{
+  uint32_t deviceserial0;
+  uint32_t deviceserial1;
+  uint32_t deviceserial2;
+
+  deviceserial0 = *(uint32_t *)DEVICE_ID1;
+  deviceserial1 = *(uint32_t *)DEVICE_ID2;
+  deviceserial2 = *(uint32_t *)DEVICE_ID3;
+
+  deviceserial0 += deviceserial2;
+
+  if (deviceserial0 != 0U)
+  {
+    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 /* (USBD_LPM_ENABLED == 1) || (USBD_CLASS_BOS_ENABLED == 1) */
+
+
+#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 /* USBD_CLASS_USER_STRING_DESC */
+
+
+/**
+  * @brief  Convert Hex 32Bits value into char
+  * @param  value: value to convert
+  * @param  pbuf: pointer to the buffer
+  * @param  len: buffer length
+  * @retval None
+  */
+static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len)
+{
+  uint8_t idx = 0U;
+
+  for (idx = 0U ; idx < len ; idx ++)
+  {
+    if (((value >> 28)) < 0xAU)
+    {
+      pbuf[ 2U * idx] = (value >> 28) + '0';
+    }
+    else
+    {
+      pbuf[2U * idx] = (value >> 28) + 'A' - 10U;
+    }
+
+    value = value << 4;
+
+    pbuf[2U * idx + 1] = 0U;
+  }
+}

Core/Src/usbd_desc_template.c

@@ -1,277 +0,0 @@
-/**
-  ******************************************************************************
-  * @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.
-  ******************************************************************************
-  * @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
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usbd_core.h"
-#include "usbd_desc.h"
-#include "usbd_conf.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define USBD_VID                      0x0483
-#define USBD_PID                      0xaaaa  /* Replace '0xaaaa' with your device product ID */
-#define USBD_LANGID_STRING            0xbbb  /* Replace '0xbbb' with your device language ID */
-#define USBD_MANUFACTURER_STRING      "xxxxx" /* Add your manufacturer string */
-#define USBD_PRODUCT_HS_STRING        "xxxxx" /* Add your product High Speed string */
-#define USBD_PRODUCT_FS_STRING        "xxxxx" /* Add your product Full Speed string */
-#define USBD_CONFIGURATION_HS_STRING  "xxxxx" /* Add your configuration High Speed string */
-#define USBD_INTERFACE_HS_STRING      "xxxxx" /* Add your Interface High Speed string */
-#define USBD_CONFIGURATION_FS_STRING  "xxxxx" /* Add your configuration Full Speed string */
-#define USBD_INTERFACE_FS_STRING      "xxxxx" /* Add your Interface Full Speed string */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
-#ifdef USBD_SUPPORT_USER_STRING_DESC
-uint8_t *USBD_Class_USRStringDesc(USBD_SpeedTypeDef speed, uint8_t idx, uint16_t *length);
-#endif /* USBD_SUPPORT_USER_STRING_DESC */
-
-/* Private variables ---------------------------------------------------------*/
-USBD_DescriptorsTypeDef Class_Desc =
-{
-  USBD_Class_DeviceDescriptor,
-  USBD_Class_LangIDStrDescriptor,
-  USBD_Class_ManufacturerStrDescriptor,
-  USBD_Class_ProductStrDescriptor,
-  USBD_Class_SerialStrDescriptor,
-  USBD_Class_ConfigStrDescriptor,
-  USBD_Class_InterfaceStrDescriptor,
-};
-
-/* 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 =
-{
-  0x12,                       /* bLength */
-  USB_DESC_TYPE_DEVICE,       /* bDescriptorType */
-  0x00,                       /* bcdUSB */
-  0x02,
-  0x00,                       /* bDeviceClass */
-  0x00,                       /* bDeviceSubClass */
-  0x00,                       /* bDeviceProtocol */
-  USB_MAX_EP0_SIZE,           /* bMaxPacketSize */
-  LOBYTE(USBD_VID),           /* idVendor */
-  HIBYTE(USBD_VID),           /* idVendor */
-  LOBYTE(USBD_PID),           /* idVendor */
-  HIBYTE(USBD_PID),           /* idVendor */
-  0x00,                       /* bcdDevice rel. 2.00 */
-  0x02,
-  USBD_IDX_MFC_STR,           /* Index of manufacturer string */
-  USBD_IDX_PRODUCT_STR,       /* Index of product string */
-  USBD_IDX_SERIAL_STR,        /* Index of serial number string */
-  USBD_MAX_NUM_CONFIGURATION  /* bNumConfigurations */
-}; /* USB_DeviceDescriptor */
-
-/* USB Standard Device Descriptor */
-#if defined ( __ICCARM__ ) /*!< IAR Compiler */
-#pragma data_alignment=4
-#endif
-__ALIGN_BEGIN   uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __ALIGN_END =
-{
-  USB_LEN_LANGID_STR_DESC,
-  USB_DESC_TYPE_STRING,
-  LOBYTE(USBD_LANGID_STRING),
-  HIBYTE(USBD_LANGID_STRING),
-};
-
-uint8_t USBD_StringSerial[USB_SIZ_STRING_SERIAL] =
-{
-  USB_SIZ_STRING_SERIAL,
-  USB_DESC_TYPE_STRING,
-};
-
-#if defined ( __ICCARM__ ) /*!< IAR Compiler */
-#pragma data_alignment=4
-#endif
-__ALIGN_BEGIN uint8_t USBD_StrDesc[USBD_MAX_STR_DESC_SIZ] __ALIGN_END;
-
-/* Private functions ---------------------------------------------------------*/
-static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len);
-static void Get_SerialNum(void);
-
-/**
-  * @brief  Returns the device descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  *length = sizeof(USBD_DeviceDesc);
-  return (uint8_t *)USBD_DeviceDesc;
-}
-
-/**
-  * @brief  Returns the LangID string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  *length = sizeof(USBD_LangIDDesc);
-  return (uint8_t *)USBD_LangIDDesc;
-}
-
-/**
-  * @brief  Returns the product string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_ProductStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  if (speed == USBD_SPEED_HIGH)
-  {
-    USBD_GetString((uint8_t *)USBD_PRODUCT_HS_STRING, USBD_StrDesc, length);
-  }
-  else
-  {
-    USBD_GetString((uint8_t *)USBD_PRODUCT_FS_STRING, USBD_StrDesc, length);
-  }
-  return USBD_StrDesc;
-}
-
-/**
-  * @brief  Returns the manufacturer string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_ManufacturerStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  USBD_GetString((uint8_t *)USBD_MANUFACTURER_STRING, USBD_StrDesc, length);
-  return USBD_StrDesc;
-}
-
-/**
-  * @brief  Returns the serial number string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_SerialStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  *length = USB_SIZ_STRING_SERIAL;
-
-  /* Update the serial number string descriptor with the data from the unique ID*/
-  Get_SerialNum();
-
-  return (uint8_t *)USBD_StringSerial;
-}
-
-/**
-  * @brief  Returns the configuration string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_ConfigStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  if (speed == USBD_SPEED_HIGH)
-  {
-    USBD_GetString((uint8_t *)USBD_CONFIGURATION_HS_STRING, USBD_StrDesc, length);
-  }
-  else
-  {
-    USBD_GetString((uint8_t *)USBD_CONFIGURATION_FS_STRING, USBD_StrDesc, length);
-  }
-  return USBD_StrDesc;
-}
-
-/**
-  * @brief  Returns the interface string descriptor.
-  * @param  speed: Current device speed
-  * @param  length: Pointer to data length variable
-  * @retval Pointer to descriptor buffer
-  */
-uint8_t *USBD_Class_InterfaceStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length)
-{
-  if (speed == USBD_SPEED_HIGH)
-  {
-    USBD_GetString((uint8_t *)USBD_INTERFACE_HS_STRING, USBD_StrDesc, length);
-  }
-  else
-  {
-    USBD_GetString((uint8_t *)USBD_INTERFACE_FS_STRING, USBD_StrDesc, length);
-  }
-  return USBD_StrDesc;
-}
-
-/**
-  * @brief  Create the serial number string descriptor
-  * @param  None
-  * @retval None
-  */
-static void Get_SerialNum(void)
-{
-  uint32_t deviceserial0, deviceserial1, deviceserial2;
-
-  deviceserial0 = *(uint32_t *)DEVICE_ID1;
-  deviceserial1 = *(uint32_t *)DEVICE_ID2;
-  deviceserial2 = *(uint32_t *)DEVICE_ID3;
-
-  deviceserial0 += deviceserial2;
-
-  if (deviceserial0 != 0U)
-  {
-    IntToUnicode(deviceserial0, &USBD_StringSerial[2], 8U);
-    IntToUnicode(deviceserial1, &USBD_StringSerial[18], 4U);
-  }
-}
-
-/**
-  * @brief  Convert Hex 32Bits value into char
-  * @param  value: value to convert
-  * @param  pbuf: pointer to the buffer
-  * @param  len: buffer length
-  * @retval None
-  */
-static void IntToUnicode(uint32_t value, uint8_t *pbuf, uint8_t len)
-{
-  uint8_t idx = 0U;
-
-  for (idx = 0U ; idx < len ; idx ++)
-  {
-    if (((value >> 28)) < 0xAU)
-    {
-      pbuf[ 2U * idx] = (value >> 28) + '0';
-    }
-    else
-    {
-      pbuf[2U * idx] = (value >> 28) + 'A' - 10U;
-    }
-
-    value = value << 4;
-
-    pbuf[2U * idx + 1] = 0U;
-  }
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Core/Src/usbd_ioreq.c

@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2015 STMicroelectronics.
+  * Copyright (c) 2015 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * All rights reserved.
   *
-  * This software component is licensed by ST under Ultimate Liberty license
+  * This software is licensed under terms that can be found in the LICENSE file
-  * SLA0044, the "License"; You may not use this file except in compliance with
+  * in the root directory of this software component.
-  * the License. You may obtain a copy of the License at:
+  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *                      www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -77,123 +76,135 @@
   */
 
 /**
-* @brief  USBD_CtlSendData
+  * @brief  USBD_CtlSendData
-*         send data on the ctl pipe
+  *         send data on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  buff: pointer to data buffer
+  * @param  buff: pointer to data buffer
-* @param  len: length of data to be sent
+  * @param  len: length of data to be sent
-* @retval status
+  * @retval status
-*/
+  */
 USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev,
-                                    uint8_t *pbuf, uint16_t len)
+                                    uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_IN;
   pdev->ep_in[0].total_length = len;
-  pdev->ep_in[0].rem_length   = len;
+  pdev->ep_in[0].pbuffer = pbuf;
+
+#ifdef USBD_AVOID_PACKET_SPLIT_MPS
+  pdev->ep_in[0].rem_length = 0U;
+#else
+  pdev->ep_in[0].rem_length = len;
+#endif /* USBD_AVOID_PACKET_SPLIT_MPS */
 
   /* Start the transfer */
-  USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
+  (void)USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_CtlContinueSendData
+  * @brief  USBD_CtlContinueSendData
-*         continue sending data on the ctl pipe
+  *         continue sending data on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  buff: pointer to data buffer
+  * @param  buff: pointer to data buffer
-* @param  len: length of data to be sent
+  * @param  len: length of data to be sent
-* @retval status
+  * @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;
 }
 
 /**
-* @brief  USBD_CtlPrepareRx
+  * @brief  USBD_CtlPrepareRx
-*         receive data on the ctl pipe
+  *         receive data on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  buff: pointer to data buffer
+  * @param  buff: pointer to data buffer
-* @param  len: length of data to be received
+  * @param  len: length of data to be received
-* @retval status
+  * @retval status
-*/
+  */
 USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev,
-                                     uint8_t *pbuf, uint16_t len)
+                                     uint8_t *pbuf, uint32_t len)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_DATA_OUT;
   pdev->ep_out[0].total_length = len;
-  pdev->ep_out[0].rem_length   = len;
+  pdev->ep_out[0].pbuffer = pbuf;
+
+#ifdef USBD_AVOID_PACKET_SPLIT_MPS
+  pdev->ep_out[0].rem_length = 0U;
+#else
+  pdev->ep_out[0].rem_length = len;
+#endif /* USBD_AVOID_PACKET_SPLIT_MPS */
 
   /* Start the transfer */
-  USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_CtlContinueRx
+  * @brief  USBD_CtlContinueRx
-*         continue receive data on the ctl pipe
+  *         continue receive data on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  buff: pointer to data buffer
+  * @param  buff: pointer to data buffer
-* @param  len: length of data to be received
+  * @param  len: length of data to be received
-* @retval status
+  * @retval status
-*/
+  */
 USBD_StatusTypeDef USBD_CtlContinueRx(USBD_HandleTypeDef *pdev,
-                                      uint8_t *pbuf, uint16_t len)
+                                      uint8_t *pbuf, uint32_t len)
 {
-  USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_CtlSendStatus
+  * @brief  USBD_CtlSendStatus
-*         send zero lzngth packet on the ctl pipe
+  *         send zero lzngth packet on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @retval status
+  * @retval status
-*/
+  */
 USBD_StatusTypeDef USBD_CtlSendStatus(USBD_HandleTypeDef *pdev)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_STATUS_IN;
 
   /* Start the transfer */
-  USBD_LL_Transmit(pdev, 0x00U, NULL, 0U);
+  (void)USBD_LL_Transmit(pdev, 0x00U, NULL, 0U);
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_CtlReceiveStatus
+  * @brief  USBD_CtlReceiveStatus
-*         receive zero lzngth packet on the ctl pipe
+  *         receive zero lzngth packet on the ctl pipe
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @retval status
+  * @retval status
-*/
+  */
 USBD_StatusTypeDef USBD_CtlReceiveStatus(USBD_HandleTypeDef *pdev)
 {
   /* Set EP0 State */
   pdev->ep0_state = USBD_EP0_STATUS_OUT;
 
   /* Start the transfer */
-  USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
+  (void)USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
 
   return USBD_OK;
 }
 
 /**
-* @brief  USBD_GetRxCount
+  * @brief  USBD_GetRxCount
-*         returns the received data length
+  *         returns the received data length
-* @param  pdev: device instance
+  * @param  pdev: device instance
-* @param  ep_addr: endpoint address
+  * @param  ep_addr: endpoint address
-* @retval Rx Data blength
+  * @retval Rx Data blength
-*/
+  */
 uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 {
   return USBD_LL_GetRxDataSize(pdev, ep_addr);
@@ -213,4 +224,3 @@ uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
   * @}
   */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

LICENSE.md

@@ -0,0 +1,80 @@
+SLA0044 Rev5/February 2018
+
+## Software license agreement
+
+### __ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT__
+
+BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE
+OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS
+INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES
+(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON
+BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES
+TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT.
+
+Under STMicroelectronics’ intellectual property rights, the redistribution,
+reproduction and use in source and binary forms of the software or any part
+thereof, with or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistribution of source code (modified or not) must retain any copyright
+notice, this list of conditions and the disclaimer set forth below as items 10
+and 11.
+
+2. Redistributions in binary form, except as embedded into microcontroller or
+microprocessor device manufactured by or for STMicroelectronics or a software
+update for such device, must reproduce any copyright notice provided with the
+binary code, this list of conditions, and the disclaimer set forth below as
+items 10 and 11, in documentation and/or other materials provided with the
+distribution.
+
+3. Neither the name of STMicroelectronics nor the names of other contributors to
+this software may be used to endorse or promote products derived from this
+software or part thereof without specific written permission.
+
+4. This software or any part thereof, including modifications and/or derivative
+works of this software, must be used and execute solely and exclusively on or in
+combination with a microcontroller or microprocessor device manufactured by or
+for STMicroelectronics.
+
+5. No use, reproduction or redistribution of this software partially or totally
+may be done in any manner that would subject this software to any Open Source
+Terms. “Open Source Terms” shall mean any open source license which requires as
+part of distribution of software that the source code of such software is
+distributed therewith or otherwise made available, or open source license that
+substantially complies with the Open Source definition specified at
+www.opensource.org and any other comparable open source license such as for
+example GNU General Public License (GPL), Eclipse Public License (EPL), Apache
+Software License, BSD license or MIT license.
+
+6. STMicroelectronics has no obligation to provide any maintenance, support or
+updates for the software.
+
+7. The software is and will remain the exclusive property of STMicroelectronics
+and its licensors. The recipient will not take any action that jeopardizes
+STMicroelectronics and its licensors' proprietary rights or acquire any rights
+in the software, except the limited rights specified hereunder.
+
+8. The recipient shall comply with all applicable laws and regulations affecting
+the use of the software or any part thereof including any applicable export
+control law or regulation.
+
+9. Redistribution and use of this software or any part thereof other than as
+permitted under this license is void and will automatically terminate your
+rights under this license.
+
+10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE
+DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL
+STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER
+EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL PROPERTY
+RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY.

License.md

@@ -1,3 +0,0 @@
-# Copyright (c) 2015 STMicroelectronics.
-
-This software component is licensed by  ST under Ultimate Liberty license SLA0044, the "License". You may not use this file except in compliance with this license. You may obtain a copy of the license [here](https://www.st.com/SLA0044).

README.md

@@ -1,50 +1,36 @@
 # Middleware USB Device MCU Component
 
+![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/stm32_mw_usb_device.svg?color=brightgreen)
+
 ## Overview
 
-**STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
+**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost.
 
-**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform, delivered for each STM32 series.
+**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series.
    * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product.
-   * The STM32 HAL-LL drivers : an abstraction drivers layer, the API ensuring maximized portability across the STM32 portfolio.
+   * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio.
-   * The BSP Drivers of each evaluation or demonstration board provided by this STM32 series.
+   * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series.
-   * A consistent set of middlewares components such as RTOS, USB, FatFS, Graphics, STM32_TouchSensing_Library...
+   * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library...
-   * A full set of software projects (basic examples, applications or demonstrations) for each board provided by this STM32 series.
+   * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series.
 
 Two models of publication are proposed for the STM32Cube embedded software:
-   * The monolithic **MCU Package** : all STM32Cube software modules of one STM32 series are present (Drivers, Middlewares, Projects, Utilities) in the repo (usual name **STM32Cubexx**, xx corresponding to the STM32 series).
+   * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series).
-   * The **MCU component** : progressively from November 2019, each STM32Cube software module being part of the STM32Cube MCU Package, will be delivered as an individual repo, allowing the user to select and get only the required software functions.
+   * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions.
 
 ## Description
 
 This **stm32_mw_usb_device** MCU component repository is one element **common to all** STM32Cube MCU embedded software packages, providing the **USB Device MCU Middleware** part.
 
-## License
+It represents ST offer to ensure the support of USB Devices on STM32 MCUs.
-
+It includes two main modules:
-Copyright (c) 2015 STMicroelectronics.
+ * **Core** module for the USB device standard peripheral control APIs. It includes the files ensuring USB 2.0 standard code implementation for an USB device.
-
+These files’ APIs will be called within every USB device application regardless of the desired functionality.
-This software component is licensed by  ST under Ultimate Liberty license SLA0044, the "License". You may not use this file except in compliance with this license. You may obtain a copy of the license [here](https://www.st.com/SLA0044).
+ * **Class** module for the commonly supported classes APIs. it includes the files including different USB device classes. All STM32 USB classes are implemented according to the USB 2.0 and every class’s specifications. These files’ APIs will be called within USB device applications according to the desired functionality.
 
 ## Release note
 
 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))
-Tag v2.5.3 | Tag v1.7.3 ([stm32f0xx_hal_driver](https://github.com/STMicroelectronics/stm32f0xx_hal_driver))<br>Tag v1.1.4 ([stm32f1xx_hal_driver](https://github.com/STMicroelectronics/stm32f1xx_hal_driver))<br>Tag v1.2.4 ([stm32f2xx_hal_driver](https://github.com/STMicroelectronics/stm32f2xx_hal_driver))<br>Tag v1.5.3 ([stm32f3xx_hal_driver](https://github.com/STMicroelectronics/stm32f3xx_hal_driver))
-
 ## 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).
+Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide.
-
-For any other question related to the product, the tools, the environment, you can submit a topic to the [ST Community](https://community.st.com/s/).