diff options
| author | Bernard Xiong <[email protected]> | 2017-06-24 07:10:44 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-06-24 07:10:44 +0800 |
| commit | 6e902e17ae5d52f09654bd56114d0a62f78ace02 (patch) | |
| tree | fce8761882d52d98f79c658c4f4bcb38f26da5b4 | |
| parent | 8437c049e63ccf57dc64d676fae2c8e40319186f (diff) | |
| parent | bd62def30c6cf9834bd4d7ea2c5b3010bf4cc227 (diff) | |
Merge pull request #750 from flyingcys/master
[bsp] fix bxcan.c inline bug
| -rw-r--r-- | bsp/stm32f10x/drivers/bxcan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bsp/stm32f10x/drivers/bxcan.c b/bsp/stm32f10x/drivers/bxcan.c index 73ccb8fc00..a95f07b9dd 100644 --- a/bsp/stm32f10x/drivers/bxcan.c +++ b/bsp/stm32f10x/drivers/bxcan.c @@ -20,7 +20,6 @@ #endif #ifdef RT_USING_CAN -#define inline __inline #ifndef STM32F10X_CL #define BX_CAN_FMRNUMBER 14 #define BX_CAN2_FMRSTART 7 @@ -399,7 +398,7 @@ static void bxcan2_hw_init(void) NVIC_Init(&NVIC_InitStructure); } #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; @@ -415,7 +414,7 @@ static inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan) } 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; |