Merge remote-tracking branch 'rtt_gitee/gitee_master'

ceeaca25 · rtthread-bot · 9235b62c · d3be5e4f · ceeaca25 · ceeaca25
Showing with 3 addition and 1 deletion

bsp/stm32/libraries/HAL_Drivers/drv_common.c bsp/stm32/libraries/HAL_Drivers/drv_common.c +1 -1

bsp/stm32/libraries/HAL_Drivers/drv_common.h bsp/stm32/libraries/HAL_Drivers/drv_common.h +2 -0

未找到文件。
--- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c
@@ -168,7 +168,7 @@ RT_WEAK void rt_hw_board_init()
 #endif

    /* Set the shell console output device */
-#ifdef RT_USING_CONSOLE
+#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
    rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif


--- a/bsp/stm32/libraries/HAL_Drivers/drv_common.h
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.h
@@ -13,7 +13,9 @@

 #include <rtthread.h>
 #include <rthw.h>
+#ifdef RT_USING_DEVICE
 #include <rtdevice.h>
+#endif

 #ifdef __cplusplus
 extern "C" {