Quellcode durchsuchen

[bsp] change macro so that CAN IRQ do not interfere USB IRQ in stm32f10x

Spencer Moss vor 7 Jahren
Ursprung
Commit
b60712c29c
1 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
  1. 6 2
      bsp/stm32f10x/drivers/stm32f10x_it.c

+ 6 - 2
bsp/stm32f10x/drivers/stm32f10x_it.c

@@ -145,20 +145,24 @@ void EXTI4_IRQHandler(void)
 }
 #endif /* RT_USING_LWIP */
 
-#if (defined (RT_USING_CAN)) && !(defined (STM32F10X_CL))
+#ifndef STM32F10X_CL
 /* CAN and USB IRQ for stm32 none connectivity line devices
- * change to USB IRQ, if you want to use USB
  */
 void USB_LP_CAN1_RX0_IRQHandler(void)
 {
+#ifdef RT_USING_CAN
     CAN1_RX0_IRQHandler();
+#endif
 }
 void USB_HP_CAN1_TX_IRQHandler(void)
 {
+#ifdef RT_USING_CAN
     CAN1_TX_IRQHandler();
+#endif
 }
 #endif
 
+
 /**
   * @}
   */