[USB CDC] Init interface as soon as possible

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/hw_config.c

@@ -37,6 +37,7 @@
   */
 #include "stm32_def.h"
 #include "hw_config.h"
+#include "usbd_if.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -54,6 +55,10 @@ void hw_config_init(void)
 
   // Configure the system clock
   SystemClock_Config();
+
+#if defined (USBCON) && defined(USBD_USE_CDC)
+  USBD_CDC_init();
+#endif
 }
 #ifdef __cplusplus
 }

cores/arduino/stm32/usb/cdc/usbd_cdc_if.c

@@ -36,6 +36,8 @@
 /* USB Device Core CDC handle declaration */
 USBD_HandleTypeDef hUSBD_Device_CDC;
 
+static bool CDC_initialized = false;
+
 /* Received Data over USB are stored in this buffer       */
 CDC_TransmitQueue_TypeDef TransmitQueue;
 CDC_ReceiveQueue_TypeDef ReceiveQueue;
@@ -217,23 +219,29 @@ static int8_t USBD_CDC_Transferred (void) {
 }
 
 void CDC_init(void) {
-   /* Init Device Library */
-  if (USBD_Init(&hUSBD_Device_CDC, &CDC_Desc, 0) == USBD_OK) {
-    /* Add Supported Class */
-    if (USBD_RegisterClass(&hUSBD_Device_CDC, USBD_CDC_CLASS) == USBD_OK) {
-      /* Add CDC Interface Class */
-      if (USBD_CDC_RegisterInterface(&hUSBD_Device_CDC, &USBD_CDC_fops) == USBD_OK) {
-        /* Start Device Process */
-        USBD_Start(&hUSBD_Device_CDC);
+  if (!CDC_initialized) {
+    /* Init Device Library */
+     if (USBD_Init(&hUSBD_Device_CDC, &CDC_Desc, 0) == USBD_OK) {
+       /* Add Supported Class */
+      if (USBD_RegisterClass(&hUSBD_Device_CDC, USBD_CDC_CLASS) == USBD_OK) {
+        /* Add CDC Interface Class */
+        if (USBD_CDC_RegisterInterface(&hUSBD_Device_CDC, &USBD_CDC_fops) == USBD_OK) {
+          /* Start Device Process */
+          USBD_Start(&hUSBD_Device_CDC);
+          CDC_initialized = true;
+        }
       }
     }
   }
 }
 
 void CDC_deInit(void) {
-  USBD_Stop(&hUSBD_Device_CDC);
-  USBD_CDC_DeInit();
-  USBD_DeInit(&hUSBD_Device_CDC);
+  if (CDC_initialized) {
+    USBD_Stop(&hUSBD_Device_CDC);
+    USBD_CDC_DeInit();
+    USBD_DeInit(&hUSBD_Device_CDC);
+    CDC_initialized = false;
+  }
 }
 
 void CDC_continue_transmit(void) {

cores/arduino/stm32/usb/usbd_if.c

@@ -8,6 +8,8 @@
 #ifdef USBCON
 
 #include "usbd_if.h"
+#include "usbd_cdc_if.h"
+
 /**
   * @brief  Force to re-enumerate USB
   * @param  None
@@ -38,4 +40,10 @@ void USBD_reenumerate(void)
 #endif /* USBD_REENUM_DISABLED */
 }
 
+#ifdef USBD_USE_CDC
+void USBD_CDC_init(void)
+{
+  CDC_init();
+}
+#endif /* USBD_USE_CDC */
 #endif /* USBCON */

cores/arduino/stm32/usb/usbd_if.h

@@ -24,7 +24,9 @@
 #endif
 
 void USBD_reenumerate(void);
-
+#ifdef USBD_USE_CDC
+void USBD_CDC_init(void);
+#endif
 #ifdef __cplusplus
 }
 #endif