summaryrefslogtreecommitdiff
path: root/6515/libsensors_iio/sensors_mpl.cpp
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2015-05-19 22:02:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-19 22:02:55 +0000
commit086bbb4e8cf132cf2398d25c34c0e1533edf5ec1 (patch)
tree6d2a5214c5ae7a610ebd3921a5ef782b4a92b7ff /6515/libsensors_iio/sensors_mpl.cpp
parenta03869ce9a355d3606fccdbab41edc7bb1d32024 (diff)
parenta38914db2fd5b3192bfa8fbd46269aa860d7937b (diff)
downloadinvensense-086bbb4e8cf132cf2398d25c34c0e1533edf5ec1.tar.gz
am a38914db: Invensense: 6515: adjust minDelay and maxDelay values
* commit 'a38914db2fd5b3192bfa8fbd46269aa860d7937b': Invensense: 6515: adjust minDelay and maxDelay values
Diffstat (limited to '6515/libsensors_iio/sensors_mpl.cpp')
-rwxr-xr-x6515/libsensors_iio/sensors_mpl.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/6515/libsensors_iio/sensors_mpl.cpp b/6515/libsensors_iio/sensors_mpl.cpp
index 268b853..7e7b06b 100755
--- a/6515/libsensors_iio/sensors_mpl.cpp
+++ b/6515/libsensors_iio/sensors_mpl.cpp
@@ -438,18 +438,14 @@ static int open_sensors(const struct hw_module_t* module, const char* id,
memset(&dev->device, 0, sizeof(sensors_poll_device_1));
dev->device.common.tag = HARDWARE_DEVICE_TAG;
-#if defined ANDROID_KITKAT || defined ANDROID_LOLLIPOP
dev->device.common.version = SENSORS_DEVICE_API_VERSION_1_3;
dev->device.flush = poll__flush;
-#else
- dev->device.common.version = SENSORS_DEVICE_API_VERSION_1_0;
-#endif
dev->device.common.module = const_cast<hw_module_t*>(module);
dev->device.common.close = poll__close;
dev->device.activate = poll__activate;
dev->device.setDelay = poll__setDelay;
dev->device.poll = poll__poll;
- dev->device.batch = poll__batch;
+ dev->device.batch = poll__batch;
*device = &dev->device.common;
status = 0;