ports: Make new ports/ sub-directory and move all ports there.

This is to keep the top-level directory clean, to make it clear what is
core and what is a port, and to allow the repository to grow with new ports
in a sustainable way.

6 files changed, 0 insertions, 1222 deletions

diff --git a/stmhal/usbhost/Core/Inc/usbh_conf_template.h b/stmhal/usbhost/Core/Inc/usbh_conf_template.h
deleted file mode 100644
index 8f85e1360..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_conf_template.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/**

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

-  * @file    USBH_conf.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   General low level driver configuration

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

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

-#define __USBH_CONF__H__

-

-#include "stm32f4xx.h"

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

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

-

-/** @addtogroup USBH_OTG_DRIVER

-  * @{

-  */

-  

-/** @defgroup USBH_CONF

-  * @brief usb otg low level driver configuration file

-  * @{

-  */ 

-

-/** @defgroup USBH_CONF_Exported_Defines

-  * @{

-  */ 

-

-#define USBH_MAX_NUM_ENDPOINTS                2

-#define USBH_MAX_NUM_INTERFACES               2

-#define USBH_MAX_NUM_CONFIGURATION            1

-#define USBH_KEEP_CFG_DESCRIPTOR              1

-#define USBH_MAX_NUM_SUPPORTED_CLASS          1

-#define USBH_MAX_SIZE_CONFIGURATION           0x200

-#define USBH_MAX_DATA_BUFFER                  0x200

-#define USBH_DEBUG_LEVEL                      2

-#define USBH_USE_OS                           1

-    

-/** @defgroup USBH_Exported_Macros

-  * @{

-  */ 

-

- /* Memory management macros */   

-#define USBH_malloc               malloc

-#define USBH_free                 free

-#define USBH_memset               memset

-#define USBH_memcpy               memcpy

-    

- /* DEBUG macros */  

-

-  

-#if (USBH_DEBUG_LEVEL > 0)

-#define  USBH_UsrLog(...)   printf(__VA_ARGS__);\

-                            printf("\n");

-#else

-#define USBH_UsrLog(...)   

-#endif 

-                            

-                            

-#if (USBH_DEBUG_LEVEL > 1)

-

-#define  USBH_ErrLog(...)   printf("ERROR: ") ;\

-                            printf(__VA_ARGS__);\

-                            printf("\n");

-#else

-#define USBH_ErrLog(...)   

-#endif 

-                            

-                            

-#if (USBH_DEBUG_LEVEL > 2)                         

-#define  USBH_DbgLog(...)   printf("DEBUG : ") ;\

-                            printf(__VA_ARGS__);\

-                            printf("\n");

-#else

-#define USBH_DbgLog(...)                         

-#endif

-                            

-/**

-  * @}

-  */ 

-   

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_CONF_Exported_Types

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_CONF_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CONF_Exported_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CONF_Exported_FunctionsPrototype

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-#endif //__USBH_CONF__H__

-

-

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

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

-

diff --git a/stmhal/usbhost/Core/Inc/usbh_core.h b/stmhal/usbhost/Core/Inc/usbh_core.h
deleted file mode 100644
index bc3da6d1f..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_core.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/**

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

-  * @file    usbh_core.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   Header file for usbh_core.c

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

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

-#ifndef __USBH_CORE_H

-#define __USBH_CORE_H

-

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

-#include "usbh_conf.h"

-#include "usbh_def.h"

-#include "usbh_ioreq.h"

-#include "usbh_pipes.h"

-#include "usbh_ctlreq.h"

-

-/** @addtogroup USBH_LIB

-  * @{

-  */

-

-/** @addtogroup USBH_LIB_CORE

-* @{

-*/

-  

-/** @defgroup USBH_CORE

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

-  * @{

-  */ 

-

-

-/** @defgroup USBH_CORE_Exported_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-#define HOST_USER_SELECT_CONFIGURATION          1

-#define HOST_USER_CLASS_ACTIVE                  2

-#define HOST_USER_CLASS_SELECTED                3

-#define HOST_USER_CONNECTION                    4

-#define HOST_USER_DISCONNECTION                 5

-

-

-

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBH_CORE_Exported_Macros

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CORE_Exported_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CORE_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-  

-USBH_StatusTypeDef  USBH_Init(USBH_HandleTypeDef *phost, void (*pUsrFunc)(USBH_HandleTypeDef *phost, uint8_t ), uint8_t id);

-USBH_StatusTypeDef  USBH_DeInit(USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef  USBH_RegisterClass(USBH_HandleTypeDef *phost, USBH_ClassTypeDef *pclass);

-USBH_StatusTypeDef  USBH_SelectInterface(USBH_HandleTypeDef *phost, uint8_t interface);

-uint8_t             USBH_FindInterface(USBH_HandleTypeDef *phost, 

-                                            uint8_t Class, 

-                                            uint8_t SubClass, 

-                                            uint8_t Protocol);

-uint8_t             USBH_GetActiveClass(USBH_HandleTypeDef *phost);

-

-uint8_t             USBH_FindInterfaceIndex(USBH_HandleTypeDef *phost, 

-                                            uint8_t interface_number, 

-                                            uint8_t alt_settings);

-

-USBH_StatusTypeDef  USBH_Start            (USBH_HandleTypeDef *phost); 

-USBH_StatusTypeDef  USBH_Stop             (USBH_HandleTypeDef *phost); 

-USBH_StatusTypeDef  USBH_Process          (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef  USBH_ReEnumerate      (USBH_HandleTypeDef *phost);

-

-/* USBH Low Level Driver */

-USBH_StatusTypeDef   USBH_LL_Init         (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef   USBH_LL_DeInit       (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef   USBH_LL_Start        (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef   USBH_LL_Stop         (USBH_HandleTypeDef *phost);

-

-USBH_StatusTypeDef   USBH_LL_Connect      (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef   USBH_LL_Disconnect   (USBH_HandleTypeDef *phost);

-USBH_SpeedTypeDef    USBH_LL_GetSpeed     (USBH_HandleTypeDef *phost);

-USBH_StatusTypeDef   USBH_LL_ResetPort    (USBH_HandleTypeDef *phost);

-uint32_t             USBH_LL_GetLastXferSize   (USBH_HandleTypeDef *phost, uint8_t ); 

-USBH_StatusTypeDef   USBH_LL_DriverVBUS   (USBH_HandleTypeDef *phost, uint8_t );

-

-USBH_StatusTypeDef   USBH_LL_OpenPipe     (USBH_HandleTypeDef *phost, uint8_t, uint8_t, uint8_t, uint8_t , uint8_t, uint16_t ); 

-USBH_StatusTypeDef   USBH_LL_ClosePipe    (USBH_HandleTypeDef *phost, uint8_t );   

-USBH_StatusTypeDef   USBH_LL_SubmitURB    (USBH_HandleTypeDef *phost, uint8_t, uint8_t,uint8_t,  uint8_t, uint8_t*, uint16_t, uint8_t ); 

-USBH_URBStateTypeDef USBH_LL_GetURBState  (USBH_HandleTypeDef *phost, uint8_t ); 

-#if (USBH_USE_OS == 1)

-USBH_StatusTypeDef  USBH_LL_NotifyURBChange (USBH_HandleTypeDef *phost);

-#endif

-USBH_StatusTypeDef   USBH_LL_SetToggle    (USBH_HandleTypeDef *phost, uint8_t , uint8_t );

-uint8_t              USBH_LL_GetToggle    (USBH_HandleTypeDef *phost, uint8_t );

-

-/* USBH Time base */

-void                 USBH_Delay (uint32_t Delay);

-void                 USBH_LL_SetTimer     (USBH_HandleTypeDef *phost, uint32_t );  

-void                 USBH_LL_IncTimer     (USBH_HandleTypeDef *phost);  

-/**

-  * @}

-  */ 

-

-#endif /* __CORE_H */

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

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

-

-

-

diff --git a/stmhal/usbhost/Core/Inc/usbh_ctlreq.h b/stmhal/usbhost/Core/Inc/usbh_ctlreq.h
deleted file mode 100644
index cd61755e3..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_ctlreq.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/**

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

-  * @file    usbh_ctlreq.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   Header file for usbh_ctlreq.c

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

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

-#ifndef __USBH_CTLREQ_H

-#define __USBH_CTLREQ_H

-

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

-#include "usbh_core.h"

-

-/** @addtogroup USBH_LIB

-  * @{

-  */

-

-/** @addtogroup USBH_LIB_CORE

-* @{

-*/

-  

-/** @defgroup USBH_CTLREQ

-  * @brief This file is the 

-  * @{

-  */ 

-

-

-/** @defgroup USBH_CTLREQ_Exported_Defines

-  * @{

-  */

-/*Standard Feature Selector for clear feature command*/

-#define FEATURE_SELECTOR_ENDPOINT         0X00

-#define FEATURE_SELECTOR_DEVICE           0X01

-

-

-#define INTERFACE_DESC_TYPE               0x04

-#define ENDPOINT_DESC_TYPE                0x05

-#define INTERFACE_DESC_SIZE               0x09

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_CTLREQ_Exported_Types

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_CTLREQ_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CTLREQ_Exported_Variables

-  * @{

-  */ 

-extern uint8_t USBH_CfgDesc[512];

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_CTLREQ_Exported_FunctionsPrototype

-  * @{

-  */

-USBH_StatusTypeDef USBH_CtlReq     (USBH_HandleTypeDef *phost, 

-                             uint8_t             *buff,

-                             uint16_t            length);

-

-USBH_StatusTypeDef USBH_GetDescriptor(USBH_HandleTypeDef *phost,                                

-                               uint8_t  req_type,

-                               uint16_t value_idx, 

-                               uint8_t* buff, 

-                               uint16_t length );

-

-USBH_StatusTypeDef USBH_Get_DevDesc(USBH_HandleTypeDef *phost,

-                             uint8_t length);

-

-USBH_StatusTypeDef USBH_Get_StringDesc(USBH_HandleTypeDef *phost,                              

-                                uint8_t string_index, 

-                                uint8_t *buff, 

-                                uint16_t length);

-

-USBH_StatusTypeDef USBH_SetCfg(USBH_HandleTypeDef *phost, 

-                        uint16_t configuration_value);

-

-USBH_StatusTypeDef USBH_Get_CfgDesc(USBH_HandleTypeDef *phost,                              

-                             uint16_t length);

-

-USBH_StatusTypeDef USBH_SetAddress(USBH_HandleTypeDef *phost,                          

-                            uint8_t DeviceAddress);

-

-USBH_StatusTypeDef USBH_SetInterface(USBH_HandleTypeDef *phost, 

-                        uint8_t ep_num, uint8_t altSetting);

-

-USBH_StatusTypeDef USBH_ClrFeature(USBH_HandleTypeDef *phost, 

-                                   uint8_t ep_num);

-

-USBH_DescHeader_t      *USBH_GetNextDesc (uint8_t   *pbuf, 

-                                                  uint16_t  *ptr);

-/**

-  * @}

-  */ 

-

-#endif /* __USBH_CTLREQ_H */

-

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

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

-

-

diff --git a/stmhal/usbhost/Core/Inc/usbh_def.h b/stmhal/usbhost/Core/Inc/usbh_def.h
deleted file mode 100644
index cf24d69f3..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_def.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/**

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

-  * @file    usbh_def.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   Definitions used in the USB host library

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

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

-  *

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

-  */ 

-

-/** @addtogroup USBH_LIB

-  * @{

-  */

-

-/** @addtogroup USBH_LIB_CORE

-* @{

-*/

-  

-/** @defgroup USBH_DEF

-  * @brief This file is includes USB descriptors

-  * @{

-  */ 

-

-#ifndef  USBH_DEF_H

-#define  USBH_DEF_H

-

-#include "usbh_conf.h"

-

-#ifndef NULL

-#define NULL ((void *)0)

-#endif

-

-#ifndef FALSE

-#define FALSE 0

-#endif

-

-#ifndef TRUE

-#define TRUE 1

-#endif

-

-

-#define ValBit(VAR,POS)                               (VAR & (1 << POS))

-#define SetBit(VAR,POS)                               (VAR |= (1 << POS))

-#define ClrBit(VAR,POS)                               (VAR &= ((1 << POS)^255))

-

-#define  LE16(addr)             (((uint16_t)(*((uint8_t *)(addr))))\

-                                + (((uint16_t)(*(((uint8_t *)(addr)) + 1))) << 8))

-

-#define  LE16S(addr)              (uint16_t)(LE16((addr)))

-

-#define  LE32(addr)              ((((uint32_t)(*(((uint8_t *)(addr)) + 0))) + \

-                                              (((uint32_t)(*(((uint8_t *)(addr)) + 1))) << 8) + \

-                                              (((uint32_t)(*(((uint8_t *)(addr)) + 2))) << 16) + \

-                                              (((uint32_t)(*(((uint8_t *)(addr)) + 3))) << 24)))

-

-#define  LE64(addr)              ((((uint64_t)(*(((uint8_t *)(addr)) + 0))) + \

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 1))) <<  8) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 2))) << 16) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 3))) << 24) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 4))) << 32) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 5))) << 40) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 6))) << 48) +\

-                                              (((uint64_t)(*(((uint8_t *)(addr)) + 7))) << 56)))

-

-

-#define  LE24(addr)              ((((uint32_t)(*(((uint8_t *)(addr)) + 0))) + \

-                                              (((uint32_t)(*(((uint8_t *)(addr)) + 1))) << 8) + \

-                                              (((uint32_t)(*(((uint8_t *)(addr)) + 2))) << 16)))

-

-

-#define  LE32S(addr)              (int32_t)(LE32((addr)))

-

-

-

-#define  USB_LEN_DESC_HDR                               0x02

-#define  USB_LEN_DEV_DESC                               0x12

-#define  USB_LEN_CFG_DESC                               0x09

-#define  USB_LEN_IF_DESC                                0x09

-#define  USB_LEN_EP_DESC                                0x07

-#define  USB_LEN_OTG_DESC                               0x03

-#define  USB_LEN_SETUP_PKT                              0x08

-

-/* bmRequestType :D7 Data Phase Transfer Direction  */

-#define  USB_REQ_DIR_MASK                               0x80

-#define  USB_H2D                                        0x00

-#define  USB_D2H                                        0x80

-

-/* bmRequestType D6..5 Type */

-#define  USB_REQ_TYPE_STANDARD                          0x00

-#define  USB_REQ_TYPE_CLASS                             0x20

-#define  USB_REQ_TYPE_VENDOR                            0x40

-#define  USB_REQ_TYPE_RESERVED                          0x60

-

-/* bmRequestType D4..0 Recipient */

-#define  USB_REQ_RECIPIENT_DEVICE                       0x00

-#define  USB_REQ_RECIPIENT_INTERFACE                    0x01

-#define  USB_REQ_RECIPIENT_ENDPOINT                     0x02

-#define  USB_REQ_RECIPIENT_OTHER                        0x03

-

-/* Table 9-4. Standard Request Codes  */

-/* bRequest , Value */

-#define  USB_REQ_GET_STATUS                             0x00

-#define  USB_REQ_CLEAR_FEATURE                          0x01

-#define  USB_REQ_SET_FEATURE                            0x03

-#define  USB_REQ_SET_ADDRESS                            0x05

-#define  USB_REQ_GET_DESCRIPTOR                         0x06

-#define  USB_REQ_SET_DESCRIPTOR                         0x07

-#define  USB_REQ_GET_CONFIGURATION                      0x08

-#define  USB_REQ_SET_CONFIGURATION                      0x09

-#define  USB_REQ_GET_INTERFACE                          0x0A

-#define  USB_REQ_SET_INTERFACE                          0x0B

-#define  USB_REQ_SYNCH_FRAME                            0x0C

-

-/* Table 9-5. Descriptor Types of USB Specifications */

-#define  USB_DESC_TYPE_DEVICE                              1

-#define  USB_DESC_TYPE_CONFIGURATION                       2

-#define  USB_DESC_TYPE_STRING                              3

-#define  USB_DESC_TYPE_INTERFACE                           4

-#define  USB_DESC_TYPE_ENDPOINT                            5

-#define  USB_DESC_TYPE_DEVICE_QUALIFIER                    6

-#define  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION           7

-#define  USB_DESC_TYPE_INTERFACE_POWER                     8

-#define  USB_DESC_TYPE_HID                                 0x21

-#define  USB_DESC_TYPE_HID_REPORT                          0x22

-

-

-#define USB_DEVICE_DESC_SIZE                               18

-#define USB_CONFIGURATION_DESC_SIZE                        9

-#define USB_HID_DESC_SIZE                                  9

-#define USB_INTERFACE_DESC_SIZE                            9

-#define USB_ENDPOINT_DESC_SIZE                             7

-

-/* Descriptor Type and Descriptor Index  */

-/* Use the following values when calling the function USBH_GetDescriptor  */

-#define  USB_DESC_DEVICE                    ((USB_DESC_TYPE_DEVICE << 8) & 0xFF00)

-#define  USB_DESC_CONFIGURATION             ((USB_DESC_TYPE_CONFIGURATION << 8) & 0xFF00)

-#define  USB_DESC_STRING                    ((USB_DESC_TYPE_STRING << 8) & 0xFF00)

-#define  USB_DESC_INTERFACE                 ((USB_DESC_TYPE_INTERFACE << 8) & 0xFF00)

-#define  USB_DESC_ENDPOINT                  ((USB_DESC_TYPE_INTERFACE << 8) & 0xFF00)

-#define  USB_DESC_DEVICE_QUALIFIER          ((USB_DESC_TYPE_DEVICE_QUALIFIER << 8) & 0xFF00)

-#define  USB_DESC_OTHER_SPEED_CONFIGURATION ((USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION << 8) & 0xFF00)

-#define  USB_DESC_INTERFACE_POWER           ((USB_DESC_TYPE_INTERFACE_POWER << 8) & 0xFF00)

-#define  USB_DESC_HID_REPORT                ((USB_DESC_TYPE_HID_REPORT << 8) & 0xFF00)

-#define  USB_DESC_HID                       ((USB_DESC_TYPE_HID << 8) & 0xFF00)

-

-

-#define  USB_EP_TYPE_CTRL                               0x00

-#define  USB_EP_TYPE_ISOC                               0x01

-#define  USB_EP_TYPE_BULK                               0x02

-#define  USB_EP_TYPE_INTR                               0x03

-

-#define  USB_EP_DIR_OUT                                 0x00

-#define  USB_EP_DIR_IN                                  0x80

-#define  USB_EP_DIR_MSK                                 0x80  

-

-#define USBH_MAX_PIPES_NBR                              15                                                

-

-

-

-#define USBH_DEVICE_ADDRESS_DEFAULT                     0

-#define USBH_MAX_ERROR_COUNT                            2

-#define USBH_DEVICE_ADDRESS                             1

-

-

-/**

-  * @}

-  */ 

-

-

-#define USBH_CONFIGURATION_DESCRIPTOR_SIZE (USB_CONFIGURATION_DESC_SIZE \

-                                           + USB_INTERFACE_DESC_SIZE\

-                                           + (USBH_MAX_NUM_ENDPOINTS * USB_ENDPOINT_DESC_SIZE))

-

-

-#define CONFIG_DESC_wTOTAL_LENGTH (ConfigurationDescriptorData.ConfigDescfield.\

-                                          ConfigurationDescriptor.wTotalLength)

-

-

-typedef union

-{

-  uint16_t w;

-  struct BW

-  {

-    uint8_t msb;

-    uint8_t lsb;

-  }

-  bw;

-}

-uint16_t_uint8_t;

-

-

-typedef union _USB_Setup

-{

-  uint32_t d8[2];

-  

-  struct _SetupPkt_Struc

-  {

-    uint8_t           bmRequestType;

-    uint8_t           bRequest;

-    uint16_t_uint8_t  wValue;

-    uint16_t_uint8_t  wIndex;

-    uint16_t_uint8_t  wLength;

-  } b;

-} 

-USB_Setup_TypeDef;  

-

-typedef  struct  _DescHeader 

-{

-    uint8_t  bLength;       

-    uint8_t  bDescriptorType;

-} 

-USBH_DescHeader_t;

-

-typedef struct _DeviceDescriptor

-{

-  uint8_t   bLength;

-  uint8_t   bDescriptorType;

-  uint16_t  bcdUSB;        /* USB Specification Number which device complies too */

-  uint8_t   bDeviceClass;

-  uint8_t   bDeviceSubClass; 

-  uint8_t   bDeviceProtocol;

-  /* If equal to Zero, each interface specifies its own class

-  code if equal to 0xFF, the class code is vendor specified.

-  Otherwise field is valid Class Code.*/

-  uint8_t   bMaxPacketSize;

-  uint16_t  idVendor;      /* Vendor ID (Assigned by USB Org) */

-  uint16_t  idProduct;     /* Product ID (Assigned by Manufacturer) */

-  uint16_t  bcdDevice;     /* Device Release Number */

-  uint8_t   iManufacturer;  /* Index of Manufacturer String Descriptor */

-  uint8_t   iProduct;       /* Index of Product String Descriptor */

-  uint8_t   iSerialNumber;  /* Index of Serial Number String Descriptor */

-  uint8_t   bNumConfigurations; /* Number of Possible Configurations */

-}

-USBH_DevDescTypeDef;

-

-typedef struct _EndpointDescriptor

-{

-  uint8_t   bLength;

-  uint8_t   bDescriptorType;

-  uint8_t   bEndpointAddress;   /* indicates what endpoint this descriptor is describing */

-  uint8_t   bmAttributes;       /* specifies the transfer type. */

-  uint16_t  wMaxPacketSize;    /* Maximum Packet Size this endpoint is capable of sending or receiving */  

-  uint8_t   bInterval;          /* is used to specify the polling interval of certain transfers. */

-}

-USBH_EpDescTypeDef;

-

-typedef struct _InterfaceDescriptor

-{

-  uint8_t bLength;

-  uint8_t bDescriptorType;

-  uint8_t bInterfaceNumber;

-  uint8_t bAlternateSetting;    /* Value used to select alternative setting */

-  uint8_t bNumEndpoints;        /* Number of Endpoints used for this interface */

-  uint8_t bInterfaceClass;      /* Class Code (Assigned by USB Org) */

-  uint8_t bInterfaceSubClass;   /* Subclass Code (Assigned by USB Org) */

-  uint8_t bInterfaceProtocol;   /* Protocol Code */

-  uint8_t iInterface;           /* Index of String Descriptor Describing this interface */

-  USBH_EpDescTypeDef               Ep_Desc[USBH_MAX_NUM_ENDPOINTS];   

-}

-USBH_InterfaceDescTypeDef;

-

-

-typedef struct _ConfigurationDescriptor

-{

-  uint8_t   bLength;

-  uint8_t   bDescriptorType;

-  uint16_t  wTotalLength;        /* Total Length of Data Returned */

-  uint8_t   bNumInterfaces;       /* Number of Interfaces */

-  uint8_t   bConfigurationValue;  /* Value to use as an argument to select this configuration*/

-  uint8_t   iConfiguration;       /*Index of String Descriptor Describing this configuration */

-  uint8_t   bmAttributes;         /* D7 Bus Powered , D6 Self Powered, D5 Remote Wakeup , D4..0 Reserved (0)*/

-  uint8_t   bMaxPower;            /*Maximum Power Consumption */

-  USBH_InterfaceDescTypeDef        Itf_Desc[USBH_MAX_NUM_INTERFACES];

-}

-USBH_CfgDescTypeDef;

-

-

-/* Following USB Host status */

-typedef enum 

-{

-  USBH_OK   = 0,

-  USBH_BUSY,

-  USBH_FAIL,

-  USBH_NOT_SUPPORTED,

-  USBH_UNRECOVERED_ERROR,

-  USBH_ERROR_SPEED_UNKNOWN,

-}USBH_StatusTypeDef;

-

-

-/** @defgroup USBH_CORE_Exported_Types

-  * @{

-  */

-

-typedef enum 

-{

-  USBH_SPEED_HIGH  = 0,

-  USBH_SPEED_FULL  = 1,

-  USBH_SPEED_LOW   = 2,  

-    

-}USBH_SpeedTypeDef;

-

-/* Following states are used for gState */

-typedef enum 

-{

-  HOST_IDLE =0,

-  HOST_DEV_WAIT_FOR_ATTACHMENT,  

-  HOST_DEV_ATTACHED,

-  HOST_DEV_DISCONNECTED,  

-  HOST_DETECT_DEVICE_SPEED,

-  HOST_ENUMERATION,

-  HOST_CLASS_REQUEST,  

-  HOST_INPUT,

-  HOST_SET_CONFIGURATION,

-  HOST_CHECK_CLASS,

-  HOST_CLASS,

-  HOST_SUSPENDED,

-  HOST_ABORT_STATE,  

-}HOST_StateTypeDef;  

-

-/* Following states are used for EnumerationState */

-typedef enum 

-{

-  ENUM_IDLE = 0,

-  ENUM_GET_FULL_DEV_DESC,

-  ENUM_SET_ADDR,

-  ENUM_GET_CFG_DESC,

-  ENUM_GET_FULL_CFG_DESC,

-  ENUM_GET_MFC_STRING_DESC,

-  ENUM_GET_PRODUCT_STRING_DESC,

-  ENUM_GET_SERIALNUM_STRING_DESC,

-} ENUM_StateTypeDef;  

-

-/* Following states are used for CtrlXferStateMachine */

-typedef enum 

-{

-  CTRL_IDLE =0,

-  CTRL_SETUP,

-  CTRL_SETUP_WAIT,

-  CTRL_DATA_IN,

-  CTRL_DATA_IN_WAIT,

-  CTRL_DATA_OUT,

-  CTRL_DATA_OUT_WAIT,

-  CTRL_STATUS_IN,

-  CTRL_STATUS_IN_WAIT,

-  CTRL_STATUS_OUT,

-  CTRL_STATUS_OUT_WAIT,

-  CTRL_ERROR,

-  CTRL_STALLED,

-  CTRL_COMPLETE    

-}CTRL_StateTypeDef;  

-

-

-/* Following states are used for RequestState */

-typedef enum 

-{

-  CMD_IDLE =0,

-  CMD_SEND,

-  CMD_WAIT

-} CMD_StateTypeDef;  

-

-typedef enum {

-  USBH_URB_IDLE = 0,

-  USBH_URB_DONE,

-  USBH_URB_NOTREADY,

-  USBH_URB_NYET,  

-  USBH_URB_ERROR,

-  USBH_URB_STALL

-}USBH_URBStateTypeDef;

-

-typedef enum

-{

-  USBH_PORT_EVENT = 1,  

-  USBH_URB_EVENT,

-  USBH_CONTROL_EVENT,    

-  USBH_CLASS_EVENT,     

-  USBH_STATE_CHANGED_EVENT,   

-}

-USBH_OSEventTypeDef;

-

-/* Control request structure */

-typedef struct 

-{

-  uint8_t               pipe_in; 

-  uint8_t               pipe_out; 

-  uint8_t               pipe_size;  

-  uint8_t               *buff;

-  uint16_t              length;

-  uint16_t              timer;  

-  USB_Setup_TypeDef     setup;

-  CTRL_StateTypeDef     state;  

-  uint8_t               errorcount;  

-

-} USBH_CtrlTypeDef;

-

-/* Attached device structure */

-typedef struct

-{

-#if (USBH_KEEP_CFG_DESCRIPTOR == 1)  

-  uint8_t                           CfgDesc_Raw[USBH_MAX_SIZE_CONFIGURATION];

-#endif  

-  uint8_t                           Data[USBH_MAX_DATA_BUFFER];

-  uint8_t                           address;

-  uint8_t                           speed;

-  __IO uint8_t                      is_connected;    

-  uint8_t                           current_interface;   

-  USBH_DevDescTypeDef               DevDesc;

-  USBH_CfgDescTypeDef               CfgDesc; 

-  

-}USBH_DeviceTypeDef;

-

-struct _USBH_HandleTypeDef;

-

-/* USB Host Class structure */

-typedef struct 

-{

-  const char          *Name;

-  uint8_t              ClassCode;  

-  USBH_StatusTypeDef  (*Init)        (struct _USBH_HandleTypeDef *phost);

-  USBH_StatusTypeDef  (*DeInit)      (struct _USBH_HandleTypeDef *phost);

-  USBH_StatusTypeDef  (*Requests)    (struct _USBH_HandleTypeDef *phost);  

-  USBH_StatusTypeDef  (*BgndProcess) (struct _USBH_HandleTypeDef *phost);

-  USBH_StatusTypeDef  (*SOFProcess) (struct _USBH_HandleTypeDef *phost);  

-  void*                pData;

-} USBH_ClassTypeDef;

-

-/* USB Host handle structure */

-typedef struct _USBH_HandleTypeDef

-{

-  __IO HOST_StateTypeDef     gState;       /*  Host State Machine Value */

-  ENUM_StateTypeDef     EnumState;    /* Enumeration state Machine */

-  CMD_StateTypeDef      RequestState;       

-  USBH_CtrlTypeDef      Control;

-  USBH_DeviceTypeDef    device;

-  USBH_ClassTypeDef*    pClass[USBH_MAX_NUM_SUPPORTED_CLASS];

-  USBH_ClassTypeDef*    pActiveClass;

-  uint32_t              ClassNumber;

-  uint32_t              Pipes[15];

-  __IO uint32_t         Timer;

-  uint8_t               id;  

-  void*                 pData;                  

-  void                 (* pUser )(struct _USBH_HandleTypeDef *pHandle, uint8_t id);

-  

-#if (USBH_USE_OS == 1)

-  osMessageQId          os_event;   

-  osThreadId            thread; 

-#endif  

-  

-} USBH_HandleTypeDef;

-

-

-#if  defined ( __GNUC__ )

-  #ifndef __weak

-    #define __weak   __attribute__((weak))

-  #endif /* __weak */

-  #ifndef __packed

-    #define __packed __attribute__((__packed__))

-  #endif /* __packed */

-#endif /* __GNUC__ */

-

-#endif

-

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

-

diff --git a/stmhal/usbhost/Core/Inc/usbh_ioreq.h b/stmhal/usbhost/Core/Inc/usbh_ioreq.h
deleted file mode 100644
index 463d4ea37..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_ioreq.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**

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

-  * @file    usbh_ioreq.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   Header file for usbh_ioreq.c

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

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

-#ifndef __USBH_IOREQ_H

-#define __USBH_IOREQ_H

-

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

-#include "usbh_conf.h"

-#include "usbh_core.h"

-/** @addtogroup USBH_LIB

-  * @{

-  */

-

-/** @addtogroup USBH_LIB_CORE

-* @{

-*/

-  

-/** @defgroup USBH_IOREQ

-  * @brief This file is the header file for usbh_ioreq.c

-  * @{

-  */ 

-

-

-/** @defgroup USBH_IOREQ_Exported_Defines

-  * @{

-  */

-    

-#define USBH_PID_SETUP                            0

-#define USBH_PID_DATA                             1

-

-#define USBH_EP_CONTROL                           0

-#define USBH_EP_ISO                               1

-#define USBH_EP_BULK                              2

-#define USBH_EP_INTERRUPT                         3

-

-#define USBH_SETUP_PKT_SIZE                       8

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_IOREQ_Exported_Types

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_IOREQ_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_IOREQ_Exported_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_IOREQ_Exported_FunctionsPrototype

-  * @{

-  */

-USBH_StatusTypeDef USBH_CtlSendSetup (USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint8_t hc_num);

-

-USBH_StatusTypeDef USBH_CtlSendData (USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint16_t length,

-                                uint8_t hc_num,

-                                uint8_t do_ping );

-

-USBH_StatusTypeDef USBH_CtlReceiveData(USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint16_t length,

-                                uint8_t hc_num);

-

-USBH_StatusTypeDef USBH_BulkReceiveData(USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint16_t length,

-                                uint8_t hc_num);

-

-USBH_StatusTypeDef USBH_BulkSendData (USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint16_t length,

-                                uint8_t hc_num,

-                                uint8_t do_ping );

-

-USBH_StatusTypeDef USBH_InterruptReceiveData(USBH_HandleTypeDef *phost, 

-                                       uint8_t             *buff, 

-                                       uint8_t             length,

-                                       uint8_t             hc_num);

-

-USBH_StatusTypeDef USBH_InterruptSendData(USBH_HandleTypeDef *phost, 

-                                    uint8_t *buff, 

-                                    uint8_t length,

-                                    uint8_t hc_num);

-

-

-USBH_StatusTypeDef USBH_IsocReceiveData(USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint32_t length,

-                                uint8_t hc_num);

-

-

-USBH_StatusTypeDef USBH_IsocSendData(USBH_HandleTypeDef *phost, 

-                                uint8_t *buff, 

-                                uint32_t length,

-                                uint8_t hc_num);

-/**

-  * @}

-  */ 

-

-#endif /* __USBH_IOREQ_H */

-

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */

-

-/**

-* @}

-*/ 

-

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

-

-

diff --git a/stmhal/usbhost/Core/Inc/usbh_pipes.h b/stmhal/usbhost/Core/Inc/usbh_pipes.h
deleted file mode 100644
index d72cd5387..000000000
--- a/stmhal/usbhost/Core/Inc/usbh_pipes.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/**

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

-  * @file    usbh_PIPES.h

-  * @author  MCD Application Team

-  * @version V3.0.0

-  * @date    18-February-2014

-  * @brief   Header file for usbh_pipes.c

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

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

-#ifndef __USBH_PIPES_H

-#define __USBH_PIPES_H

-

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

-#include "usbh_core.h"

-

-/** @addtogroup USBH_LIB

-  * @{

-  */

-

-/** @addtogroup USBH_LIB_CORE

-* @{

-*/

-  

-/** @defgroup USBH_PIPES

-  * @brief This file is the header file for usbh_PIPES.c

-  * @{

-  */ 

-

-/** @defgroup USBH_PIPES_Exported_Defines

-  * @{

-  */

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_PIPES_Exported_Types

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBH_PIPES_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_PIPES_Exported_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBH_PIPES_Exported_FunctionsPrototype

-  * @{

-  */

-

-USBH_StatusTypeDef USBH_OpenPipe  (USBH_HandleTypeDef *phost,

-                            uint8_t ch_num,

-                            uint8_t epnum,                            

-                            uint8_t dev_address,

-                            uint8_t speed,

-                            uint8_t ep_type,

-                            uint16_t mps);

-

-USBH_StatusTypeDef USBH_ClosePipe  (USBH_HandleTypeDef *phost,

-                            uint8_t pipe_num);

-

-uint8_t USBH_AllocPipe  (USBH_HandleTypeDef *phost, 

-                         uint8_t ep_addr);

-

-USBH_StatusTypeDef USBH_FreePipe  (USBH_HandleTypeDef *phost, 

-                                   uint8_t idx);

-

-

-

-

-/**

-  * @}

-  */ 

-

-

-

-#endif /* __USBH_PIPES_H */

-

-

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

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

-

-