summaryrefslogtreecommitdiffstats
path: root/include/hardware/sensors.h
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-02-09 02:46:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-09 02:46:33 +0000
commit296cf93d10b2a7627c772940c9445097d4c341e9 (patch)
tree41b9de56b0ae1bb8acfc55b54723e6ee7d2714bf /include/hardware/sensors.h
parentfbe985ca9c8cd502ce9b8b0332dbdd639e9b723e (diff)
downloadhardware_libhardware-296cf93d10b2a7627c772940c9445097d4c341e9.zip
hardware_libhardware-296cf93d10b2a7627c772940c9445097d4c341e9.tar.gz
hardware_libhardware-296cf93d10b2a7627c772940c9445097d4c341e9.tar.bz2
Revert "only orientation and geomagnetic field sensors support the "status" field"
This reverts commit fbe985ca9c8cd502ce9b8b0332dbdd639e9b723e Change-Id: I7c65fd3326fe08363b5ed491f6438e541df879d4
Diffstat (limited to 'include/hardware/sensors.h')
-rw-r--r--include/hardware/sensors.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index 0421a4b..7b5b7c9 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -664,22 +664,6 @@ typedef struct {
float roll;
};
};
-} sensors_data_t;
-
-typedef struct {
- union {
- float v[3];
- struct {
- float x;
- float y;
- float z;
- };
- struct {
- float azimuth;
- float pitch;
- float roll;
- };
- };
int8_t status;
uint8_t reserved[3];
} sensors_vec_t;
@@ -708,7 +692,7 @@ typedef struct sensors_event_t {
float data[16];
/* acceleration values are in meter per second per second (m/s^2) */
- sensors_data_t acceleration;
+ sensors_vec_t acceleration;
/* magnetic vector values are in micro-Tesla (uT) */
sensors_vec_t magnetic;
@@ -717,7 +701,7 @@ typedef struct sensors_event_t {
sensors_vec_t orientation;
/* gyroscope values are in rad/s */
- sensors_data_t gyro;
+ sensors_vec_t gyro;
/* temperature is in degrees centigrade (Celsius) */
float temperature;