diff options
| author | Bernard Xiong <[email protected]> | 2017-08-16 16:47:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-16 16:47:07 +0800 |
| commit | a0ec48d61396f13a9b5c1e6deea39a6d21b8c464 (patch) | |
| tree | f2c7df5e94d5dbb90646ada14ea7eaa6497a159d /bsp | |
| parent | de81a974735996753078e68f9de6a5a7f883d074 (diff) | |
| parent | b60712c29c0871eeae0192c0ac2f21e0f52f50f1 (diff) | |
Merge pull request #801 from gbcwbz/stm32_test
[bsp] fix CAN IRQ for stm32 none connectivity line devices
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/stm32f10x/drivers/bxcan.h | 5 | ||||
| -rw-r--r-- | bsp/stm32f10x/drivers/stm32f10x_it.c | 19 |
2 files changed, 22 insertions, 2 deletions
diff --git a/bsp/stm32f10x/drivers/bxcan.h b/bsp/stm32f10x/drivers/bxcan.h index d2bdc4821f..5e6cad087c 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 bf5cf55565..4f89e8a68d 100644 --- a/bsp/stm32f10x/drivers/stm32f10x_it.c +++ b/bsp/stm32f10x/drivers/stm32f10x_it.c @@ -25,6 +25,7 @@ #include "stm32f10x_it.h" #include <board.h> #include <rtthread.h> +#include "bxcan.h" /** @addtogroup Template_Project * @{ @@ -144,6 +145,24 @@ void EXTI4_IRQHandler(void) } #endif /* RT_USING_LWIP */ +#ifndef STM32F10X_CL +/* CAN and USB IRQ for stm32 none connectivity line devices + */ +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 + + /** * @} */ |