Get max frequency from property if it's present.

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

diff --git a/description.c b/description.c
index 539358e..6d3239e 100644 (file)
--- a/description.c
+++ b/description.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #include <stdlib.h>
@@ -16,6 +16,7 @@
 
 #define MIN_ON_CHANGE_SAMPLING_PERIOD_US   200000 /* For on change sensors (temperature, proximity, ALS, etc.) report we support 5 Hz max (0.2 s min period) */
 #define MAX_ON_CHANGE_SAMPLING_PERIOD_US 10000000 /* 0.1 Hz min (10 s max period)*/
+#define ANDROID_MAX_FREQ 1000 /* 1000 Hz - This is how much Android requests for the fastest frequency */
 
 /*
  * About properties
@@ -281,7 +282,7 @@ static float sensor_get_max_freq (int s)
        if (!sensor_get_fl_prop(s, "max_freq", &max_freq))
                return max_freq;
 
-       return 1000;
+       return ANDROID_MAX_FREQ;
 }
 
 int sensor_get_cal_steps (int s)
@@ -455,6 +456,7 @@ flag_t sensor_get_flags (int s)
                case SENSOR_TYPE_AMBIENT_TEMPERATURE:
                case SENSOR_TYPE_TEMPERATURE:
                case SENSOR_TYPE_RELATIVE_HUMIDITY:
+               case SENSOR_TYPE_STEP_COUNTER:
                        flags |= SENSOR_FLAG_ON_CHANGE_MODE;
                        break;
 
@@ -463,7 +465,9 @@ flag_t sensor_get_flags (int s)
                        flags |= SENSOR_FLAG_WAKE_UP;
                        flags |= SENSOR_FLAG_ON_CHANGE_MODE;
                        break;
-
+               case SENSOR_TYPE_STEP_DETECTOR:
+                       flags |= SENSOR_FLAG_SPECIAL_REPORTING_MODE;
+                       break;
                default:
                        break;
                }
@@ -537,7 +541,7 @@ max_delay_t sensor_get_max_delay (int s)
        sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
 
        if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
-               if (sensor[s].is_polling) {
+               if (sensor[s].mode == MODE_POLL) {
                        /* The must rate */
                        min_supported_rate = get_cdd_freq(s, 1);
                }
@@ -583,6 +587,7 @@ int32_t sensor_get_min_delay (int s)
        char freqs_buf[100];
        char* cursor;
        float max_supported_rate = 0;
+       float max_from_prop = sensor_get_max_freq(s);
        float sr;
 
        /* continuous, on change: minimum sampling period allowed in microseconds.
@@ -616,9 +621,13 @@ int32_t sensor_get_min_delay (int s)
        sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
 
        if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
-               if (sensor[s].is_polling) {
-                       /* The should rate */
-                       max_supported_rate = get_cdd_freq(s, 0);
+               if (sensor[s].mode == MODE_POLL) {
+                       /* If we have max specified via a property use it */
+                       if (max_from_prop != ANDROID_MAX_FREQ)
+                               max_supported_rate = max_from_prop;
+                       else
+                               /* The should rate */
+                               max_supported_rate = get_cdd_freq(s, 0);
                }
        } else {
                cursor = freqs_buf;
@@ -627,7 +636,7 @@ int32_t sensor_get_min_delay (int s)
                        /* Decode a single value */
                        sr = strtod(cursor, NULL);
 
-                       if (sr > max_supported_rate && sr <= sensor_get_max_freq(s))
+                       if (sr > max_supported_rate && sr <= max_from_prop)
                                max_supported_rate = sr;
 
                        /* Skip digits */