libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #801 from gbcwbz/stm32_test 

[bsp] fix CAN IRQ for stm32 none connectivity line devices
This commit is contained in:
Bernard Xiong 2017-08-16 16:47:07 +08:00 committed by GitHub
parent de81a97473 b60712c29c
commit a0ec48d613
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp/stm32f10x/drivers/bxcan.h
View File

@ -47,8 +47,9 @@
#define CAN_TXMAILBOX_1 ((uint8_t)0x01) #define CAN_TXMAILBOX_1 ((uint8_t)0x01)
#define CAN_TXMAILBOX_2 ((uint8_t)0x02) #define CAN_TXMAILBOX_2 ((uint8_t)0x02)
#define CAN_MODE_MASK ((uint32_t) 0x00000003) #define CAN_MODE_MASK ((uint32_t) 0x00000003)
void CAN1_RX0_IRQHandler(void);
void CAN1_TX_IRQHandler(void);
#endif /*BXCAN_H_*/ #endif /*BXCAN_H_*/

19
bsp/stm32f10x/drivers/stm32f10x_it.c
View File

@ -25,6 +25,7 @@
#include "stm32f10x_it.h" #include "stm32f10x_it.h"
#include <board.h> #include <board.h>
#include <rtthread.h> #include <rtthread.h>
#include "bxcan.h"
/** @addtogroup Template_Project /** @addtogroup Template_Project
* @{ * @{
@ -144,6 +145,24 @@ void EXTI4_IRQHandler(void)
} }
#endif /* RT_USING_LWIP */ #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
/** /**
* @} * @}
*/ */