Browse Source

Merge pull request #750 from flyingcys/master

[bsp] fix bxcan.c inline bug
Bernard Xiong 8 years ago
parent
commit
6e902e17ae
1 changed files with 2 additions and 3 deletions
  1. 2 3
      bsp/stm32f10x/drivers/bxcan.c

+ 2 - 3
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;