summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflyingcys <[email protected]>2017-06-24 00:11:09 +0800
committerflyingcys <[email protected]>2017-06-24 00:11:09 +0800
commitbd62def30c6cf9834bd4d7ea2c5b3010bf4cc227 (patch)
treefce8761882d52d98f79c658c4f4bcb38f26da5b4
parent35e59002efb32ef4eda272a982ecae30636edc90 (diff)
[bsps] fix bsp/stm32f10x/bxcan.c inline bug
-rw-r--r--bsp/stm32f10x/drivers/bxcan.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/bsp/stm32f10x/drivers/bxcan.c b/bsp/stm32f10x/drivers/bxcan.c
index 5a3ad380d7..a95f07b9dd 100644
--- a/bsp/stm32f10x/drivers/bxcan.c
+++ b/bsp/stm32f10x/drivers/bxcan.c
@@ -20,9 +20,6 @@
#endif
#ifdef RT_USING_CAN
-#ifdef __CC_ARM
-#define inline __inline
-#endif
#ifndef STM32F10X_CL
#define BX_CAN_FMRNUMBER 14
#define BX_CAN2_FMRSTART 7
@@ -401,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;
@@ -417,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;