From 34ddd705816288f868880b36664d875e1f0861aa Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 13 Oct 2012 10:51:27 +0000 Subject: [PATCH] Fixed bug 3575766. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4755 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32F1xx/stm32_isr.h | 5 +++++ readme.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/os/hal/platforms/STM32F1xx/stm32_isr.h b/os/hal/platforms/STM32F1xx/stm32_isr.h index 940ade289..9cdc406a3 100644 --- a/os/hal/platforms/STM32F1xx/stm32_isr.h +++ b/os/hal/platforms/STM32F1xx/stm32_isr.h @@ -49,8 +49,13 @@ #define STM32_CAN2_RX1_HANDLER CAN2_RX1_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_RX0_NUMBER USB_LP_CAN1_RX0_IRQn +#endif #define STM32_CAN1_RX1_NUMBER CAN1_RX1_IRQn #define STM32_CAN1_SCE_NUMBER CAN1_SCE_IRQn #define STM32_CAN2_TX_NUMBER CAN2_TX_IRQn diff --git a/readme.txt b/readme.txt index 67b9f1d43..7373cf501 100644 --- a/readme.txt +++ b/readme.txt @@ -83,6 +83,8 @@ ***************************************************************************** *** 2.5.1 *** +- FIX: Fixed STM32F10X_CL: Wrong CAN1 interrupt number definitions (bug + 3575766). - FIX: Fixed superfluous pack #defines cause nasty warning (bug 3575662) (backported to 2.4.3). - FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657)