From 1afc3eb3daacb053422d60f2befda766515a9031 Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Mon, 24 Jan 2022 14:58:20 +0800 Subject: [PATCH] feat: move sensor idl to driver_interface Signed-off-by: sunxuejiao --- services/sensor/BUILD.gn | 2 +- .../adapter/v1_0_connection/include/sensor_event_callback.h | 4 ++-- .../adapter/v1_0_connection/src/hdi_connection.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/sensor/BUILD.gn b/services/sensor/BUILD.gn index ea34d1f3..9bba30c7 100644 --- a/services/sensor/BUILD.gn +++ b/services/sensor/BUILD.gn @@ -52,7 +52,6 @@ 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", ] external_deps = [ @@ -62,6 +61,7 @@ ohos_shared_library("libsensor_service") { "permission_standard:libpermissionsdk_standard", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "sensor_device_driver:libsensor_proxy_1.0", "utils_base:utils", ] part_name = "sensor" 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