diff options
| author | bupleurum <[email protected]> | 2017-08-11 17:39:47 +0800 |
|---|---|---|
| committer | bupleurum <[email protected]> | 2017-08-11 17:39:47 +0800 |
| commit | 2569f66df86f9a8ab1523fe933032102bcfda832 (patch) | |
| tree | eacc93e25e836f293f275ae08e7138e3f016daea /bsp | |
| parent | 16b54610f622f9a05ac0d118b4b2f2dc24029ad6 (diff) | |
[bsp] Fix a CAN interrupt number macro definition bug for STM32F10X_LD,STM32F10X_MD and STM32F10X_XL series.
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/stm32f10x/drivers/bxcan.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bsp/stm32f10x/drivers/bxcan.c b/bsp/stm32f10x/drivers/bxcan.c index a95f07b9dd..29c1eaeac7 100644 --- a/bsp/stm32f10x/drivers/bxcan.c +++ b/bsp/stm32f10x/drivers/bxcan.c @@ -15,9 +15,11 @@ #include <rtdevice.h> #include <board.h> #include <bxcan.h> + #ifdef RT_USING_COMPONENTS_INIT #include <components.h> #endif + #ifdef RT_USING_CAN #ifndef STM32F10X_CL @@ -27,12 +29,13 @@ #define BX_CAN_FMRNUMBER 28 #define BX_CAN2_FMRSTART 14 #endif -#ifdef STM32F10X_HD -#undef USING_BXCAN2 +#if (defined (STM32F10X_LD)) || (defined (STM32F10X_MD)) || (defined (STM32F10X_HD)) || (defined (STM32F10X_XL)) +#undef USING_BXCAN2 #define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn #define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn #endif + #define BX_CAN_MAX_FILTERS (BX_CAN_FMRNUMBER * 4) #define BX_CAN_MAX_FILTER_MASKS BX_CAN_MAX_FILTERS #define BX_CAN_FILTER_MAX_ARRAY_SIZE ((BX_CAN_MAX_FILTERS + 32 - 1) / 32) |