fix(usb): generalize HAL v2 device adapter

Author: cumin777

libraries/SrcWrapper/inc/stm32_def.h

@@ -203,11 +203,13 @@ __STATIC_INLINE void LL_RTC_SetBinMixBCDU(RTC_TypeDef *RTCx, uint32_t BinMixBcdU
 }
 #endif // STM32U0xx
 
-/* STM32G0xx, STM32U0xx and some STM32U5xx defined USB_DRD_FS */
+/* Some STM32 series define USB_DRD_FS instead of the legacy USB instance. */
 #if !defined(USB) && defined(USB_DRD_FS)
   #define USB USB_DRD_FS
   #define PinMap_USB PinMap_USB_DRD_FS
-  #if defined(STM32H5xx) || defined(STM32U0xx) ||\
+  #if defined(STM32C5xx)
+    #define USB_BASE USB_DRD_FS_BASE
+  #elif defined(STM32H5xx) || defined(STM32U0xx) ||\
     defined(STM32U3xx) || defined(STM32U5xx)
     #define USB_BASE USB_DRD_BASE
     #if !defined(__HAL_RCC_USB_CLK_ENABLE)

libraries/USBDevice/inc/usbd_conf.h

@@ -31,17 +31,15 @@ extern "C" {
 
 #if defined(USE_HALV2_DRIVER)
 #if !defined(STM32C5xx)
-#error "USB library is not yet compatible with this HALv2 driver."
+#warning "USB device support is currently implemented only for STM32C5xx HAL v2."
+#endif
 #endif
 
-/* STM32C5 uses the HAL v2 USB DRD FS PCD.  Keep the legacy USB name and
- * PMA buffer-kind names available to the common endpoint configuration. */
-#define USB USB_DRD_FS
+#if defined(STM32C5xx)
 #define PCD_SNG_BUF HAL_PCD_SNG_BUF
 #define PCD_DBL_BUF HAL_PCD_DBL_BUF
-#define USB_IRQn USB_DRD_FS_IRQn
-#define USB_IRQHandler USB_DRD_FS_IRQHandler
-#else
+#endif
+
 #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
@@ -50,8 +48,6 @@ extern "C" {
 #endif
 #if !defined(USB_BASE) && !defined(USB_OTG_FS) && defined(USB_OTG_HS) && !defined(USE_USB_HS)
 #error "This board support only USB High Speed! Select 'High Speed' or 'High Speed in Full Speed mode' in the 'Tools->USB interface' menu"
-#endif
-
 #endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -87,7 +83,7 @@ extern "C" {
 #elif defined(STM32G0B1xx) || defined(STM32G0C1xx)
 #define USB_IRQn USB_UCPD1_2_IRQn
 #define USB_IRQHandler USB_UCPD1_2_IRQHandler
-#elif defined(STM32C0xx) || defined(STM32H5xx) || defined(STM32U0xx)
+#elif defined(STM32C0xx) || defined(STM32C5xx) || defined(STM32H5xx) || defined(STM32U0xx)
 #define USB_IRQn USB_DRD_FS_IRQn
 #define USB_IRQHandler USB_DRD_FS_IRQHandler
 #elif defined(STM32U5xx) && !defined(USB_DRD_FS)

libraries/USBDevice/src/usbd_conf_c5.c libraries/USBDevice/src/usbd_confv2.clibraries/USBDevice/src/usbd_conf_c5.c renamed to libraries/USBDevice/src/usbd_confv2.c

@@ -1,11 +1,15 @@
 /**
   ******************************************************************************
-  * @file    usbd_conf_c5.c
-  * @brief   STM32C5 HAL v2 USB device low-level adapter.
+ * @file    usbd_confv2.c
+ * @brief   HAL v2 USB device low-level adapter.
   ******************************************************************************
   */
 
-#if defined(USBCON) && defined(USE_HALV2_DRIVER) && defined(STM32C5xx)
+#if defined(USBCON) && defined(USE_HALV2_DRIVER)
+
+#if !defined(STM32C5xx)
+#warning "USB device support is currently implemented only for STM32C5xx HAL v2."
+#else
 
 #include "usbd_core.h"
 #include "usbd_if.h"
@@ -20,20 +24,19 @@ static USBD_HandleTypeDef *g_pdev;
 static uint8_t g_stalled_in;
 static uint8_t g_stalled_out;
 
-static void USBD_C5_ErrorHandler(void)
+static void USBD_V2_ErrorHandler(void)
 {
   Error_Handler();
 }
 
-static void USBD_C5_ConfigPinsAndIrq(void)
+static void USBD_V2_ConfigPinsAndIrq(void)
 {
-  /* USB DRD FS owns PA11/PA12 and configures these fixed USB pins itself
-   * during peripheral initialization.  Do not configure a GPIO alternate
-   * function here: C5 USB differs from the older USB device IPs. */
+  /* The HAL v2 USB DRD FS PCD owns PA11/PA12 and configures these fixed USB
+   * pins during peripheral initialization. */
 
   HAL_RCC_USB_EnableClock();
-  HAL_CORTEX_NVIC_SetPriority(USB_DRD_FS_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
-  HAL_CORTEX_NVIC_EnableIRQ(USB_DRD_FS_IRQn);
+  HAL_CORTEX_NVIC_SetPriority(USB_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
+  HAL_CORTEX_NVIC_EnableIRQ(USB_IRQn);
 }
 
 void HAL_PCD_SetupStageCallback(hal_pcd_handle_t *hpcd)
@@ -100,7 +103,7 @@ void HAL_PCD_DisconnectCallback(hal_pcd_handle_t *hpcd)
   USBD_LL_DevDisconnected(g_pdev);
 }
 
-void USB_DRD_FS_IRQHandler(void)
+void USB_IRQHandler(void)
 {
   HAL_PCD_IRQHandler(&g_hpcd);
 }
@@ -119,24 +122,24 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
   };
 
   USBD_reenumerate();
-  USBD_C5_ConfigPinsAndIrq();
+  USBD_V2_ConfigPinsAndIrq();
 
   g_pdev = pdev;
   g_stalled_in = 0U;
   g_stalled_out = 0U;
   pdev->pData = &g_hpcd;
 
   if (HAL_PCD_Init(&g_hpcd, HAL_PCD_DRD_FS) != HAL_OK) {
-    USBD_C5_ErrorHandler();
+    USBD_V2_ErrorHandler();
   }
   if (HAL_PCD_SetConfig(&g_hpcd, &config) != HAL_OK) {
-    USBD_C5_ErrorHandler();
+    USBD_V2_ErrorHandler();
   }
 
   for (uint32_t i = 0U; i < (DEV_NUM_EP + 1U); i++) {
     if (HAL_PCD_PMAConfig(&g_hpcd, ep_def[i].ep_adress, ep_def[i].ep_kind,
                           ep_def[i].ep_size) != HAL_OK) {
-      USBD_C5_ErrorHandler();
+      USBD_V2_ErrorHandler();
     }
   }
 
@@ -146,7 +149,7 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
 USBD_StatusTypeDef USBD_LL_DeInit(USBD_HandleTypeDef *pdev)
 {
   (void)pdev;
-  HAL_CORTEX_NVIC_DisableIRQ(USB_DRD_FS_IRQn);
+  HAL_CORTEX_NVIC_DisableIRQ(USB_IRQn);
   HAL_PCD_DeInit(&g_hpcd);
   HAL_RCC_USB_DisableClock();
   g_pdev = NULL;
@@ -248,4 +251,5 @@ void USBD_LL_Delay(uint32_t delay)
   HAL_Delay(delay);
 }
 
-#endif /* USBCON && USE_HALV2_DRIVER && STM32C5xx */
+#endif /* STM32C5xx */
+#endif /* USBCON && USE_HALV2_DRIVER */