Fix type of recently introduced semi arbitrated sampling rate

[android-x86/hardware-intel-libsensors.git] / entry.c

diff --git a/entry.c b/entry.c
index e84e18d..96925f7 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #include <hardware/sensors.h>
@@ -27,26 +27,37 @@ static int activate (__attribute__((unused)) struct sensors_poll_device_t* dev,
         * a workaround for this behavior. We set the initial sampling rate to
         * 10 events per second when the sensor is enabled for the first time.
         */
+
        if (enabled && sensor_get_quirks(handle) & QUIRK_INITIAL_RATE) {
                ALOGI("Forcing initial sampling rate\n");
-               sensor_activate(handle, 1);
-               sensor_set_delay(handle, 100000000L);   /* Start with 100 ms */
-               sensor_activate(handle, 0);
+               sensor_activate(handle, 1, 0);
+               sensor_set_delay(handle, 100000000);    /* Start with 100 ms */
+               sensor_activate(handle, 0, 0);
 
                /* Clear flag for this sensor as do this only once */
-               sensor_info[handle].quirks ^= QUIRK_INITIAL_RATE;
+               sensor[handle].quirks ^= QUIRK_INITIAL_RATE;
        }
 
-       return sensor_activate(handle, enabled);
+       return sensor_activate(handle, enabled, 0);
 }
 
 
 static int set_delay (__attribute__((unused)) struct sensors_poll_device_t* dev,
                      int handle, int64_t ns)
 {
+       int i;
+
        if (init_count == 0 || handle < 0 || handle >= sensor_count)
                return -EINVAL;
 
+       /*
+        * If this sensor relies on other sensors, try to propagate the
+        * requested sampling rate to the base sensors.
+        */
+
+       for (i=0; i<sensor[handle].base_count; i++)
+               sensor_set_delay(sensor[handle].base[i], ns);
+
        return sensor_set_delay(handle, ns);
 }