[USB] Clean up devices interface

Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>

Author: fpistm

cores/arduino/board.h

@@ -27,7 +27,7 @@ extern "C"{
 #if defined(USE_USB_HS) && !defined(USB_OTG_HS)
 #error "This board does not support USB High Speed! Select 'Full Speed' in the 'Tools->USB interface' menu"
 #endif
-#include "usb_interface.h"
+#include "usbd_interface.h"
 #endif /* USBCON */
 
 void init( void ) ;

cores/arduino/stm32/usb_interface.c cores/arduino/stm32/usbd_interface.ccores/arduino/stm32/usb_interface.c renamed to cores/arduino/stm32/usbd_interface.c

@@ -1,10 +1,7 @@
 /**
   ******************************************************************************
-  * @file    usb_interface.c
-  * @author  WI6LABS
-  * @version V1.0.0
-  * @date    27-October-2016
-  * @brief   provide the usb interface
+  * @file    usbd_interface.c
+  * @brief   Provide the USB device interface
   *
   ******************************************************************************
   * @attention
@@ -36,84 +33,21 @@
   ******************************************************************************
   */
 
-/** @addtogroup CMSIS
-  * @{
-  */
-
-/** @addtogroup stm32f4xx_system
-  * @{
-  */
-
-/** @addtogroup STM32F4xx_System_Private_Includes
-  * @{
-  */
-#include "usb_interface.h"
-
-/**
-  * @}
-  */
+#include "usbd_interface.h"
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 #ifdef USBCON
-/** @addtogroup STM32F4xx_System_Private_TypesDefinitions
-  * @{
-  */
-/**
-  * @}
-  */
-
-/** @addtogroup STM32F4xx_System_Private_Defines
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32F4xx_System_Private_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32F4xx_System_Private_TypesDefinitions
-  * @{
-  */
-
-/**
-  * @}
-  */
 
-/** @addtogroup STM32F4xx_System_Private_Variables
-  * @{
-  */
 /* USB Device Core handle declaration */
 #ifdef USBD_USE_HID_COMPOSITE
-static USBD_HandleTypeDef hUSBD_Device_HID;
-#endif //USBD_USE_HID_COMPOSITE
-/**
-  * @}
-  */
-
-/** @addtogroup STM32F4xx_System_Private_FunctionPrototypes
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32F4xx_System_Private_Functions
-  * @{
-  */
+USBD_HandleTypeDef hUSBD_Device_HID;
+#endif /* USBD_USE_HID_COMPOSITE*/
 
 /**
-  * @brief  initialize the USB HID interface
-  * @param  HID_Desc : usb HID descriptor callbacks
+  * @brief  initialize USB devices
+  * @param  none
   * @retval none
   */
 void usbd_interface_init(void)
@@ -127,45 +61,36 @@ void usbd_interface_init(void)
 
   /* Start Device Process */
   USBD_Start(&hUSBD_Device_HID);
-#endif // USBD_USE_HID_COMPOSITE
+#endif /* USBD_USE_HID_COMPOSITE */
 }
 
 /**
-  * @brief  initialize the USB HID interface
-  * @param  HID_Desc : usb HID descriptor callbacks
+  * @brief  Send HID mouse Report
+  * @param  report pointer to report
+  * @param  len report lenght
   * @retval none
   */
 void usbd_interface_mouse_sendReport(uint8_t *report, uint16_t len)
 {
 #ifdef USBD_USE_HID_COMPOSITE
   USBD_HID_MOUSE_SendReport(&hUSBD_Device_HID, report, len);
-#endif // USBD_USE_HID_COMPOSITE
+#endif /* USBD_USE_HID_COMPOSITE */
 }
 
 /**
-  * @brief  initialize the USB HID interface
-  * @param  HID_Desc : usb HID descriptor callbacks
+  * @brief  Send HID keyboard Report
+  * @param  report pointer to report
+  * @param  len report lenght
   * @retval none
   */
 void usbd_interface_keyboard_sendReport(uint8_t *report, uint16_t len)
 {
 #ifdef USBD_USE_HID_COMPOSITE
   USBD_HID_KEYBOARD_SendReport(&hUSBD_Device_HID, report, len);
-#endif // USBD_USE_HID_COMPOSITE
+#endif /* USBD_USE_HID_COMPOSITE */
 }
 
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-#endif // USBCON
+#endif /* USBCON */
 #ifdef __cplusplus
 }
 #endif

cores/arduino/stm32/usb_interface.h cores/arduino/stm32/usbd_interface.hcores/arduino/stm32/usb_interface.h renamed to cores/arduino/stm32/usbd_interface.h

@@ -1,8 +1,7 @@
 /**
   ******************************************************************************
-  * @file    usb_interface.h
-  * @author  WI6LABS
-  * @brief   Header for usb interface
+  * @file    usbd_interface.h
+  * @brief   Header for USB device interface
   ******************************************************************************
   * @attention
   *
@@ -34,8 +33,8 @@
   */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USB_INTERFACE_H
-#define __USB_INTERFACE_H
+#ifndef __USBD_INTERFACE_H
+#define __USBD_INTERFACE_H
 #ifdef USBCON
 
 /* Includes ------------------------------------------------------------------*/
@@ -64,6 +63,6 @@ void usbd_interface_keyboard_sendReport(uint8_t *report, uint16_t len);
 #endif
 #endif /* USBCON */
 
-#endif /* __USB_INTERFACE_H */
+#endif /* __USBD_INTERFACE_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

libraries/Keyboard/src/Keyboard.cpp

@@ -20,7 +20,6 @@
 */
 
 #include "Keyboard.h"
-#include "usbd_hid_composite.h"
 
 #if defined(USBCON)
 

libraries/Mouse/src/Mouse.cpp

@@ -20,7 +20,6 @@
 */
 
 #include "Mouse.h"
-#include "usbd_hid_composite.h"
 
 #if defined(USBCON)