Sensor: Implement tilt sensor flush function
Add tilt sensor HAL flush function need by android wear,
add flush event data to event data queue for polling.
Change-Id: Iadc189327992a66601882b6718cc8abf414467f8
Tracked-On: https://jira01.devtools.intel.com/browse/MARVIN-627
Signed-off-by: Baixing Tan <baixingx.tan@intel.com>
Reviewed-on: https://android.intel.com:443/363780
diff --git a/tilt/SensorBase.cpp b/tilt/SensorBase.cpp
index 0106ec3..c90a948 100644
--- a/tilt/SensorBase.cpp
+++ b/tilt/SensorBase.cpp
@@ -143,6 +143,12 @@
return 0;
}
+int SensorBase::isActivated(int /* handle */)
+{
+ FUNC_LOG;
+ return 0;
+}
+
#ifdef HAL_VERSION_GT_1_0
int SensorBase::batch(int handle, int flags, int64_t period_ns, int64_t timeout)
{
diff --git a/tilt/SensorBase.h b/tilt/SensorBase.h
index f9f98b8..deedb22 100644
--- a/tilt/SensorBase.h
+++ b/tilt/SensorBase.h
@@ -89,6 +89,7 @@
virtual int getFd() const;
virtual int setDelay(int32_t handle, int64_t ns);
virtual int enable(int32_t handle, int enabled);
+ virtual int isActivated(int handle);
#ifdef HAL_VERSION_GT_1_0
virtual int batch(int handle, int flags, int64_t period_ns, int64_t timeout);
#endif
diff --git a/tilt/TiltSensor.cpp b/tilt/TiltSensor.cpp
index d57aa7c..f566c22 100644
--- a/tilt/TiltSensor.cpp
+++ b/tilt/TiltSensor.cpp
@@ -151,6 +151,11 @@
return ret;
}
+int TiltSensor::isActivated(int /* handle */)
+{
+ return mEnabled;
+}
+
#ifdef HAL_VERSION_GT_1_0
int TiltSensor::batch(int /* handle */, int /* flags */, int64_t period_ns, int64_t /* timeout */)
{
diff --git a/tilt/TiltSensor.h b/tilt/TiltSensor.h
index e5a7058..6894aec 100644
--- a/tilt/TiltSensor.h
+++ b/tilt/TiltSensor.h
@@ -51,6 +51,7 @@
virtual int readEvents(sensors_event_t* data, int count);
virtual int setDelay(int32_t handle, int64_t ns);
virtual int enable(int32_t handle, int enabled);
+ virtual int isActivated(int handle);
#ifdef HAL_VERSION_GT_1_0
virtual int batch(int handle, int flags, int64_t period_ns, int64_t timeout);
#endif
diff --git a/tilt/sensors.cpp b/tilt/sensors.cpp
index 2554755..03cbd4a 100644
--- a/tilt/sensors.cpp
+++ b/tilt/sensors.cpp
@@ -92,6 +92,7 @@
int setDelay(int handle, int64_t ns);
#ifdef HAL_VERSION_GT_1_0
int batch(int handle, int flags, int64_t period_ns, int64_t timeout);
+ int flush(int handle);
#endif
int pollEvents(sensors_event_t* data, int count);
bool getInitialized() { return mInitialized; };
@@ -102,13 +103,15 @@
enum {
TILT = 0,
numSensorDrivers, /* wake pipe goes here */
+ flushPipe, /* flush pipe goes here */
numFds,
};
- static const size_t wake = numFds - 1;
+ static const size_t wake = numFds - 2;
static const char WAKE_MESSAGE = 'W';
struct pollfd mPollFds[numFds];
int mWritePipeFd;
+ int mFlushWritePipeFd;
SensorBase* mSensors[numSensorDrivers];
int handleToDriver(int handle) const {
@@ -137,13 +140,28 @@
int wakeFds[2];
int result = pipe(wakeFds);
ALOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno));
- fcntl(wakeFds[0], F_SETFL, O_NONBLOCK);
- fcntl(wakeFds[1], F_SETFL, O_NONBLOCK);
+ result = fcntl(wakeFds[0], F_SETFL, O_NONBLOCK);
+ ALOGE_IF(result<0, "error setting wakeFds[0] access mode (%s)", strerror(errno));
+ result = fcntl(wakeFds[1], F_SETFL, O_NONBLOCK);
+ ALOGE_IF(result<0, "error setting wakeFds[1] access mode (%s)", strerror(errno));
mWritePipeFd = wakeFds[1];
mPollFds[wake].fd = wakeFds[0];
mPollFds[wake].events = POLLIN;
mPollFds[wake].revents = 0;
+
+ int flushFds[2];
+ result = pipe(flushFds);
+ ALOGE_IF(result<0, "error creating flush pipe (%s)", strerror(errno));
+ result = fcntl(flushFds[0], F_SETFL, O_NONBLOCK);
+ ALOGE_IF(result<0, "error setting flushFds[0] access mode (%s)", strerror(errno));
+ result = fcntl(flushFds[1], F_SETFL, O_NONBLOCK);
+ ALOGE_IF(result<0, "error setting flushFds[1] access mode (%s)", strerror(errno));
+ mFlushWritePipeFd = flushFds[1];
+
+ mPollFds[flushPipe].fd = flushFds[0];
+ mPollFds[flushPipe].events = POLLIN;
+ mPollFds[flushPipe].revents = 0;
mInitialized = true;
}
@@ -155,6 +173,8 @@
close(mPollFds[wake].fd);
close(mWritePipeFd);
+ close(mPollFds[flushPipe].fd);
+ close(mFlushWritePipeFd);
mInitialized = false;
}
@@ -196,6 +216,33 @@
return mSensors[index]->batch(handle, flags, period_ns, timeout);
}
+
+int sensors_poll_context_t::flush(int handle)
+{
+ FUNC_LOG;
+ int result;
+ sensors_event_t flush_event_data;
+
+ int index = handleToDriver(handle);
+ if (index < 0) return index;
+
+ result = mSensors[index]->isActivated(handle);
+ if (!result)
+ return -EINVAL;
+
+ flush_event_data.sensor = 0;
+ flush_event_data.timestamp = 0;
+ flush_event_data.meta_data.sensor = handle;
+ flush_event_data.meta_data.what = META_DATA_FLUSH_COMPLETE;
+ flush_event_data.type = SENSOR_TYPE_META_DATA;
+ flush_event_data.version = META_DATA_VERSION;
+
+ result = write(mFlushWritePipeFd, &flush_event_data, sizeof(sensors_event_t));
+ ALOGE_IF(result<0, "error sending flush event data (%s)", strerror(errno));
+
+ return (result >= 0 ? 0 : result);
+}
+
#endif
int sensors_poll_context_t::pollEvents(sensors_event_t* data, int count)
@@ -221,6 +268,23 @@
}
}
+ /* flush event data */
+ if (count) {
+ if (mPollFds[flushPipe].revents & POLLIN) {
+ int nb = read(mPollFds[flushPipe].fd, data, count * sizeof(sensors_event_t));
+ if (nb < 0) {
+ ALOGE("error reading from flush pipe (%s)", strerror(errno));
+ return -errno;
+ }
+ nb = nb/sizeof(sensors_event_t);
+ mPollFds[flushPipe].revents = 0;
+ count -= nb;
+ nbEvents += nb;
+ data += nb;
+ }
+ }
+
+
if (count) {
ALOGV("%s: start poll syscall to kernel", __func__);
n = poll(mPollFds, numFds, nbEvents ? 0 : -1);
@@ -276,6 +340,13 @@
sensors_poll_context_t *ctx = (sensors_poll_context_t *)dev;
return ctx->batch(handle, flags, period_ns, timeout);
}
+
+static int poll_flush(struct sensors_poll_device_1 *dev, int handle)
+{
+ FUNC_LOG;
+ sensors_poll_context_t *ctx = (sensors_poll_context_t *)dev;
+ return ctx->flush(handle);
+}
#endif
static int poll__poll(struct sensors_poll_device_t *dev,
@@ -323,6 +394,7 @@
dev->device.setDelay = poll__setDelay;
#ifdef HAL_VERSION_GT_1_0
dev->device.batch = poll__batch;
+ dev->device.flush = poll_flush;
#endif
dev->device.poll = poll__poll;
