libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #750 from flyingcys/master 

[bsp] fix bxcan.c inline bug
This commit is contained in:
Bernard Xiong 2017-06-24 07:10:44 +08:00 committed by GitHub
parent 8437c049e6 bd62def30c
commit 6e902e17ae
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@
#endif #endif
#ifdef RT_USING_CAN #ifdef RT_USING_CAN
#define inline __inline
#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
@ -399,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;
@ -415,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;