diff options
author | Scott Lobdell <slobdell@google.com> | 2022-01-21 07:03:32 +0000 |
---|---|---|
committer | Scott Lobdell <slobdell@google.com> | 2022-01-21 07:15:05 +0000 |
commit | 593bdf5548ac6f13053424a655423c0677e7cb2d (patch) | |
tree | ebbbe99553ec26ed9088cf6cfef1aec2e5cc2ef0 /sensors | |
parent | 78c23e4f5f9e8b61b8bace9a2b4cb691073ef906 (diff) | |
parent | a0f5ebdbd3992e7a78517d13f568d9cbcbb71564 (diff) |
Merge TP1A.211206.001
Change-Id: I8b3a43021a3328cf6afb4e7e157339d8e214ddbe
Diffstat (limited to 'sensors')
-rw-r--r-- | sensors/common/utils/convertV2_1.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sensors/common/utils/convertV2_1.h b/sensors/common/utils/convertV2_1.h index 9231011f3d..003590431f 100644 --- a/sensors/common/utils/convertV2_1.h +++ b/sensors/common/utils/convertV2_1.h @@ -77,6 +77,25 @@ inline const hidl_vec<V1_0::SensorInfo>& convertToOldSensorInfos( return reinterpret_cast<const hidl_vec<V1_0::SensorInfo>&>(infos); } +inline void convertToSensor(const V2_1::SensorInfo& src, sensor_t* dst) { + dst->name = strdup(src.name.c_str()); + dst->vendor = strdup(src.vendor.c_str()); + dst->version = src.version; + dst->handle = src.sensorHandle; + dst->type = (int)src.type; + dst->maxRange = src.maxRange; + dst->resolution = src.resolution; + dst->power = src.power; + dst->minDelay = src.minDelay; + dst->fifoReservedEventCount = src.fifoReservedEventCount; + dst->fifoMaxEventCount = src.fifoMaxEventCount; + dst->stringType = strdup(src.typeAsString.c_str()); + dst->requiredPermission = strdup(src.requiredPermission.c_str()); + dst->maxDelay = src.maxDelay; + dst->flags = src.flags; + dst->reserved[0] = dst->reserved[1] = 0; +} + inline void convertFromSensorEvent(const sensors_event_t& src, V2_1::Event* dst) { switch ((SensorType)src.type) { case SensorType::HINGE_ANGLE: |