fix(usb): double buffer management

also enable USB double buffer for HALv2

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

Author: fpistm

cores/arduino/stm32/stm32yyxx_hal_conf.h

@@ -148,6 +148,11 @@
       #undef USE_HAL_PCD_MODULE
     #endif
     #define USE_HAL_PCD_MODULE                    1U
+    #if defined(USBD_CDC_USE_SINGLE_BUFFER)
+      #define USE_HAL_PCD_USB_DOUBLE_BUFFER         0U
+    #else
+      #define USE_HAL_PCD_USB_DOUBLE_BUFFER         1U
+    #endif
   #endif
 
 #else /* HALv1 */

libraries/USBDevice/inc/usbd_ep_conf.h

@@ -25,6 +25,10 @@
 #include <stdint.h>
 #include "usbd_def.h"
 
+#if defined (USE_HAL_PCD_USB_DOUBLE_BUFFER) && (USE_HAL_PCD_USB_DOUBLE_BUFFER == 0)
+  #define USBD_CDC_USE_SINGLE_BUFFER
+#endif
+
 typedef struct {
   uint32_t ep_adress; /* Endpoint address */
   uint32_t ep_size;   /* Endpoint size */
@@ -69,21 +73,15 @@ typedef struct {
 
 #ifdef USBD_USE_CDC
 #define PMA_CDC_OUT_BASE    (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE)
-#if defined(STM32C5xx)
-/*
- * The C5 USB DRD FS peripheral is used with bulk double buffering disabled.
- * Keep each CDC endpoint in its own 64-byte PMA area; in particular, the
- * interrupt IN endpoint must not overlap the bulk IN data buffer.
- */
-#define PMA_CDC_OUT_ADDR    PMA_CDC_OUT_BASE
-#define PMA_CDC_IN_ADDR     (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE)
-#define PMA_CDC_CMD_ADDR    (PMA_CDC_IN_ADDR + USB_FS_MAX_PACKET_SIZE)
-#else
+#if !defined(USBD_CDC_USE_SINGLE_BUFFER)
 #define PMA_CDC_OUT_ADDR    ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \
                             (PMA_CDC_OUT_BASE << 16U))
 #define PMA_CDC_IN_ADDR     (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE * 2)
-#define PMA_CDC_CMD_ADDR    (PMA_CDC_IN_ADDR + CDC_CMD_PACKET_SIZE)
+#else
+#define PMA_CDC_OUT_ADDR    PMA_CDC_OUT_BASE
+#define PMA_CDC_IN_ADDR     (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE)
 #endif
+#define PMA_CDC_CMD_ADDR    (PMA_CDC_IN_ADDR + CDC_CMD_PACKET_SIZE)
 #endif /* USBD_USE_CDC */
 #ifdef USBD_USE_HID_COMPOSITE
   #define PMA_MOUSE_IN_ADDR   (PMA_EP0_IN_ADDR + HID_MOUSE_EPIN_SIZE)

libraries/USBDevice/src/usbd_ep_conf.c

@@ -37,7 +37,7 @@ const ep_desc_t ep_def[] = {
 #else
   {0x00,       PMA_EP0_OUT_ADDR, PCD_SNG_BUF},
   {0x80,       PMA_EP0_IN_ADDR,  PCD_SNG_BUF},
-#if !defined(STM32C5xx) && !defined(USBD_CDC_USE_SINGLE_BUFFER)
+#if !defined(USBD_CDC_USE_SINGLE_BUFFER)
   {CDC_OUT_EP, PMA_CDC_OUT_ADDR, PCD_DBL_BUF},
 #else
   {CDC_OUT_EP, PMA_CDC_OUT_ADDR, PCD_SNG_BUF},