diff options
| author | Spencer Moss <[email protected]> | 2017-08-14 00:36:18 +0800 |
|---|---|---|
| committer | Spencer Moss <[email protected]> | 2017-08-14 00:41:09 +0800 |
| commit | b60712c29c0871eeae0192c0ac2f21e0f52f50f1 (patch) | |
| tree | f3bbcf02839afb94d1facd1cbaf4cbc6b3926d26 | |
| parent | a07c450808f389d7cac39cc0b08bd1272b30ee2c (diff) | |
[bsp] change macro so that CAN IRQ do not interfere USB IRQ in stm32f10x
| -rw-r--r-- | bsp/stm32f10x/drivers/stm32f10x_it.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bsp/stm32f10x/drivers/stm32f10x_it.c b/bsp/stm32f10x/drivers/stm32f10x_it.c index 218b1a7532..4f89e8a68d 100644 --- a/bsp/stm32f10x/drivers/stm32f10x_it.c +++ b/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 + /** * @} */ |