zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3575766. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4755 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2012-10-13 10:51:27 +00:00
parent 600714519b
commit 34ddd70581
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/hal/platforms/STM32F1xx/stm32_isr.h
View File

@ -49,8 +49,13 @@
#define STM32_CAN2_RX1_HANDLER CAN2_RX1_IRQHandler #define STM32_CAN2_RX1_HANDLER CAN2_RX1_IRQHandler
#define STM32_CAN2_SCE_HANDLER CAN2_SCE_IRQHandler #define STM32_CAN2_SCE_HANDLER CAN2_SCE_IRQHandler
#ifdef STM32F10X_CL
#define STM32_CAN1_TX_NUMBER CAN1_TX_IRQn
#define STM32_CAN1_RX0_NUMBER CAN1_RX0_IRQn
#else
#define STM32_CAN1_TX_NUMBER USB_HP_CAN1_TX_IRQn #define STM32_CAN1_TX_NUMBER USB_HP_CAN1_TX_IRQn
#define STM32_CAN1_RX0_NUMBER USB_LP_CAN1_RX0_IRQn #define STM32_CAN1_RX0_NUMBER USB_LP_CAN1_RX0_IRQn
#endif
#define STM32_CAN1_RX1_NUMBER CAN1_RX1_IRQn #define STM32_CAN1_RX1_NUMBER CAN1_RX1_IRQn
#define STM32_CAN1_SCE_NUMBER CAN1_SCE_IRQn #define STM32_CAN1_SCE_NUMBER CAN1_SCE_IRQn
#define STM32_CAN2_TX_NUMBER CAN2_TX_IRQn #define STM32_CAN2_TX_NUMBER CAN2_TX_IRQn

2
readme.txt
View File

@ -83,6 +83,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.1 *** *** 2.5.1 ***
- FIX: Fixed STM32F10X_CL: Wrong CAN1 interrupt number definitions (bug
3575766).
- FIX: Fixed superfluous pack #defines cause nasty warning (bug 3575662) - FIX: Fixed superfluous pack #defines cause nasty warning (bug 3575662)
(backported to 2.4.3). (backported to 2.4.3).
- FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657) - FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657)