core(USB): add STM32H5xx support

fpistm · fpistm · commit f3247f97a6f7 · 2023-05-24T18:19:45.000+02:00
Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/stm32/stm32_def.h b/cores/arduino/stm32/stm32_def.h
@@ -92,10 +92,12 @@
 #if !defined(USB) && defined(USB_DRD_FS)
   #define USB USB_DRD_FS
   #define PinMap_USB PinMap_USB_DRD_FS
-  #if defined(STM32U5xx)
+  #if defined(STM32H5xx) || defined(STM32U5xx)
     #define USB_BASE USB_DRD_BASE
-    #define __HAL_RCC_USB_CLK_ENABLE __HAL_RCC_USB_FS_CLK_ENABLE
-    #define __HAL_RCC_USB_CLK_DISABLE __HAL_RCC_USB_FS_CLK_DISABLE
+    #if !defined(__HAL_RCC_USB_CLK_ENABLE)
+      #define __HAL_RCC_USB_CLK_ENABLE __HAL_RCC_USB_FS_CLK_ENABLE
+      #define __HAL_RCC_USB_CLK_DISABLE __HAL_RCC_USB_FS_CLK_DISABLE
+    #endif
   #endif
 #endif
 
diff --git a/cores/arduino/stm32/usb/usbd_conf.c b/cores/arduino/stm32/usb/usbd_conf.c
@@ -58,7 +58,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
   digitalWriteFast(digitalPinToPinName(PIN_UCPD_TCPP), LOW);
 #endif
 
-#if defined(PWR_CR2_USV) || defined(PWR_SVMCR_USV)
+#if defined(PWR_CR2_USV) || defined(PWR_SVMCR_USV) || defined(PWR_USBSCR_USB33SV)
   /* Enable VDDUSB on Pwrctrl CR2 register*/
   HAL_PWREx_EnableVddUSB();
 #endif
diff --git a/cores/arduino/stm32/usb/usbd_conf.h b/cores/arduino/stm32/usb/usbd_conf.h
@@ -74,6 +74,9 @@ extern "C" {
 #elif defined(STM32G0xx)
 #define USB_IRQn USB_UCPD1_2_IRQn
 #define USB_IRQHandler USB_UCPD1_2_IRQHandler
+#elif defined(STM32H5xx)
+#define USB_IRQn USB_DRD_FS_IRQn
+#define USB_IRQHandler USB_DRD_FS_IRQHandler
 #elif defined(STM32U5xx) && !defined(USB_DRD_FS)
 #define USB_IRQn OTG_FS_IRQn
 #define USB_IRQHandler OTG_FS_IRQHandler
