summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Le Grand <etn@google.com>2014-04-05 09:05:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-05 09:05:43 +0000
commit6fbeb078805187128f4216c0209da5beb284080b (patch)
treeb804863dce6d10ac8be5d9dd8c5077f075d1d94e
parentb7631959290bf75e6d904172f43414ee27f5ae1c (diff)
parentd944705067f361e2451bc4a87060f483f062fba8 (diff)
downloadakm-6fbeb078805187128f4216c0209da5beb284080b.tar.gz
am d9447050: Revert "Update driver to follow new sensor_t format after inclusion of stringType and requiredPermission"
* commit 'd944705067f361e2451bc4a87060f483f062fba8': Revert "Update driver to follow new sensor_t format after inclusion of stringType and requiredPermission"
-rw-r--r--AK8975_FS/libsensors/sensors.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/AK8975_FS/libsensors/sensors.cpp b/AK8975_FS/libsensors/sensors.cpp
index 65c8836..af0daea 100644
--- a/AK8975_FS/libsensors/sensors.cpp
+++ b/AK8975_FS/libsensors/sensors.cpp
@@ -66,30 +66,30 @@ static const struct sensor_t sSensorList[] = {
1,
SENSORS_MAGNETIC_FIELD_HANDLE,
SENSOR_TYPE_MAGNETIC_FIELD, 1228.8f,
- CONVERT_M, 0.35f, 10000, 0, 0, 0, 0, { } },
+ CONVERT_M, 0.35f, 10000, 0, 0, { } },
#ifdef SENSORHAL_ACC_ADXL346
{ "Analog Devices ADXL345/6 3-axis Accelerometer",
"ADI",
1, SENSORS_ACCELERATION_HANDLE,
SENSOR_TYPE_ACCELEROMETER, (GRAVITY_EARTH * 16.0f),
- (GRAVITY_EARTH * 16.0f) / 4096.0f, 0.145f, 10000, 0, 0, 0, 0, { } },
+ (GRAVITY_EARTH * 16.0f) / 4096.0f, 0.145f, 10000, 0, 0, { } },
{ "AK8975 Orientation sensor",
"Asahi Kasei Microdevices",
1, SENSORS_ORIENTATION_HANDLE,
SENSOR_TYPE_ORIENTATION, 360.0f,
- CONVERT_O, 0.495f, 10000, 0, 0, 0, 0, { } }
+ CONVERT_O, 0.495f, 10000, 0, 0, { } }
#endif
#ifdef SENSORHAL_ACC_KXTF9
{ "Kionix KXTF9 3-axis Accelerometer",
"Kionix",
1, SENSORS_ACCELERATION_HANDLE,
SENSOR_TYPE_ACCELEROMETER, (GRAVITY_EARTH * 2.0f),
- (GRAVITY_EARTH) / 1024.0f, 0.7f, 10000, 0, 0, 0, 0, { } },
+ (GRAVITY_EARTH) / 1024.0f, 0.7f, 10000, 0,0, { } },
{ "AK8975 Orientation sensor",
"Asahi Kasei Microdevices",
1, SENSORS_ORIENTATION_HANDLE,
SENSOR_TYPE_ORIENTATION, 360.0f,
- CONVERT_O, 1.05f, 10000, 0, 0, 0, 0, { } }
+ CONVERT_O, 1.05f, 10000, 0, 0, { } }
#endif
};