Browse Source

Merge pull request #801 from gbcwbz/stm32_test

[bsp] fix CAN IRQ for stm32 none connectivity line devices
Bernard Xiong 8 years ago
parent
commit
a0ec48d613
2 changed files with 22 additions and 2 deletions
  1. 3 2
      bsp/stm32f10x/drivers/bxcan.h
  2. 19 0
      bsp/stm32f10x/drivers/stm32f10x_it.c

+ 3 - 2
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_*/

+ 19 - 0
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
+
+
 /**
   * @}
   */