merge build into master

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

diff --git a/description.c b/description.c
index 183c11a..8932ea8 100644 (file)
--- a/description.c
+++ b/description.c
@@ -2,28 +2,59 @@
  * Copyright (C) 2014 Intel Corporation.
  */
 
+#include <stdlib.h>
 #include <utils/Log.h>
+#include <cutils/properties.h>
 #include <hardware/sensors.h>
 #include "enumeration.h"
 
-/*
- * This information should be provided on a sensor basis through a configuration
- * file, or we should build a catalog of known sensors.
- */
-
 #define IIO_SENSOR_HAL_VERSION 1
 
 
+static 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];
+       int i                   = sensor_info[s].catalog_index;
+       const char *prefix      = sensor_catalog[i].tag;
+
+       sprintf(prop_name, PROP_BASE, prefix, sel);
+
+       if (property_get(prop_name, prop_val, "")) {
+               strncpy(val, prop_val, MAX_NAME_SIZE-1);
+               val[MAX_NAME_SIZE-1] = '\0';
+               return 0;
+       }
+
+       return -1;
+}
+
+
+static int sensor_get_fl_prop (int s, const char* sel, float* val)
+{
+       char buf[MAX_NAME_SIZE];
+
+       if (sensor_get_st_prop(s, sel, buf))
+               return -1;
+
+       *val = (float) strtod(buf, NULL);
+       return 0;
+}
+
+
 char* sensor_get_name (int s)
 {
-       if (sensor_info[s].friendly_name[0] == '\0') {
-
-               /* If we got a iio device name from sysfs, use it */
-               if (sensor_info[s].internal_name[0])
-                       sprintf(sensor_info[s].friendly_name, "S%d-%s", s,
-                               sensor_info[s].internal_name);
-               else
-                       sprintf(sensor_info[s].friendly_name, "S%d", s);
+       if (sensor_info[s].friendly_name[0] != '\0' ||
+               !sensor_get_st_prop(s, "name", sensor_info[s].friendly_name))
+                       return sensor_info[s].friendly_name;
+
+       /* If we got a iio device name from sysfs, use it */
+       if (sensor_info[s].internal_name[0]) {
+               snprintf(sensor_info[s].friendly_name, MAX_NAME_SIZE, "S%d-%s",
+                        s, sensor_info[s].internal_name);
+               sensor_info[s].friendly_name[MAX_NAME_SIZE-1] = '\0';
+       } else {
+               sprintf(sensor_info[s].friendly_name, "S%d", s);
        }
 
        return sensor_info[s].friendly_name;
@@ -32,14 +63,15 @@ char* sensor_get_name (int s)
 
 char* sensor_get_vendor (int s)
 {
-       if (sensor_info[s].vendor_name[0])
-               return sensor_info[s].vendor_name;
+       if (sensor_info[s].vendor_name[0] ||
+               !sensor_get_st_prop(s, "vendor", sensor_info[s].vendor_name))
+                       return sensor_info[s].vendor_name;
 
-       return "<unknown>";
+       return "";
 }
 
 
-int sensor_get_version (int handle)
+int sensor_get_version (int s)
 {
        return IIO_SENSOR_HAL_VERSION;
 }
@@ -50,8 +82,9 @@ float sensor_get_max_range (int s)
        int catalog_index;
        int sensor_type;
 
-       if (sensor_info[s].max_range != 0.0)
-               return sensor_info[s].max_range;
+       if (sensor_info[s].max_range != 0.0 ||
+               !sensor_get_fl_prop(s, "max_range", &sensor_info[s].max_range))
+                       return sensor_info[s].max_range;
 
        /* Try returning a sensible value given the sensor type */
 
@@ -91,12 +124,32 @@ float sensor_get_max_range (int s)
 
 float sensor_get_resolution (int s)
 {
-       return sensor_info[s].resolution;
+       if (sensor_info[s].resolution != 0.0 ||
+               !sensor_get_fl_prop(s, "resolution", &sensor_info[s].resolution))
+                       return sensor_info[s].resolution;
+
+       return 0;
 }
 
 
 float sensor_get_power (int s)
 {
        /* mA used while sensor is in use ; not sure about volts :) */
-       return sensor_info[s].power;
+       if (sensor_info[s].power != 0.0 ||
+               !sensor_get_fl_prop(s, "power", &sensor_info[s].power))
+                       return sensor_info[s].power;
+
+       return 0;
+}
+
+
+float sensor_get_illumincalib (int s)
+{
+       /* calibrating the ALS Sensor*/
+       if (sensor_info[s].illumincalib != 0.0 ||
+               !sensor_get_fl_prop(s, "illumincalib", &sensor_info[s].illumincalib)) {
+                       return sensor_info[s].illumincalib;
+       }
+
+       return 0;
 }