From 76681eb9845367bc80180a011fd270ecd4fb0d47 Mon Sep 17 00:00:00 2001 From: yangjunrui Date: Fri, 21 Jan 2022 09:47:05 +0800 Subject: [PATCH 1/3] feat: move sensor idl to driver_interface Signed-off-by: yangjunrui --- services/sensor/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index ea34d1f3..28201413 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("libsensor_service") { deps = [ "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", "//drivers/peripheral/sensor/hal:hdi_sensor", - "//drivers/peripheral/sensor/interfaces/hdi/sensor/v1_0:libsensor_proxy_1.0", + "//drivers/interface/sensor/v1_0:libsensor_proxy_1.0", ] external_deps = [ -- Gitee From eb4f447a83e975ba94e49eb0359ba794b8434a32 Mon Sep 17 00:00:00 2001 From: yangjunrui Date: Fri, 21 Jan 2022 12:45:15 +0800 Subject: [PATCH 2/3] feat: move sensor idl to driver_interface Signed-off-by: yangjunrui --- services/sensor/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index 28201413..39bef7c1 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -51,8 +51,8 @@ ohos_shared_library("libsensor_service") { deps = [ "$SUBSYSTEM_DIR/sensor/utils:libsensor_utils", - "//drivers/peripheral/sensor/hal:hdi_sensor", "//drivers/interface/sensor/v1_0:libsensor_proxy_1.0", + "//drivers/peripheral/sensor/hal:hdi_sensor", ] external_deps = [ -- Gitee From 46e8ec521686c8f93ad1f82d42d25423c062863c Mon Sep 17 00:00:00 2001 From: yangjunrui Date: Fri, 21 Jan 2022 13:45:23 +0800 Subject: [PATCH 3/3] feat: move sensor idl to driver_interface Signed-off-by: yangjunrui --- .../adapter/v1_0_connection/include/sensor_event_callback.h | 4 ++-- .../adapter/v1_0_connection/src/hdi_connection.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/sensor/hdi_connection/adapter/v1_0_connection/include/sensor_event_callback.h b/services/sensor/hdi_connection/adapter/v1_0_connection/include/sensor_event_callback.h index de14db78..9a572e6a 100644 --- a/services/sensor/hdi_connection/adapter/v1_0_connection/include/sensor_event_callback.h +++ b/services/sensor/hdi_connection/adapter/v1_0_connection/include/sensor_event_callback.h @@ -17,8 +17,8 @@ #define SENSOR_EVENT_CALLBACK_H #include "sensor_callback_service.h" -using hdi::sensor::v1_0::HdfSensorEvents; -using hdi::sensor::v1_0::SensorCallbackStub; +using sensor::v1_0::HdfSensorEvents; +using sensor::v1_0::SensorCallbackStub; namespace OHOS { namespace Sensors { diff --git a/services/sensor/hdi_connection/adapter/v1_0_connection/src/hdi_connection.cpp b/services/sensor/hdi_connection/adapter/v1_0_connection/src/hdi_connection.cpp index e3b69071..a946681a 100644 --- a/services/sensor/hdi_connection/adapter/v1_0_connection/src/hdi_connection.cpp +++ b/services/sensor/hdi_connection/adapter/v1_0_connection/src/hdi_connection.cpp @@ -22,9 +22,9 @@ namespace OHOS { namespace Sensors { using namespace OHOS::HiviewDFX; -using hdi::sensor::v1_0::ISensorInterface; -using hdi::sensor::v1_0::ISensorCallback; -using hdi::sensor::v1_0::HdfSensorInformation; +using sensor::v1_0::ISensorInterface; +using sensor::v1_0::ISensorCallback; +using sensor::v1_0::HdfSensorInformation; namespace { constexpr HiLogLabel LABEL = { LOG_CORE, SensorsLogDomain::SENSOR_SERVICE, "HdiConnection" }; sptr sensorInterface_ = nullptr; -- Gitee