summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrtthread-bot <[email protected]>2021-04-10 16:40:13 +0000
committerrtthread-bot <[email protected]>2021-04-10 16:40:13 +0000
commitceeaca25fd2f6b452e10a0b13a2cff7fdff25bac (patch)
tree1dcea521e791916c1b09130542a18910e88fde99
parent9235b62cbeffb2c4b05fe0c68fdd520f68b0f6e7 (diff)
parentd3be5e4fcf64a34b992b22272c98f44d9d0aa8c4 (diff)
Merge remote-tracking branch 'rtt_gitee/gitee_master'
-rw-r--r--bsp/stm32/libraries/HAL_Drivers/drv_common.c2
-rw-r--r--bsp/stm32/libraries/HAL_Drivers/drv_common.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.c b/bsp/stm32/libraries/HAL_Drivers/drv_common.c
index 82ec1f8985..74007b6e88 100644
--- 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
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.h b/bsp/stm32/libraries/HAL_Drivers/drv_common.h
index c45041129d..83ef259308 100644
--- 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" {