USB: review IRQn and IRQHandler across series

Fix stm32duino#1283

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

Author: fpistm

cores/arduino/stm32/usb/usbd_conf.c

@@ -73,23 +73,22 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
     /* Enable USB FS Clock */
     __HAL_RCC_USB_CLK_ENABLE();
 
-#if defined (USE_USB_INTERRUPT_REMAPPED)
-    /*USB interrupt remapping enable */
+#if defined(SYSCFG_CFGR1_USB_IT_RMP) && defined(USE_USB_INTERRUPT_REMAPPED)
+    /* USB interrupt remapping enable */
     __HAL_REMAPINTERRUPT_USB_ENABLE();
 #endif
 
-#if defined(STM32G4xx) || defined(STM32WBxx)
+#if defined(USB_H_IRQn)
+    /* Set USB High priority Interrupt priority */
     HAL_NVIC_SetPriority(USB_HP_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
+    /* Enable USB High priority Interrupt */
     HAL_NVIC_EnableIRQ(USB_HP_IRQn);
-    HAL_NVIC_SetPriority(USB_LP_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
-    HAL_NVIC_EnableIRQ(USB_LP_IRQn);
-#else
-    /* Set USB FS Interrupt priority */
+#endif
+    /* Set USB Interrupt priority */
     HAL_NVIC_SetPriority(USB_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
 
-    /* Enable USB FS Interrupt */
+    /* Enable USB Interrupt */
     HAL_NVIC_EnableIRQ(USB_IRQn);
-#endif /* STM32WBxx */
 
     if (hpcd->Init.low_power_enable == 1) {
       /* Enable EXTI for USB wakeup */
@@ -163,7 +162,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
     /* Enable USB HS Clocks */
     __HAL_RCC_USB_OTG_HS_CLK_ENABLE();
 
-    /* Set USBHS Interrupt priority */
+    /* Set USB HS Interrupt priority */
     HAL_NVIC_SetPriority(OTG_HS_IRQn, USBD_IRQ_PRIO, USBD_IRQ_SUBPRIO);
 
     /* Enable USB HS Interrupt */
@@ -387,27 +386,19 @@ void HAL_PCD_DisconnectCallback(PCD_HandleTypeDef *hpcd)
   HAL_PCD_IRQHandler(&g_hpcd);
 }
 
-#if defined(STM32WBxx)
+#if defined(USB_H_IRQn)
 /**
   * @brief This function handles USB high priority interrupt.
   * @param  None
   * @retval None
   */
-void USB_HP_IRQHandler(void)
+void USB_H_IRQHandler(void)
 {
   HAL_PCD_IRQHandler(&g_hpcd);
 }
+#endif /* USB_H_IRQn */
 
 /**
-  * @brief This function handles USB low priority interrupt, USB wake-up interrupt through EXTI line 28.
-  * @param  None
-  * @retval None
-  */
-void USB_LP_IRQHandler(void)
-{
-  HAL_PCD_IRQHandler(&g_hpcd);
-}
-#else
 /**
   * @brief  This function handles USB OTG FS Wakeup IRQ Handler.
   * @param  None
@@ -442,7 +433,7 @@ void USB_LP_IRQHandler(void)
   __HAL_USB_WAKEUP_EXTI_CLEAR_FLAG();
 #endif
 }
-#endif
+
 /*******************************************************************************
                        LL Driver Interface (USB Device Library --> PCD)
 *******************************************************************************/

cores/arduino/stm32/usb/usbd_conf.h

@@ -42,24 +42,22 @@ extern "C" {
 
 #if defined(USB_BASE)
 
-#if defined(STM32F1xx)
-#define USB_IRQn USB_LP_CAN1_RX0_IRQn
-#define USB_IRQHandler USB_LP_CAN1_RX0_IRQHandler
-#elif defined(STM32F3xx)
-/* ToDo: Check remap on USB_LP_IRQn */
-#ifndef USE_USB_INTERRUPT_REMAPPED
-#define USB_IRQn USB_LP_CAN_RX0_IRQn
-#define USB_IRQHandler USB_LP_CAN_RX0_IRQHandler
+#if defined(STM32F1xx) || defined(STM32F3xx) || defined(STM32G4xx) || \
+    defined(STM32L1xx) || defined(STM32WBxx)
+#if defined(SYSCFG_CFGR1_USB_IT_RMP) && defined(USE_USB_INTERRUPT_REMAPPED)
+#define USB_IRQn            USB_LP_CAN_RX0_IRQn
+#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
 #else
-#define USB_IRQn USB_LP_IRQn
-#define USB_IRQHandler USB_LP_IRQHandler
-#endif /* USE_USB_INTERRUPT_REMAPPED */
-#elif defined(STM32L1xx)
-#define USB_IRQn USB_LP_IRQn
-#define USB_IRQHandler USB_LP_IRQHandler
+#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
+#endif
 #elif defined(STM32L5xx)
-#define USB_IRQn USB_FS_IRQn
-#define USB_IRQHandler USB_FS_IRQHandler
+#define USB_IRQn            USB_FS_IRQn
+#define USB_IRQHandler      USB_FS_IRQHandler
 #endif
 
 #endif /* USB_BASE */