Fix 64bit builds on master

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

diff --git a/description.c b/description.c
index d2a5874..c54e4be 100644 (file)
--- a/description.c
+++ b/description.c
@@ -286,7 +286,7 @@ static float sensor_get_min_freq (int s)
 }
 
 
-static float sensor_get_max_freq (int s)
+float sensor_get_max_freq (int s)
 {
        float max_freq;
 
@@ -397,6 +397,12 @@ uint32_t sensor_get_quirks (int s)
                if (strstr(quirks_buf, "no-poll"))
                        sensor[s].quirks |= QUIRK_NO_POLL_MODE;
 
+               if (strstr(quirks_buf, "hrtimer"))
+                       sensor[s].quirks |= QUIRK_HRTIMER;
+
+               if (strstr(quirks_buf, "secondary"))
+                       sensor[s].quirks |= QUIRK_SECONDARY;
+
                sensor[s].quirks |= QUIRK_ALREADY_DECODED;
        }
 
@@ -434,12 +440,13 @@ int sensor_get_mounting_matrix (int s, float mm[9])
        char *tmp1 = mm_buf, *tmp2;
 
        switch (sensor[s].type) {
-       case SENSOR_TYPE_ACCELEROMETER:
-       case SENSOR_TYPE_MAGNETIC_FIELD:
-       case SENSOR_TYPE_GYROSCOPE:
-               break;
-       default:
-               return 0;
+               case SENSOR_TYPE_ACCELEROMETER:
+               case SENSOR_TYPE_MAGNETIC_FIELD:
+               case SENSOR_TYPE_GYROSCOPE:
+               case SENSOR_TYPE_PROXIMITY:
+                       break;
+               default:
+                       return 0;
        }
 
        sprintf(mm_path, MOUNTING_MATRIX_PATH, dev_num);
@@ -458,6 +465,18 @@ int sensor_get_mounting_matrix (int s, float mm[9])
                tmp1 = tmp2 + 1;
        }
 
+       /*
+        * For proximity sensors, interpret a negative final z value as a hint that the sensor is back mounted. In that case, mark the sensor as secondary to
+        * ensure that it gets listed after other sensors of same type that would be front-mounted. Most applications will only ask for the default proximity
+        * sensor and it makes more sense to point to, say, the IR based proximity sensor rather than SAR based one if we have both, as on SoFIA LTE MRD boards.
+        */
+        if (sensor[s].type == SENSOR_TYPE_PROXIMITY) {
+               if (mm[8] < 0) {
+                       sensor[s].quirks |= QUIRK_SECONDARY;
+               }
+               return 0;
+       }
+
        ALOGI("%s: %f %f %f %f %f %f %f %f %f\n", __func__, mm[0], mm[1], mm[2], mm[3], mm[4], mm[5], mm[6], mm[7], mm[8]);
        return 1;
 }
@@ -570,7 +589,7 @@ max_delay_t sensor_get_max_delay (int s)
        int dev_num     = sensor[s].dev_num;
        char freqs_buf[100];
        char* cursor;
-       float min_supported_rate = 1000;
+       float min_supported_rate;
        float rate_cap;
        float sr;
 
@@ -599,31 +618,43 @@ max_delay_t sensor_get_max_delay (int s)
                                return 0;
                }
        }
-       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].mode == MODE_POLL) {
-                       /* The must rate */
-                       min_supported_rate = get_cdd_freq(s, 1);
-               }
-       } else {
-               cursor = freqs_buf;
-               while (*cursor && cursor[0]) {
+       switch (sensor[s].mode) {
+               case MODE_TRIGGER:
+                       /* For interrupt-based devices, obey the list of supported sampling rates */
+                       sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);
+                       if (!(sensor_get_quirks(s) & QUIRK_HRTIMER) &&
+                                       sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) > 0) {
 
-                       /* Decode a single value */
-                       sr = strtod(cursor, NULL);
+                               min_supported_rate = 1000;
+                               cursor = freqs_buf;
 
-                       if (sr < min_supported_rate)
-                               min_supported_rate = sr;
+                               while (*cursor && cursor[0]) {
 
-                       /* Skip digits */
-                       while (cursor[0] && !isspace(cursor[0]))
-                               cursor++;
+                                       /* Decode a single value */
+                                       sr = strtod(cursor, NULL);
 
-                       /* Skip spaces */
-                       while (cursor[0] && isspace(cursor[0]))
-                               cursor++;
-               }
+                                       if (sr < min_supported_rate)
+                                               min_supported_rate = sr;
+
+                                       /* Skip digits */
+                                       while (cursor[0] && !isspace(cursor[0]))
+                                               cursor++;
+
+                                       /* Skip spaces */
+                                       while (cursor[0] && isspace(cursor[0]))
+                                               cursor++;
+                               }
+
+                               break;
+                       }
+
+                       /* Fall through ... */
+
+               default:
+                       /* Report 1 Hz */
+                       min_supported_rate = 1;
+                       break;
        }
 
        /* Check if a minimum rate was specified for this sensor */
@@ -650,6 +681,7 @@ int32_t sensor_get_min_delay (int s)
        float max_supported_rate = 0;
        float max_from_prop = sensor_get_max_freq(s);
        float sr;
+       int hrtimer_quirk_enabled = sensor_get_quirks(s) & QUIRK_HRTIMER;
 
        /* continuous, on change: minimum sampling period allowed in microseconds.
         * special : 0, unless otherwise noted
@@ -681,8 +713,8 @@ 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].mode == MODE_POLL) {
+       if (hrtimer_quirk_enabled || sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
+               if (hrtimer_quirk_enabled || (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;