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

[bsps] fix bsp/stm32f10x/bxcan.c inline bug

This commit is contained in:
flyingcys 2017-06-24 00:11:09 +08:00
parent 35e59002ef
commit bd62def30c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsp/stm32f10x/drivers/bxcan.c
View File

@ -20,9 +20,6 @@
#endif #endif
#ifdef RT_USING_CAN #ifdef RT_USING_CAN
#ifdef __CC_ARM
#define inline __inline
#endif
#ifndef STM32F10X_CL #ifndef STM32F10X_CL
#define BX_CAN_FMRNUMBER 14 #define BX_CAN_FMRNUMBER 14
#define BX_CAN2_FMRSTART 7 #define BX_CAN2_FMRSTART 7
@ -401,7 +398,7 @@ static void bxcan2_hw_init(void)
NVIC_Init(&NVIC_InitStructure); NVIC_Init(&NVIC_InitStructure);
} }
#endif #endif
static inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan) rt_inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan)
{ {
uint32_t wait_ack = 0x00000000; uint32_t wait_ack = 0x00000000;
@ -417,7 +414,7 @@ static inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan)
} }
return RT_EOK; return RT_EOK;
} }
static inline rt_err_t bxcan_exit_init(CAN_TypeDef *pcan) rt_inline rt_err_t bxcan_exit_init(CAN_TypeDef *pcan)
{ {
uint32_t wait_ack = 0x00000000; uint32_t wait_ack = 0x00000000;