GMINL-7944: Introduce internal sensor types for ALS

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

diff --git a/description.c b/description.c
index d0ce8cc..9349ad8 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
@@ -83,7 +84,7 @@
  * properties values happen to have its iio device name set to bmg160.
  */
 
-static int sensor_get_st_prop (int s, const char* sel, char val[MAX_NAME_SIZE])
+int sensor_get_st_prop (int s, const char* sel, char val[MAX_NAME_SIZE])
 {
        char prop_name[PROP_NAME_MAX];
        char prop_val[PROP_VALUE_MAX];
@@ -107,7 +108,7 @@ static int sensor_get_st_prop (int s, const char* sel, char val[MAX_NAME_SIZE])
 
        /* Fall back to simple form, like ro.iio.anglvel.name */
 
-       sprintf(prop_name, PROP_BASE, prefix, sel);
+       snprintf(prop_name, PROP_NAME_MAX, PROP_BASE, prefix, sel);
 
        if (property_get(prop_name, prop_val, "")) {
                strncpy(val, prop_val, MAX_NAME_SIZE-1);
@@ -228,7 +229,7 @@ float sensor_get_max_range (int s)
 
        /* We should cap returned samples accordingly... */
 
-       switch (sensor[s].type) {
+       switch (sensor_desc[s].type) {
                case SENSOR_TYPE_ACCELEROMETER:         /* m/s^2        */
                        return 50;
 
@@ -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)
@@ -370,6 +371,21 @@ uint32_t sensor_get_quirks (int s)
                if (strstr(quirks_buf, "noisy"))
                        sensor[s].quirks |= QUIRK_NOISY;
 
+               if (strstr(quirks_buf, "biased"))
+                       sensor[s].quirks |= QUIRK_BIASED;
+
+               if (strstr(quirks_buf, "spotty"))
+                       sensor[s].quirks |= QUIRK_SPOTTY;
+
+               if (strstr(quirks_buf, "no-event"))
+                       sensor[s].quirks |= QUIRK_NO_EVENT_MODE;
+
+               if (strstr(quirks_buf, "no-trig"))
+                       sensor[s].quirks |= QUIRK_NO_TRIG_MODE;
+
+               if (strstr(quirks_buf, "no-poll"))
+                       sensor[s].quirks |= QUIRK_NO_POLL_MODE;
+
                sensor[s].quirks |= QUIRK_ALREADY_DECODED;
        }
 
@@ -403,13 +419,16 @@ int sensor_get_order (int s, unsigned char map[MAX_CHANNELS])
 
 char* sensor_get_string_type (int s)
 {
-       switch (sensor[s].type) {
+       switch (sensor_desc[s].type) {
                case SENSOR_TYPE_ACCELEROMETER:
                        return SENSOR_STRING_TYPE_ACCELEROMETER;
 
                case SENSOR_TYPE_MAGNETIC_FIELD:
                        return SENSOR_STRING_TYPE_MAGNETIC_FIELD;
 
+               case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
+                       return SENSOR_STRING_TYPE_MAGNETIC_FIELD_UNCALIBRATED;
+
                case SENSOR_TYPE_ORIENTATION:
                        return SENSOR_STRING_TYPE_ORIENTATION;
 
@@ -447,11 +466,12 @@ flag_t sensor_get_flags (int s)
 {
        flag_t flags = 0;
 
-       switch (sensor[s].type) {
+       switch (sensor_desc[s].type) {
                case SENSOR_TYPE_LIGHT:
                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;
 
@@ -460,9 +480,11 @@ 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:
-                       ALOGI("Unknown sensor");
+                       break;
                }
        return flags;
 }
@@ -470,12 +492,11 @@ flag_t sensor_get_flags (int s)
 
 static int get_cdd_freq (int s, int must)
 {
-       switch (sensor[s].type) {
+       switch (sensor_desc[s].type) {
                case SENSOR_TYPE_ACCELEROMETER:
                        return (must ? 100 : 200); /* must 100 Hz, should 200 Hz, CDD compliant */
 
                case SENSOR_TYPE_GYROSCOPE:
-               case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
                        return (must ? 200 : 200); /* must 200 Hz, should 200 Hz, CDD compliant */
 
                case SENSOR_TYPE_MAGNETIC_FIELD:
@@ -535,7 +556,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);
                }
@@ -581,6 +602,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.
@@ -614,9 +636,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;
@@ -625,7 +651,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 */