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.

4 files changed, 0 insertions, 552 deletions

diff --git a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_cdc_msc_hid.h b/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_cdc_msc_hid.h
deleted file mode 100644
index 48d260bc2..000000000
--- a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_cdc_msc_hid.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef _USB_CDC_MSC_CORE_H_
-#define _USB_CDC_MSC_CORE_H_
-
-#include  "usbd_msc_bot.h"
-#include  "usbd_msc_scsi.h"
-#include  "usbd_ioreq.h"
-
-// CDC and MSC packet sizes
-#define CDC_DATA_FS_MAX_PACKET_SIZE (64) // endpoint IN & OUT packet size
-#define MSC_MEDIA_PACKET            (2048) // was 8192; how low can it go whilst still working?
-
-// Need to define here for BOT and SCSI layers
-#define MSC_IN_EP     (0x81)
-#define MSC_OUT_EP    (0x01)
-
-// Need to define here for usbd_cdc_interface.c (it needs CDC_IN_EP)
-#define CDC_IN_EP     (0x83)
-#define CDC_OUT_EP    (0x03)
-#define CDC_CMD_EP    (0x82)
-
-// only CDC_MSC and CDC_HID are available
-#define USBD_MODE_CDC (0x01)
-#define USBD_MODE_MSC (0x02)
-#define USBD_MODE_HID (0x04)
-#define USBD_MODE_CDC_MSC (USBD_MODE_CDC | USBD_MODE_MSC)
-#define USBD_MODE_CDC_HID (USBD_MODE_CDC | USBD_MODE_HID)
-#define USBD_MODE_MSC_HID (USBD_MODE_MSC | USBD_MODE_HID)
-
-typedef struct {
-  uint32_t bitrate;
-  uint8_t  format;
-  uint8_t  paritytype;
-  uint8_t  datatype;
-} USBD_CDC_LineCodingTypeDef;
-
-typedef struct _USBD_CDC_Itf {
-  int8_t (* Init)          (void);
-  int8_t (* DeInit)        (void);
-  int8_t (* Control)       (uint8_t, uint8_t * , uint16_t);   
-  int8_t (* Receive)       (uint8_t *, uint32_t *);  
-} USBD_CDC_ItfTypeDef;
-
-typedef struct {
-  uint32_t data[CDC_DATA_FS_MAX_PACKET_SIZE/4];      /* Force 32bits alignment */
-  uint8_t  CmdOpCode;
-  uint8_t  CmdLength;    
-  uint8_t  *RxBuffer;  
-  uint8_t  *TxBuffer;   
-  uint32_t RxLength;
-  uint32_t TxLength;    
-  
-  __IO uint32_t TxState;     
-  __IO uint32_t RxState;    
-} USBD_CDC_HandleTypeDef;
-
-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 (* StartStopUnit)(uint8_t lun, uint8_t started);
-  int8_t (* PreventAllowMediumRemoval)(uint8_t lun, uint8_t param0);
-  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_in_blks;
-  uint32_t                 scsi_blk_len;
-} USBD_MSC_BOT_HandleTypeDef;
-
-extern USBD_ClassTypeDef USBD_CDC_MSC_HID;
-
-void USBD_SelectMode(uint32_t mode);
-
-uint8_t USBD_CDC_RegisterInterface  (USBD_HandleTypeDef   *pdev, USBD_CDC_ItfTypeDef *fops);
-uint8_t USBD_CDC_SetTxBuffer  (USBD_HandleTypeDef   *pdev, uint8_t  *pbuff, uint16_t length);
-uint8_t USBD_CDC_SetRxBuffer        (USBD_HandleTypeDef   *pdev, uint8_t  *pbuff);
-uint8_t USBD_CDC_ReceivePacket  (USBD_HandleTypeDef *pdev);
-uint8_t USBD_CDC_TransmitPacket  (USBD_HandleTypeDef *pdev);
-
-uint8_t USBD_MSC_RegisterStorage(USBD_HandleTypeDef *pdev, USBD_StorageTypeDef *fops);
-
-uint8_t USBD_HID_SendReport(USBD_HandleTypeDef *pdev, uint8_t *report, uint16_t len);
-
-#endif // _USB_CDC_MSC_CORE_H_
diff --git a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_bot.h b/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_bot.h
deleted file mode 100644
index 41f8ab5a5..000000000
--- a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_bot.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/**

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

-  * @file    usbd_msc_bot.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_bot.c file

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

-  * @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.

-  *

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

-  */

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#include "usbd_core.h"

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_MSC_BOT_H

-#define __USBD_MSC_BOT_H

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup MSC_BOT

-  * @brief This file is the Header file for usbd_bot.c

-  * @{

-  */ 

-

-

-/** @defgroup USBD_CORE_Exported_Defines

-  * @{

-  */ 

-#define USBD_BOT_IDLE                      0       /* Idle state */

-#define USBD_BOT_DATA_OUT                  1       /* Data Out state */

-#define USBD_BOT_DATA_IN                   2       /* Data In state */

-#define USBD_BOT_LAST_DATA_IN              3       /* Last Data In Last */

-#define USBD_BOT_SEND_DATA                 4       /* Send Immediate data */

-#define USBD_BOT_NO_DATA                   5       /* No data Stage */

-

-#define USBD_BOT_CBW_SIGNATURE             0x43425355

-#define USBD_BOT_CSW_SIGNATURE             0x53425355

-#define USBD_BOT_CBW_LENGTH                31

-#define USBD_BOT_CSW_LENGTH                13

-#define USBD_BOT_MAX_DATA                  256

-

-/* CSW Status Definitions */

-#define USBD_CSW_CMD_PASSED                0x00

-#define USBD_CSW_CMD_FAILED                0x01

-#define USBD_CSW_PHASE_ERROR               0x02

-

-/* BOT Status */

-#define USBD_BOT_STATUS_NORMAL             0

-#define USBD_BOT_STATUS_RECOVERY           1

-#define USBD_BOT_STATUS_ERROR              2

-

-

-#define USBD_DIR_IN                        0

-#define USBD_DIR_OUT                       1

-#define USBD_BOTH_DIR                      2

-

-/**

-  * @}

-  */ 

-

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

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_MSC_BOT_H */

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

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

-

diff --git a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_data.h b/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_data.h
deleted file mode 100644
index f468267f4..000000000
--- a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_data.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/**

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

-  * @file    usbd_msc_data.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_data.c file

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

-  * @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.

-  *

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

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#ifndef _USBD_MSC_DATA_H_

-#define _USBD_MSC_DATA_H_

-

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

-#include "usbd_conf.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USB_INFO

-  * @brief general defines for the usb device library file

-  * @{

-  */ 

-

-/** @defgroup USB_INFO_Exported_Defines

-  * @{

-  */ 

-#define MODE_SENSE6_LEN			 8

-#define MODE_SENSE10_LEN		 8

-#define LENGTH_INQUIRY_PAGE00		 7

-#define LENGTH_FORMAT_CAPACITIES    	20

-

-/**

-  * @}

-  */ 

-

-

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

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-#endif /* _USBD_MSC_DATA_H_ */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

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

diff --git a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_scsi.h b/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_scsi.h
deleted file mode 100644
index dea247bca..000000000
--- a/stmhal/usbdev/class/cdc_msc_hid/inc/usbd_msc_scsi.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**

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

-  * @file    usbd_msc_scsi.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_scsi.c file

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

-  * @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.

-  *

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

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_MSC_SCSI_H

-#define __USBD_MSC_SCSI_H

-

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

-#include "usbd_def.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_SCSI

-  * @brief header file for the storage disk file

-  * @{

-  */ 

-

-/** @defgroup USBD_SCSI_Exported_Defines

-  * @{

-  */ 

-

-#define SENSE_LIST_DEEPTH                          4

-

-/* SCSI Commands */

-#define SCSI_FORMAT_UNIT                            0x04

-#define SCSI_INQUIRY                                0x12

-#define SCSI_MODE_SELECT6                           0x15

-#define SCSI_MODE_SELECT10                          0x55

-#define SCSI_MODE_SENSE6                            0x1A

-#define SCSI_MODE_SENSE10                           0x5A

-#define SCSI_ALLOW_MEDIUM_REMOVAL                   0x1E

-#define SCSI_READ6                                  0x08

-#define SCSI_READ10                                 0x28

-#define SCSI_READ12                                 0xA8

-#define SCSI_READ16                                 0x88

-

-#define SCSI_READ_CAPACITY10                        0x25

-#define SCSI_READ_CAPACITY16                        0x9E

-

-#define SCSI_REQUEST_SENSE                          0x03

-#define SCSI_START_STOP_UNIT                        0x1B

-#define SCSI_TEST_UNIT_READY                        0x00

-#define SCSI_WRITE6                                 0x0A

-#define SCSI_WRITE10                                0x2A

-#define SCSI_WRITE12                                0xAA

-#define SCSI_WRITE16                                0x8A

-

-#define SCSI_VERIFY10                               0x2F

-#define SCSI_VERIFY12                               0xAF

-#define SCSI_VERIFY16                               0x8F

-

-#define SCSI_SEND_DIAGNOSTIC                        0x1D

-#define SCSI_READ_FORMAT_CAPACITIES                 0x23

-

-#define NO_SENSE                                    0

-#define RECOVERED_ERROR                             1

-#define NOT_READY                                   2

-#define MEDIUM_ERROR                                3

-#define HARDWARE_ERROR                              4

-#define ILLEGAL_REQUEST                             5

-#define UNIT_ATTENTION                              6

-#define DATA_PROTECT                                7

-#define BLANK_CHECK                                 8

-#define VENDOR_SPECIFIC                             9

-#define COPY_ABORTED                               10

-#define ABORTED_COMMAND                            11

-#define VOLUME_OVERFLOW                            13

-#define MISCOMPARE                                 14

-

-

-#define INVALID_CDB                                 0x20

-#define INVALID_FIELED_IN_COMMAND                   0x24

-#define PARAMETER_LIST_LENGTH_ERROR                 0x1A

-#define INVALID_FIELD_IN_PARAMETER_LIST             0x26

-#define ADDRESS_OUT_OF_RANGE                        0x21

-#define MEDIUM_NOT_PRESENT                          0x3A

-#define MEDIUM_HAVE_CHANGED                         0x28

-#define WRITE_PROTECTED                             0x27 

-#define UNRECOVERED_READ_ERROR			    0x11

-#define WRITE_FAULT				    0x03 

-

-#define READ_FORMAT_CAPACITY_DATA_LEN               0x0C

-#define READ_CAPACITY10_DATA_LEN                    0x08

-#define MODE_SENSE10_DATA_LEN                       0x08

-#define MODE_SENSE6_DATA_LEN                        0x04

-#define REQUEST_SENSE_DATA_LEN                      0x12

-#define STANDARD_INQUIRY_DATA_LEN                   0x24

-#define BLKVFY                                      0x04

-

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

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

-

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_MSC_SCSI_H */

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

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

-