USB: review WakeUp IRQn and IRQHandler across series

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

Author: fpistm

cores/arduino/stm32/usb/usbd_conf.c

@@ -99,12 +99,12 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
       __HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE();
 #endif
       __HAL_USB_WAKEUP_EXTI_ENABLE_IT();
-#if defined(STM32F1xx) || defined(STM32F3xx)
+#if defined(USB_WKUP_IRQn)
       /* USB Wakeup Interrupt */
-      HAL_NVIC_EnableIRQ(USBWakeUp_IRQn);
+      HAL_NVIC_EnableIRQ(USB_WKUP_IRQn);
 
       /* Enable USB Wake-up interrupt */
-      HAL_NVIC_SetPriority(USBWakeUp_IRQn, 0, 0);
+      HAL_NVIC_SetPriority(USB_WKUP_IRQn, 0, 0);
 #endif
     }
   }
@@ -317,7 +317,7 @@ void HAL_PCD_SuspendCallback(PCD_HandleTypeDef *hpcd)
 void HAL_PCD_ResumeCallback(PCD_HandleTypeDef *hpcd)
 {
   if (hpcd->Init.low_power_enable) {
-    SystemClock_Config();
+    USBD_SystemClockConfigFromResume();
 
     /* Reset SLEEPDEEP bit of Cortex System Control Register */
     SCB->SCR &= (uint32_t)~((uint32_t)(SCB_SCR_SLEEPDEEP_Msk | SCB_SCR_SLEEPONEXIT_Msk));
@@ -368,8 +368,6 @@ void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd)
   USBD_LL_DevDisconnected(hpcd->pData);
 }
 
-
-
 /**
   * @brief  This function handles USB-On-The-Go FS/HS global interrupt request.
   * @param  None
@@ -399,26 +397,26 @@ void USB_H_IRQHandler(void)
 #endif /* USB_H_IRQn */
 
 /**
-/**
-  * @brief  This function handles USB OTG FS Wakeup IRQ Handler.
+  * @brief  This function handles USB Wakeup IRQ Handler.
   * @param  None
   * @retval None
   */
 #ifdef USE_USB_HS
   void OTG_HS_WKUP_IRQHandler(void)
 #elif defined(USB_OTG_FS)
   void OTG_FS_WKUP_IRQHandler(void)
+#elif defined(USB_WKUP_IRQHandler)
+  void USB_WKUP_IRQHandler(void)
 #else
-  void USBWakeUp_IRQHandler(void)
+  void USBWakeUp_IRQHandler_dummy(void)
 #endif
 {
   if ((&g_hpcd)->Init.low_power_enable) {
     /* Reset SLEEPDEEP bit of Cortex System Control Register */
     SCB->SCR &= (uint32_t)~((uint32_t)(SCB_SCR_SLEEPDEEP_Msk | SCB_SCR_SLEEPONEXIT_Msk));
 
-    /* Configures system clock after wake-up from STOP: enable HSE, PLL and select
-    PLL as system clock source (HSE and PLL are disabled in STOP mode) */
-    SystemClock_Config();
+    /* Configures system clock after wake-up */
+    USBD_SystemClockConfigFromResume();
 
     /* ungate PHY clock */
     __HAL_PCD_UNGATE_PHYCLOCK((&g_hpcd));

cores/arduino/stm32/usb/usbd_conf.h

@@ -49,11 +49,22 @@ extern "C" {
 #define USB_IRQHandler      USB_LP_CAN_RX0_IRQHandler
 #define USB_H_IRQn          USB_HP_CAN_TX_IRQn
 #define USB_H_IRQHandler    USB_HP_CAN_TX_IRQHandler
+#if defined(STM32F1xx) || defined(STM32F3xx) || defined(STM32G4xx)
+#define USB_WKUP_IRQn       USBWakeUp_RMP_IRQn
+#define USB_WKUP_IRQHandler USBWakeUp_RMP_IRQHandler
+#endif
 #else
 #define USB_IRQn            USB_LP_IRQn
 #define USB_IRQHandler      USB_LP_IRQHandler
 #define USB_H_IRQn          USB_HP_IRQn
 #define USB_H_IRQHandler    USB_HP_IRQHandler
+#if defined(STM32F1xx) || defined(STM32F3xx) || defined(STM32G4xx)
+#define USB_WKUP_IRQn       USBWakeUp_IRQn
+#define USB_WKUP_IRQHandler USBWakeUp_IRQHandler
+#else /* STM32L1xx || STM32WBxx */
+#define USB_WKUP_IRQn       USB_FS_WKUP_IRQn
+#define USB_WKUP_IRQHandler USB_FS_WKUP_IRQHandler
+#endif
 #endif
 #elif defined(STM32L5xx)
 #define USB_IRQn            USB_FS_IRQn

cores/arduino/stm32/usb/usbd_if.c

@@ -175,4 +175,19 @@ void USBD_CDC_init(void)
   CDC_init();
 }
 #endif /* USBD_USE_CDC */
+
+/**
+  * @brief  Configures system clock and system IP clocks after wake-up from USB
+  *         resume callBack
+  * @note   Weaked function which can be redefined by user at the sketch level.
+  *         By default, call 'SystemClock_Config()'.
+  * @param  None
+  * @retval None
+  */
+WEAK void USBD_SystemClockConfigFromResume(void)
+{
+  configIPClock();
+  SystemClock_Config();
+}
+
 #endif /* USBCON */

cores/arduino/stm32/usb/usbd_if.h

@@ -27,6 +27,10 @@ void USBD_reenumerate(void);
 #ifdef USBD_USE_CDC
 void USBD_CDC_init(void);
 #endif
+
+/* Weaked function */
+void USBD_SystemClockConfigFromResume(void);
+
 #ifdef __cplusplus
 }
 #endif