commit a8cdb08325dc086b72d49d04c9d9ddd8c284256f
author Gwendal Grignou <gwendal@google.com> Thu Mar 10 19:25:52 2016 -0800
committer The Android Automerger <android-build@google.com> Tue Mar 29 21:58:35 2016 -0700
tree 24f4739348714f30c706ee38e5218fb2ddaed307
parent b0623966ef732cbda881e0fc341a2b5ab1581641

dragon: sensor: Set FIFO size properly to pass batching CTS tests.

Update in CTS tests check for proper batching.
Forgot to reduce the FIFO size by 33%: the EC has a high water mark at
33%, issuing an interrupt at around 1400 events.

BUG=b:27534791
TEST=Witch fixes,
run cts -s 6612345600 -k -c android.hardware.cts.SensorBatchingTests
passes - execpt for AOSP sensors, another issue.

Change-Id: I250fae5b94094c41b87fa2862a70227386d1c17d
Signed-off-by: Gwendal Grignou <gwendal@google.com>

sensor_hub/sensors.cpp

diff --git a/sensor_hub/sensors.cpp b/sensor_hub/sensors.cpp
index ae9b19e..c3c7d84 100644
--- a/sensor_hub/sensors.cpp
+++ b/sensor_hub/sensors.cpp
@@ -38,6 +38,12 @@
 /*****************************************************************************/
 
 #define UNSET_FIELD -1
+/*
+ * TODO(gwendal): We should guess the fifo size, but
+ * we need to issue an ioctl instead of just reading IIO sysfs.
+ * EC will trigger an interrupt at 2/3 of its FIFO.
+ */
+#define CROS_EC_FIFO_SIZE (2048 * 2 / 3)
 
 /* Name of iio devices, as reported by cros_ec_dev.c */
 const char *cros_ec_sensor_names[] = {
@@ -77,9 +83,6 @@
  *
  * Some parameters (handle, range, resolution) are retreived
  * from IIO.
- *
- * TODO(gwendal): We could guess the fifo size as well, but
- * we need to issue an ioctl instead of just reading IIO sysfs.
  */
 static const struct sensor_t sSensorListTemplate[] = {
     [CROS_EC_ACCEL] = {
@@ -93,7 +96,7 @@
         power:              0.18f,    /* Based on BMI160 */
         minDelay:           5000,
         fifoReservedEventCount: 0,
-        fifoMaxEventCount:  2048,
+        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
         stringType:         SENSOR_STRING_TYPE_ACCELEROMETER,
         requiredPermission: 0,
         /*
@@ -115,7 +118,7 @@
         power:              0.85f,
         minDelay:           5000,
         fifoReservedEventCount: 0,
-        fifoMaxEventCount:  2048,
+        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
         stringType:         SENSOR_STRING_TYPE_GYROSCOPE,
         requiredPermission: 0,
         maxDelay:           80000,
@@ -137,7 +140,7 @@
          */
         minDelay:           40000,
         fifoReservedEventCount: 0,
-        fifoMaxEventCount:  2048,
+        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
         stringType:         SENSOR_STRING_TYPE_MAGNETIC_FIELD,
         requiredPermission: 0,
         maxDelay:           200000,
@@ -155,7 +158,7 @@
         power:              0.12f,  /* Based on Si1141 */
         minDelay:           20000,
         fifoReservedEventCount: 0,
-        fifoMaxEventCount:  2048,
+        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
         stringType:         SENSOR_STRING_TYPE_PROXIMITY,
         requiredPermission: 0,
         /* Forced mode, can be long: 10s */
@@ -175,7 +178,7 @@
         power:              0.12f,  /* Based on Si1141 */
         minDelay:           20000,
         fifoReservedEventCount: 0,
-        fifoMaxEventCount:  2048,
+        fifoMaxEventCount:  CROS_EC_FIFO_SIZE,
         stringType:         SENSOR_STRING_TYPE_LIGHT,
         requiredPermission: 0,
         /* Forced mode, can be long: 10s */