stmhal: Remove unused usbdev files, and move used ones up a dir.

The unused files are from the ST demos for different USB classes and are
not needed for the stmhal port.

5 files changed, 0 insertions, 2108 deletions

diff --git a/stmhal/usbdev/class/msc/src/usbd_msc.c b/stmhal/usbdev/class/msc/src/usbd_msc.c
deleted file mode 100644
index 7817c98b1c..0000000000
--- a/stmhal/usbdev/class/msc/src/usbd_msc.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/**

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

-  * @file    usbd_msc_core.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @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 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

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

-  */ 

-

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

-#include "usbd_msc.h"

-

-

-/** @addtogroup STM32_USB_OTG_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 */

-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)

-{

-  int16_t ret = 0;

-   

-  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);

-    

-    /* Open EP IN */

-    USBD_LL_OpenEP(pdev,

-                   MSC_EPIN_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);

-    

-    /* Open EP IN */

-    USBD_LL_OpenEP(pdev,

-                   MSC_EPIN_ADDR,

-                   USBD_EP_TYPE_BULK,

-                   MSC_MAX_FS_PACKET);  

-  }

-  pdev->pClassData = USBD_malloc(sizeof (USBD_MSC_BOT_HandleTypeDef));

-  

-  if(pdev->pClassData == NULL)

-  {

-    ret = 1; 

-  }

-  else

-  {

-    /* Init the BOT  layer */

-    MSC_BOT_Init(pdev); 

-    ret = 0;

-  }

-  

-  return ret;

-}

-

-/**

-  * @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);

-  

-  /* Open EP IN */

-  USBD_LL_CloseEP(pdev,

-                  MSC_EPIN_ADDR);

-  

-  

-    /* D-Init the BOT layer */

-  MSC_BOT_DeInit(pdev);

-  

-  /* Free MSC Class Resources */

-  if(pdev->pClassData != NULL)

-  {

-    USBD_free(pdev->pClassData);

-    pdev->pClassData  = NULL; 

-  }

-  return 0;

-}

-/**

-* @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 = pdev->pClassData;

-  

-  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  == 0) && 

-         (req->wLength == 1) &&

-         ((req->bmRequest & 0x80) == 0x80))

-      {

-        hmsc->max_lun = ((USBD_StorageTypeDef *)pdev->pUserData)->GetMaxLun();

-        USBD_CtlSendData (pdev,

-                          (uint8_t *)&hmsc->max_lun,

-                          1);

-      }

-      else

-      {

-         USBD_CtlError(pdev , req);

-         return USBD_FAIL; 

-      }

-      break;

-      

-    case BOT_RESET :

-      if((req->wValue  == 0) && 

-         (req->wLength == 0) &&

-        ((req->bmRequest & 0x80) != 0x80))

-      {      

-         MSC_BOT_Reset(pdev);

-      }

-      else

-      {

-         USBD_CtlError(pdev , req);

-         return USBD_FAIL; 

-      }

-      break;

-

-    default:

-       USBD_CtlError(pdev , req);

-       return USBD_FAIL; 

-    }

-    break;

-  /* Interface & Endpoint request */

-  case USB_REQ_TYPE_STANDARD:

-    switch (req->bRequest)

-    {

-    case USB_REQ_GET_INTERFACE :

-      USBD_CtlSendData (pdev,

-                        (uint8_t *)&hmsc->interface,

-                        1);

-      break;

-      

-    case USB_REQ_SET_INTERFACE :

-      hmsc->interface = (uint8_t)(req->wValue);

-      break;

-    

-    case USB_REQ_CLEAR_FEATURE:  

-      

-      /* Flush the FIFO and Clear the stall status */    

-      USBD_LL_FlushEP(pdev, (uint8_t)req->wIndex);

-      

-      /* Re-activate the EP */      

-      USBD_LL_CloseEP (pdev , (uint8_t)req->wIndex);

-      if((((uint8_t)req->wIndex) & 0x80) == 0x80)

-      {

-        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);  

-        }

-      }

-      else

-      {

-        if(pdev->dev_speed == USBD_SPEED_HIGH  ) 

-        {

-          /* Open EP IN */

-          USBD_LL_OpenEP(pdev,

-                         MSC_EPOUT_ADDR,

-                         USBD_EP_TYPE_BULK,

-                         MSC_MAX_HS_PACKET);  

-        }

-        else

-        {   

-          /* Open EP IN */

-          USBD_LL_OpenEP(pdev,

-                         MSC_EPOUT_ADDR,

-                         USBD_EP_TYPE_BULK,

-                         MSC_MAX_FS_PACKET);  

-        }

-      }

-      

-      /* Handle BOT error */

-      MSC_BOT_CplClrFeature(pdev, (uint8_t)req->wIndex);

-      break;

-      

-    }  

-    break;

-   

-  default:

-    break;

-  }

-  return 0;

-}

-

-/**

-* @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 0;

-}

-

-/**

-* @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 0;

-}

-

-/**

-* @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 0;

-}

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

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

diff --git a/stmhal/usbdev/class/msc/src/usbd_msc_bot.c b/stmhal/usbdev/class/msc/src/usbd_msc_bot.c
deleted file mode 100644
index a430ce7709..0000000000
--- a/stmhal/usbdev/class/msc/src/usbd_msc_bot.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/**

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

-  * @file    usbd_msc_bot.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the BOT protocol core functions.

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

-  * @attention

-  *

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

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

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

-  */ 

-

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

-#include "usbd_msc_bot.h"

-#include "usbd_msc.h"

-#include "usbd_msc_scsi.h"

-#include "usbd_ioreq.h"

-

-/** @addtogroup STM32_USB_OTG_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 = pdev->pClassData;

-    

-  hmsc->bot_state  = USBD_BOT_IDLE;

-  hmsc->bot_status = USBD_BOT_STATUS_NORMAL;

-  

-  hmsc->scsi_sense_tail = 0;

-  hmsc->scsi_sense_head = 0;

-  

-  ((USBD_StorageTypeDef *)pdev->pUserData)->Init(0);

-  

-  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 *)&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 = 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 *)&hmsc->cbw,

-                          USBD_BOT_CBW_LENGTH);   

-}

-

-/**

-* @brief  MSC_BOT_DeInit

-*         Uninitialize the BOT Machine

-* @param  pdev: device instance

-* @retval None

-*/

-void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = 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 = 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

-*         Proccess 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 = 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 accordingtly  

-* @param  pdev: device instance

-* @retval None

-*/

-static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = 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 > 1) || 

-          (hmsc->cbw.bCBLength < 1) || 

-            (hmsc->cbw.bCBLength > 16))

-  {

-    

-    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 > 0)

-      {

-        MSC_BOT_SendData(pdev,

-                         hmsc->bot_data, 

-                         hmsc->bot_data_length);

-      }

-      else if (hmsc->bot_data_length == 0) 

-      {

-        MSC_BOT_SendCSW (pdev,

-                         USBD_CSW_CMD_PASSED);

-      }

-    }

-  }

-}

-

-/**

-* @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* buf, 

-                              uint16_t len)

-{

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = pdev->pClassData; 

-  

-  len = 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, buf, len);  

-}

-

-/**

-* @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 = 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 *)&hmsc->csw, 

-             USBD_BOT_CSW_LENGTH);

-  

-  /* Prapare EP to Receive next Cmd */

-  USBD_LL_PrepareReceive (pdev,

-                    MSC_EPOUT_ADDR,

-                    (uint8_t *)&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 = pdev->pClassData; 

-  

-  if ((hmsc->cbw.bmFlags == 0) && 

-      (hmsc->cbw.dDataLength != 0) &&

-      (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 *)&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 = 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 & 0x80) == 0x80) && ( hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))

-  {

-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);

-  }

-  

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

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

diff --git a/stmhal/usbdev/class/msc/src/usbd_msc_data.c b/stmhal/usbdev/class/msc/src/usbd_msc_data.c
deleted file mode 100644
index 4d72bd5fce..0000000000
--- a/stmhal/usbdev/class/msc/src/usbd_msc_data.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/**

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

-  * @file    usbd_msc_data.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the vital inquiry pages and sense data.

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

-  * @attention

-  *

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

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

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

-  */ 

-

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

-#include "usbd_msc_data.h"

-

-

-/** @addtogroup STM32_USB_OTG_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[] = {//7						

-	0x00,		

-	0x00, 

-	0x00, 

-	(LENGTH_INQUIRY_PAGE00 - 4),

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

diff --git a/stmhal/usbdev/class/msc/src/usbd_msc_scsi.c b/stmhal/usbdev/class/msc/src/usbd_msc_scsi.c
deleted file mode 100644
index ab94d89665..0000000000
--- a/stmhal/usbdev/class/msc/src/usbd_msc_scsi.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/**

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

-  * @file    usbd_msc_scsi.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the USBD SCSI layer functions.

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

-  * @attention

-  *

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

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

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

-  */ 

-

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

-#include "usbd_msc_bot.h"

-#include "usbd_msc_scsi.h"

-#include "usbd_msc.h"

-#include "usbd_msc_data.h"

-

-

-

-/** @addtogroup STM32_USB_OTG_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 , 

-                                      uint16_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 *params)

-{

-  

-  switch (params[0])

-  {

-  case SCSI_TEST_UNIT_READY:

-    return SCSI_TestUnitReady(pdev, lun, params);

-    

-  case SCSI_REQUEST_SENSE:

-    return SCSI_RequestSense (pdev, lun, params);

-  case SCSI_INQUIRY:

-    return SCSI_Inquiry(pdev, lun, params);

-    

-  case SCSI_START_STOP_UNIT:

-    return SCSI_StartStopUnit(pdev, lun, params);

-    

-  case SCSI_ALLOW_MEDIUM_REMOVAL:

-    return SCSI_StartStopUnit(pdev, lun, params);

-    

-  case SCSI_MODE_SENSE6:

-    return SCSI_ModeSense6 (pdev, lun, params);

-    

-  case SCSI_MODE_SENSE10:

-    return SCSI_ModeSense10 (pdev, lun, params);

-    

-  case SCSI_READ_FORMAT_CAPACITIES:

-    return SCSI_ReadFormatCapacity(pdev, lun, params);

-    

-  case SCSI_READ_CAPACITY10:

-    return SCSI_ReadCapacity10(pdev, lun, params);

-    

-  case SCSI_READ10:

-    return SCSI_Read10(pdev, lun, params); 

-    

-  case SCSI_WRITE10:

-    return SCSI_Write10(pdev, lun, params);

-    

-  case SCSI_VERIFY10:

-    return SCSI_Verify10(pdev, lun, params);

-    

-  default:

-    SCSI_SenseCode(pdev, 

-                   lun,

-                   ILLEGAL_REQUEST, 

-                   INVALID_CDB);    

-    return -1;

-  }

-}

-

-

-/**

-* @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 = pdev->pClassData;  

-    

-  /* case 9 : Hi > D0 */

-  if (hmsc->cbw.dDataLength != 0)

-  {

-    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 = 0;

-  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 = pdev->pClassData; 

-  

-  if (params[1] & 0x01)/*Evpd is set*/

-  {

-    pPage = (uint8_t *)MSC_Page00_Inquiry_Data;

-    len = LENGTH_INQUIRY_PAGE00;

-  }

-  else

-  {

-    

-    pPage = (uint8_t *)&((USBD_StorageTypeDef *)pdev->pUserData)->pInquiry[lun * STANDARD_INQUIRY_DATA_LEN];

-    len = pPage[4] + 5;

-    

-    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 = 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 - 1) >> 24);

-    hmsc->bot_data[1] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 16);

-    hmsc->bot_data[2] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >>  8);

-    hmsc->bot_data[3] = (uint8_t)(hmsc->scsi_blk_nbr - 1);

-    

-    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 = 8;

-    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 = pdev->pClassData; 

-  

-  uint16_t blk_size;

-  uint32_t blk_nbr;

-  uint16_t i;

-  

-  for(i=0 ; i < 12 ; i++) 

-  {

-    hmsc->bot_data[i] = 0;

-  }

-  

-  if(((USBD_StorageTypeDef *)pdev->pUserData)->GetCapacity(lun, &blk_nbr, &blk_size) != 0)

-  {

-    SCSI_SenseCode(pdev,

-                   lun,

-                   NOT_READY, 

-                   MEDIUM_NOT_PRESENT);

-    return -1;

-  } 

-  else

-  {

-    hmsc->bot_data[3] = 0x08;

-    hmsc->bot_data[4] = (uint8_t)((blk_nbr - 1) >> 24);

-    hmsc->bot_data[5] = (uint8_t)((blk_nbr - 1) >> 16);

-    hmsc->bot_data[6] = (uint8_t)((blk_nbr - 1) >>  8);

-    hmsc->bot_data[7] = (uint8_t)(blk_nbr - 1);

-    

-    hmsc->bot_data[8] = 0x02;

-    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 = 12;

-    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 = pdev->pClassData; 

-  uint16_t len = 8 ;

-  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 = 8;

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = 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 = pdev->pClassData; 

-  

-  for(i=0 ; i < REQUEST_SENSE_DATA_LEN ; i++) 

-  {

-    hmsc->bot_data[i] = 0;

-  }

-  

-  hmsc->bot_data[0]	= 0x70;		

-  hmsc->bot_data[7]	= REQUEST_SENSE_DATA_LEN - 6;	

-  

-  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 = 0;

-    }

-  }

-  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 = 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 = 0;

-  }

-}

-/**

-* @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 = pdev->pClassData;   

-  hmsc->bot_data_length = 0;

-  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 = pdev->pClassData; 

-  

-  if(hmsc->bot_state == USBD_BOT_IDLE)  /* Idle */

-  {

-    

-    /* case 10 : Ho <> Di */

-    

-    if ((hmsc->cbw.bmFlags & 0x80) != 0x80)

-    {

-      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 = (params[2] << 24) | \

-      (params[3] << 16) | \

-        (params[4] <<  8) | \

-          params[5];

-    

-    hmsc->scsi_blk_len =  (params[7] <<  8) | \

-      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;

-    hmsc->scsi_blk_addr *= hmsc->scsi_blk_size;

-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;

-    

-    /* cases 4,5 : Hi <> Dn */

-    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)

-    {

-      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 = pdev->pClassData; 

-  

-  if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */

-  {

-    

-    /* case 8 : Hi <> Do */

-    

-    if ((hmsc->cbw.bmFlags & 0x80) == 0x80)

-    {

-      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 = (params[2] << 24) | \

-      (params[3] << 16) | \

-        (params[4] <<  8) | \

-          params[5];

-    hmsc->scsi_blk_len = (params[7] <<  8) | \

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

-    }

-    

-    hmsc->scsi_blk_addr *= hmsc->scsi_blk_size;

-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;

-    

-    /* cases 3,11,13 : Hn,Ho <> D0 */

-    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)

-    {

-      SCSI_SenseCode(pdev,

-                     hmsc->cbw.bLUN, 

-                     ILLEGAL_REQUEST, 

-                     INVALID_CDB);

-      return -1;

-    }

-    

-    /* Prepare EP to receive first data packet */

-    hmsc->bot_state = USBD_BOT_DATA_OUT;  

-    USBD_LL_PrepareReceive (pdev,

-                      MSC_EPOUT_ADDR,

-                      hmsc->bot_data, 

-                      MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET));  

-  }

-  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 = pdev->pClassData; 

-  

-  if ((params[1]& 0x02) == 0x02) 

-  {

-    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 = 0;

-  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 , uint16_t blk_nbr)

-{

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = 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 = pdev->pClassData;   

-  uint32_t len;

-  

-  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET); 

-  

-  if( ((USBD_StorageTypeDef *)pdev->pUserData)->Read(lun ,

-                              hmsc->bot_data, 

-                              hmsc->scsi_blk_addr / hmsc->scsi_blk_size, 

-                              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_len    -= len;  

-  

-  /* case 6 : Hi = Di */

-  hmsc->csw.dDataResidue -= len;

-  

-  if (hmsc->scsi_blk_len == 0)

-  {

-    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)

-{

-  uint32_t len;

-  USBD_MSC_BOT_HandleTypeDef  *hmsc = pdev->pClassData; 

-  

-  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET); 

-  

-  if(((USBD_StorageTypeDef *)pdev->pUserData)->Write(lun ,

-                              hmsc->bot_data, 

-                              hmsc->scsi_blk_addr / hmsc->scsi_blk_size, 

-                              len / hmsc->scsi_blk_size) < 0)

-  {

-    SCSI_SenseCode(pdev,

-                   lun, 

-                   HARDWARE_ERROR, 

-                   WRITE_FAULT);     

-    return -1; 

-  }

-  

-  

-  hmsc->scsi_blk_addr  += len; 

-  hmsc->scsi_blk_len   -= len; 

-  

-  /* case 12 : Ho = Do */

-  hmsc->csw.dDataResidue -= len;

-  

-  if (hmsc->scsi_blk_len == 0)

-  {

-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);

-  }

-  else

-  {

-    /* Prapare EP to Receive next packet */

-    USBD_LL_PrepareReceive (pdev,

-                            MSC_EPOUT_ADDR,

-                            hmsc->bot_data, 

-                            MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET)); 

-  }

-  

-  return 0;

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

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

diff --git a/stmhal/usbdev/class/msc/src/usbd_msc_storage_template.c b/stmhal/usbdev/class/msc/src/usbd_msc_storage_template.c
deleted file mode 100644
index f75f11a9e5..0000000000
--- a/stmhal/usbdev/class/msc/src/usbd_msc_storage_template.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/**

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

-  * @file    usbd_msc_storage_template.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   Memory management layer

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

-  * @attention

-  *

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

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

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

-  */ 

-

-

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

-#include "usbd_msc_storage_template.h"

-

-

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

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

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

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

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

-/* Extern function prototypes ------------------------------------------------*/

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

-

-#define STORAGE_LUN_NBR                  1  

-#define STORAGE_BLK_NBR                  0x10000  

-#define STORAGE_BLK_SIZ                  0x200

-

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

-