From a07c450808f389d7cac39cc0b08bd1272b30ee2c Mon Sep 17 00:00:00 2001 From: Spencer Moss Date: Sun, 13 Aug 2017 16:39:00 +0800 Subject: [PATCH] [bsp] fix CAN IRQ for stm32 none connectivity line devices --- bsp/stm32f10x/drivers/bxcan.h | 5 +++-- bsp/stm32f10x/drivers/stm32f10x_it.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bsp/stm32f10x/drivers/bxcan.h b/bsp/stm32f10x/drivers/bxcan.h index d2bdc4821..5e6cad087 100644 --- a/bsp/stm32f10x/drivers/bxcan.h +++ b/bsp/stm32f10x/drivers/bxcan.h @@ -47,8 +47,9 @@ #define CAN_TXMAILBOX_1 ((uint8_t)0x01) #define CAN_TXMAILBOX_2 ((uint8_t)0x02) - - #define CAN_MODE_MASK ((uint32_t) 0x00000003) +void CAN1_RX0_IRQHandler(void); +void CAN1_TX_IRQHandler(void); + #endif /*BXCAN_H_*/ diff --git a/bsp/stm32f10x/drivers/stm32f10x_it.c b/bsp/stm32f10x/drivers/stm32f10x_it.c index bf5cf5556..218b1a753 100644 --- a/bsp/stm32f10x/drivers/stm32f10x_it.c +++ b/bsp/stm32f10x/drivers/stm32f10x_it.c @@ -25,6 +25,7 @@ #include "stm32f10x_it.h" #include #include +#include "bxcan.h" /** @addtogroup Template_Project * @{ @@ -144,6 +145,20 @@ void EXTI4_IRQHandler(void) } #endif /* RT_USING_LWIP */ +#if (defined (RT_USING_CAN)) && !(defined (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) +{ + CAN1_RX0_IRQHandler(); +} +void USB_HP_CAN1_TX_IRQHandler(void) +{ + CAN1_TX_IRQHandler(); +} +#endif + /** * @} */