[USB] Clean up switch

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

Author: fpistm

cores/arduino/board.h

@@ -20,15 +20,7 @@ extern "C"{
 #include "timer.h"
 #include "twi.h"
 #include "uart.h"
-#ifdef USBCON
-#if !defined(USB_BASE) && !defined(USB_OTG_DEVICE_BASE)
-#error "This board does not support USB! Select 'None' in the 'Tools->USB interface' menu"
-#endif
-#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 "usbd_interface.h"
-#endif /* USBCON */
 
 void init( void ) ;
 #ifdef __cplusplus

cores/arduino/stm32/usb/usb_device_core.c

@@ -2,4 +2,4 @@
 
 #include "usbd_core.c"
 
-#endif //USBCON
+#endif /* USBCON */

cores/arduino/stm32/usb/usb_device_ctlreq.c

@@ -2,4 +2,4 @@
 
 #include "usbd_ctlreq.c"
 
-#endif //USBCON
+#endif /* USBCON */

cores/arduino/stm32/usb/usb_device_ioreq.c

@@ -2,4 +2,4 @@
 
 #include "usbd_ioreq.c"
 
-#endif //USBCON
+#endif /* USBCON */

cores/arduino/stm32/usb/usbd_conf.h

@@ -28,6 +28,14 @@
 #ifdef USBCON
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_def.h"
+
+#if !defined(USB_BASE) && !defined(USB_OTG_DEVICE_BASE)
+#error "This board does not support USB! Select 'None' in the 'Tools->USB interface' menu"
+#endif
+#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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

cores/arduino/stm32/usb/usbd_desc.c

@@ -20,7 +20,6 @@
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_core.h"
 #include "usbd_desc.h"
-#include "usbd_conf.h"
 #include "utils.h"
 
 /* Private typedef -----------------------------------------------------------*/

cores/arduino/stm32/usbd_interface.c

@@ -32,13 +32,16 @@
   *
   ******************************************************************************
   */
-
+#ifdef USBCON
+#include "usbd_desc.h"
 #include "usbd_interface.h"
+#ifdef USBD_USE_HID_COMPOSITE
+#include "usbd_hid_composite.h"
+#endif
 
 #ifdef __cplusplus
  extern "C" {
 #endif
-#ifdef USBCON
 
 /* USB Device Core handle declaration */
 #ifdef USBD_USE_HID_COMPOSITE
@@ -64,6 +67,7 @@ void usbd_interface_init(void)
 #endif /* USBD_USE_HID_COMPOSITE */
 }
 
+#ifdef USBD_USE_HID_COMPOSITE
 /**
   * @brief  Send HID mouse Report
   * @param  report pointer to report
@@ -72,9 +76,7 @@ void usbd_interface_init(void)
   */
 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 */
 }
 
 /**
@@ -85,14 +87,12 @@ void usbd_interface_mouse_sendReport(uint8_t *report, uint16_t len)
   */
 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 */
 #ifdef __cplusplus
 }
 #endif
-
+#endif /* USBCON */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

cores/arduino/stm32/usbd_interface.h

@@ -38,12 +38,6 @@
 #ifdef USBCON
 
 /* Includes ------------------------------------------------------------------*/
-#include "usbd_desc.h"
-
-#ifdef USBD_USE_HID_COMPOSITE
-#include "usbd_hid_composite.h"
-#endif
-
 #ifdef __cplusplus
  extern "C" {
 #endif
@@ -55,8 +49,10 @@
 /* Exported functions ------------------------------------------------------- */
 void usbd_interface_init(void);
 
+#ifdef USBD_USE_HID_COMPOSITE
 void usbd_interface_mouse_sendReport(uint8_t *report, uint16_t len);
 void usbd_interface_keyboard_sendReport(uint8_t *report, uint16_t len);
+#endif
 
 #ifdef __cplusplus
 }