From 3487f2790ab0cbb3e2c0bbe1f7c62e004a8d1d0a Mon Sep 17 00:00:00 2001 From: wangqiang Date: Wed, 17 Mar 2021 17:42:43 +0800 Subject: 1. 优化pin.h, sensor.h, rtdevice.h，避免反向包含 2. 优化rt_sensor_close函数，polling模式下不需要操作和rt_pin_irq_enable函数 3. 优化rt_device_register和sensor_polling的LOG信息 4. 修复sensor_polling函数打开设备时的标志错误的问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/include/drivers/pin.h | 1 - components/drivers/include/drivers/sensor.h | 2 +- components/drivers/include/rtdevice.h | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'components/drivers/include') diff --git a/components/drivers/include/drivers/pin.h b/components/drivers/include/drivers/pin.h index 5ba1e6c8ea..74a18a7f0f 100644 --- a/components/drivers/include/drivers/pin.h +++ b/components/drivers/include/drivers/pin.h @@ -13,7 +13,6 @@ #define PIN_H__ #include -#include #ifdef __cplusplus extern "C" { diff --git a/components/drivers/include/drivers/sensor.h b/components/drivers/include/drivers/sensor.h index f54d4e8799..d071893eed 100644 --- a/components/drivers/include/drivers/sensor.h +++ b/components/drivers/include/drivers/sensor.h @@ -12,7 +12,7 @@ #define __SENSOR_H__ #include -#include +#include "pin.h" #ifdef __cplusplus extern "C" { diff --git a/components/drivers/include/rtdevice.h b/components/drivers/include/rtdevice.h index aeb3fa5223..fbd3c9e7b2 100644 --- a/components/drivers/include/rtdevice.h +++ b/components/drivers/include/rtdevice.h @@ -80,9 +80,6 @@ extern "C" { #include "drivers/sdio.h" #endif /* RT_USING_SDIO */ -#ifdef RT_USING_SENSOR -#include "drivers/sensor.h" -#endif /* RT_USING_SENSOR */ #ifdef RT_USING_WDT #include "drivers/watchdog.h" @@ -92,6 +89,10 @@ extern "C" { #include "drivers/pin.h" #endif /* RT_USING_PIN */ +#ifdef RT_USING_SENSOR +#include "drivers/sensor.h" +#endif /* RT_USING_SENSOR */ + #ifdef RT_USING_CAN #include "drivers/can.h" #endif /* RT_USING_CAN */ -- cgit v1.3.1