summaryrefslogtreecommitdiff
path: root/modules/sensors/dynamic_sensor/HidRawSensor.cpp
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-11-11 14:41:57 -0800
committerNick Desaulniers <ndesaulniers@google.com>2019-11-11 14:41:57 -0800
commit79149a378b4855ac7db02082658a4561c422964f (patch)
tree1c4bc508ab3f8f0e1d9fac8f4cd16c50cfb30596 /modules/sensors/dynamic_sensor/HidRawSensor.cpp
parentdeb0edbe3a2670e374083e3cee2ccdb1f58f0040 (diff)
libhardware: fix -Wreorder-init-list
C++20 is stricter about member ordering in designated initializers than C99. Bug: 139945549 Test: mm Change-Id: I045da46821280e720286a25a0c96b5750d1ad05e Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Diffstat (limited to 'modules/sensors/dynamic_sensor/HidRawSensor.cpp')
-rw-r--r--modules/sensors/dynamic_sensor/HidRawSensor.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/sensors/dynamic_sensor/HidRawSensor.cpp b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
index 46684128..f3c8a27b 100644
--- a/modules/sensors/dynamic_sensor/HidRawSensor.cpp
+++ b/modules/sensors/dynamic_sensor/HidRawSensor.cpp
@@ -177,13 +177,13 @@ HidRawSensor::HidRawSensor(
}
ReportTranslateRecord record = {
- .minValue = digest.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = digest.maxRaw,
+ .minValue = digest.minRaw,
.byteOffset = digest.bitOffset / 8,
.byteSize = digest.bitSize / 8,
.a = digest.a,
.b = digest.b,
- .type = TYPE_FLOAT
};
// keep track of range and resolution
range = std::max(std::max(std::abs((digest.maxRaw + digest.b) * digest.a),
@@ -250,12 +250,12 @@ bool HidRawSensor::processQuaternionUsage(const std::vector<HidParser::ReportPac
}
ReportTranslateRecord record = {
- .minValue = quat.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = quat.maxRaw,
+ .minValue = quat.minRaw,
.byteOffset = quat.bitOffset / 8,
.byteSize = quat.bitSize / 8,
.b = quat.b,
- .type = TYPE_FLOAT,
};
// Android X Y Z maps to HID X -Z Y
@@ -351,10 +351,10 @@ bool HidRawSensor::processTriAxisUsage(const std::vector<HidParser::ReportPacket
mFeatureInfo.reportModeFlag = SENSOR_FLAG_CONTINUOUS_MODE;
ReportTranslateRecord record = {
- .minValue = reportX.minRaw,
+ .type = TYPE_FLOAT,
.maxValue = reportX.maxRaw,
+ .minValue = reportX.minRaw,
.byteSize = reportX.bitSize / 8,
- .type = TYPE_FLOAT
};
// Reorder and swap axis