* Copyright (C) 2014 Intel Corporation.
*/
+#include <ctype.h>
#include <dirent.h>
+#include <stdlib.h>
#include <utils/Log.h>
#include <hardware/sensors.h>
#include "enumeration.h"
#include "description.h"
#include "utils.h"
#include "transform.h"
+#include "description.h"
+#include "control.h"
+#include "calibration.h"
/*
* This table maps syfs entries in scan_elements directories to sensor types,
* device number associated to a specific sensor.
*/
-struct sensor_catalog_entry_t sensor_catalog[] = {
+ /*
+ * We duplicate entries for the uncalibrated types after their respective base
+ * sensor. This is because all sensor entries must have an associated catalog entry
+ * and also because when only the uncal sensor is active it needs to take it's data
+ * from the same iio device as the base one.
+ */
+
+sensor_catalog_entry_t sensor_catalog[] = {
DECLARE_SENSOR3("accel", SENSOR_TYPE_ACCELEROMETER, "x", "y", "z")
DECLARE_SENSOR3("anglvel", SENSOR_TYPE_GYROSCOPE, "x", "y", "z")
DECLARE_SENSOR3("magn", SENSOR_TYPE_MAGNETIC_FIELD, "x", "y", "z")
+ DECLARE_SENSOR1("intensity", SENSOR_TYPE_LIGHT, "both" )
DECLARE_SENSOR0("illuminance",SENSOR_TYPE_LIGHT )
DECLARE_SENSOR3("incli", SENSOR_TYPE_ORIENTATION, "x", "y", "z")
DECLARE_SENSOR4("rot", SENSOR_TYPE_ROTATION_VECTOR,
"quat_x", "quat_y", "quat_z", "quat_w")
DECLARE_SENSOR0("temp", SENSOR_TYPE_AMBIENT_TEMPERATURE )
+ DECLARE_SENSOR0("proximity", SENSOR_TYPE_PROXIMITY )
+ DECLARE_VIRTUAL(SENSOR_TYPE_GYROSCOPE_UNCALIBRATED )
};
#define CATALOG_SIZE ARRAY_SIZE(sensor_catalog)
+/* ACPI PLD (physical location of device) definitions, as used with sensors */
+
+#define PANEL_FRONT 4
+#define PANEL_BACK 5
/* We equate sensor handles to indices in these tables */
-struct sensor_t sensor_desc[MAX_SENSORS]; /* Android-level descriptors */
-struct sensor_info_t sensor_info[MAX_SENSORS]; /* Internal descriptors */
-int sensor_count; /* Detected sensors */
+struct sensor_t sensor_desc[MAX_SENSORS]; /* Android-level descriptors */
+sensor_info_t sensor[MAX_SENSORS]; /* Internal descriptors */
+int sensor_count; /* Detected sensors */
+
+
+static void setup_properties_from_pld (int s, int panel, int rotation,
+ int num_channels)
+{
+ /*
+ * Generate suitable order and opt_scale directives from the PLD panel
+ * and rotation codes we got. This can later be superseded by the usual
+ * properties if necessary. Eventually we'll need to replace these
+ * mechanisms by a less convoluted one, such as a 3x3 placement matrix.
+ */
+
+ int x = 1;
+ int y = 1;
+ int z = 1;
+ int xy_swap = 0;
+ int angle = rotation * 45;
+
+ /* Only deal with 3 axis chips for now */
+ if (num_channels < 3)
+ return;
+
+ if (panel == PANEL_BACK) {
+ /* Chip placed on the back panel ; negate x and z */
+ x = -x;
+ z = -z;
+ }
+
+ switch (angle) {
+ case 90: /* 90° clockwise: negate y then swap x,y */
+ xy_swap = 1;
+ y = -y;
+ break;
+
+ case 180: /* Upside down: negate x and y */
+ x = -x;
+ y = -y;
+ break;
+
+ case 270: /* 90° counter clockwise: negate x then swap x,y */
+ x = -x;
+ xy_swap = 1;
+ break;
+ }
+
+ if (xy_swap) {
+ sensor[s].order[0] = 1;
+ sensor[s].order[1] = 0;
+ sensor[s].order[2] = 2;
+ sensor[s].quirks |= QUIRK_FIELD_ORDERING;
+ }
+
+ sensor[s].channel[0].opt_scale = x;
+ sensor[s].channel[1].opt_scale = y;
+ sensor[s].channel[2].opt_scale = z;
+}
+
+
+static int is_valid_pld (int panel, int rotation)
+{
+ if (panel != PANEL_FRONT && panel != PANEL_BACK) {
+ ALOGW("Unhandled PLD panel spec: %d\n", panel);
+ return 0;
+ }
+
+ /* Only deal with 90° rotations for now */
+ if (rotation < 0 || rotation > 7 || (rotation & 1)) {
+ ALOGW("Unhandled PLD rotation spec: %d\n", rotation);
+ return 0;
+ }
+
+ return 1;
+}
+
+
+static int read_pld_from_properties (int s, int* panel, int* rotation)
+{
+ int p, r;
+
+ if (sensor_get_prop(s, "panel", &p))
+ return -1;
+
+ if (sensor_get_prop(s, "rotation", &r))
+ return -1;
+
+ if (!is_valid_pld(p, r))
+ return -1;
+
+ *panel = p;
+ *rotation = r;
+
+ ALOGI("S%d PLD from properties: panel=%d, rotation=%d\n", s, p, r);
+
+ return 0;
+}
+
+
+static int read_pld_from_sysfs (int s, int dev_num, int* panel, int* rotation)
+{
+ char sysfs_path[PATH_MAX];
+ int p,r;
+
+ sprintf(sysfs_path, BASE_PATH "../firmware_node/pld/panel", dev_num);
+
+ if (sysfs_read_int(sysfs_path, &p))
+ return -1;
+
+ sprintf(sysfs_path, BASE_PATH "../firmware_node/pld/rotation", dev_num);
+
+ if (sysfs_read_int(sysfs_path, &r))
+ return -1;
+
+ if (!is_valid_pld(p, r))
+ return -1;
+
+ *panel = p;
+ *rotation = r;
+
+ ALOGI("S%d PLD from sysfs: panel=%d, rotation=%d\n", s, p, r);
+
+ return 0;
+}
+
+
+static void decode_placement_information (int dev_num, int num_channels, int s)
+{
+ /*
+ * See if we have optional "physical location of device" ACPI tags.
+ * We're only interested in panel and rotation specifiers. Use the
+ * .panel and .rotation properties in priority, and the actual ACPI
+ * values as a second source.
+ */
+
+ int panel;
+ int rotation;
+
+ if (read_pld_from_properties(s, &panel, &rotation) &&
+ read_pld_from_sysfs(s, dev_num, &panel, &rotation))
+ return; /* No PLD data available */
+
+ /* Map that to field ordering and scaling mechanisms */
+ setup_properties_from_pld(s, panel, rotation, num_channels);
+}
+
+
+static void populate_descriptors (int s, int sensor_type)
+{
+ int32_t min_delay_us;
+ max_delay_t max_delay_us;
+
+ /* Initialize Android-visible descriptor */
+ sensor_desc[s].name = sensor_get_name(s);
+ sensor_desc[s].vendor = sensor_get_vendor(s);
+ sensor_desc[s].version = sensor_get_version(s);
+ sensor_desc[s].handle = s;
+ sensor_desc[s].type = sensor_type;
+
+ sensor_desc[s].maxRange = sensor_get_max_range(s);
+ sensor_desc[s].resolution = sensor_get_resolution(s);
+ sensor_desc[s].power = sensor_get_power(s);
+ sensor_desc[s].stringType = sensor_get_string_type(s);
+
+ /* None of our supported sensors requires a special permission */
+ sensor_desc[s].requiredPermission = "";
+
+ sensor_desc[s].flags = sensor_get_flags(s);
+ sensor_desc[s].minDelay = sensor_get_min_delay(s);
+ sensor_desc[s].maxDelay = sensor_get_max_delay(s);
+
+ ALOGV("Sensor %d (%s) type(%d) minD(%d) maxD(%d) flags(%2.2x)\n",
+ s, sensor[s].friendly_name, sensor_desc[s].type,
+ sensor_desc[s].minDelay, sensor_desc[s].maxDelay,
+ sensor_desc[s].flags);
+
+ /* We currently do not implement batching */
+ sensor_desc[s].fifoReservedEventCount = 0;
+ sensor_desc[s].fifoMaxEventCount = 0;
+
+ min_delay_us = sensor_desc[s].minDelay;
+ max_delay_us = sensor_desc[s].maxDelay;
+
+ sensor[s].min_supported_rate = max_delay_us ? 1000000.0 / max_delay_us : 1;
+ sensor[s].max_supported_rate = min_delay_us && min_delay_us != -1 ? 1000000.0 / min_delay_us : 0;
+}
+
+
+static void add_virtual_sensor (int catalog_index)
+{
+ int s;
+ int sensor_type;
+
+ if (sensor_count == MAX_SENSORS) {
+ ALOGE("Too many sensors!\n");
+ return;
+ }
+
+ sensor_type = sensor_catalog[catalog_index].type;
+
+ s = sensor_count;
+
+ sensor[s].is_virtual = 1;
+ sensor[s].catalog_index = catalog_index;
+ sensor[s].type = sensor_type;
+
+ populate_descriptors(s, sensor_type);
+
+ /* Initialize fields related to sysfs reads offloading */
+ sensor[s].thread_data_fd[0] = -1;
+ sensor[s].thread_data_fd[1] = -1;
+ sensor[s].acquisition_thread = -1;
+
+ sensor_count++;
+}
static void add_sensor (int dev_num, int catalog_index, int use_polling)
const char* prefix;
float scale;
int c;
+ float opt_scale;
+ const char* ch_name;
+ int num_channels;
+ char suffix[MAX_NAME_SIZE + 8];
if (sensor_count == MAX_SENSORS) {
ALOGE("Too many sensors!\n");
s = sensor_count;
- sensor_info[s].dev_num = dev_num;
- sensor_info[s].catalog_index = catalog_index;
+ sensor[s].dev_num = dev_num;
+ sensor[s].catalog_index = catalog_index;
+ sensor[s].type = sensor_type;
+
+ num_channels = sensor_catalog[catalog_index].num_channels;
if (use_polling)
- sensor_info[s].num_channels = 0;
+ sensor[s].num_channels = 0;
else
- sensor_info[s].num_channels =
- sensor_catalog[catalog_index].num_channels;
+ sensor[s].num_channels = num_channels;
prefix = sensor_catalog[catalog_index].tag;
* receiving the illumination sensor calibration inputs from
* the Android properties and setting it within sysfs
*/
- if (sensor_catalog[catalog_index].type == SENSOR_TYPE_LIGHT) {
+ if (sensor_type == SENSOR_TYPE_LIGHT) {
retval = sensor_get_illumincalib(s);
- sprintf(sysfs_path, ILLUMINATION_CALIBPATH, dev_num);
- sysfs_write_int(sysfs_path, retval);
+ if (retval > 0) {
+ sprintf(sysfs_path, ILLUMINATION_CALIBPATH, dev_num);
+ sysfs_write_int(sysfs_path, retval);
+ }
}
/* Read name attribute, if available */
sprintf(sysfs_path, NAME_PATH, dev_num);
- sysfs_read_str(sysfs_path, sensor_info[s].internal_name, MAX_NAME_SIZE);
+ sysfs_read_str(sysfs_path, sensor[s].internal_name, MAX_NAME_SIZE);
/* See if we have general offsets and scale values for this sensor */
sprintf(sysfs_path, SENSOR_OFFSET_PATH, dev_num, prefix);
- sysfs_read_float(sysfs_path, &sensor_info[s].offset);
+ sysfs_read_float(sysfs_path, &sensor[s].offset);
+
+ sprintf(sysfs_path, SENSOR_SCALE_PATH, dev_num, prefix);
+ if (!sensor_get_fl_prop(s, "scale", &scale)) {
+ /*
+ * There is a chip preferred scale specified,
+ * so try to store it in sensor's scale file
+ */
+ if (sysfs_write_float(sysfs_path, scale) == -1 && errno == ENOENT) {
+ ALOGE("Failed to store scale[%g] into %s - file is missing", scale, sysfs_path);
+ /* Store failed, try to store the scale into channel specific file */
+ for (c = 0; c < num_channels; c++)
+ {
+ sprintf(sysfs_path, BASE_PATH "%s", dev_num,
+ sensor_catalog[catalog_index].channel[c].scale_path);
+ if (sysfs_write_float(sysfs_path, scale) == -1)
+ ALOGE("Failed to store scale[%g] into %s", scale, sysfs_path);
+ }
+ }
+ }
sprintf(sysfs_path, SENSOR_SCALE_PATH, dev_num, prefix);
if (!sysfs_read_float(sysfs_path, &scale)) {
- sensor_info[s].scale = scale;
- ALOGI("Scale path %s scale: %f, dev_num =%d \n",
+ sensor[s].scale = scale;
+ ALOGV("Scale path:%s scale:%g dev_num:%d\n",
sysfs_path, scale, dev_num);
- }else {
- sensor_info[s].scale = 1;
+ } else {
+ sensor[s].scale = 1;
+
/* Read channel specific scale if any*/
- for (c = 0; c < sensor_catalog[catalog_index].num_channels; c++)
+ for (c = 0; c < num_channels; c++)
{
sprintf(sysfs_path, BASE_PATH "%s", dev_num,
- sensor_catalog[catalog_index].channel[c].scale_path);
+ sensor_catalog[catalog_index].channel[c].scale_path);
if (!sysfs_read_float(sysfs_path, &scale)) {
- sensor_info[s].channel[c].scale = scale;
- sensor_info[s].scale = 0;
- }
- ALOGI("Scale path %s channel scale: %f dev_num %d\n",
+ sensor[s].channel[c].scale = scale;
+ sensor[s].scale = 0;
+
+ ALOGV( "Scale path:%s "
+ "channel scale:%g dev_num:%d\n",
sysfs_path, scale, dev_num);
+ }
}
}
- /* Initialize Android-visible descriptor */
- sensor_desc[s].name = sensor_get_name(s);
- sensor_desc[s].vendor = sensor_get_vendor(s);
- sensor_desc[s].version = sensor_get_version(s);
- sensor_desc[s].handle = s;
- sensor_desc[s].type = sensor_type;
- sensor_desc[s].maxRange = sensor_get_max_range(s);
- sensor_desc[s].resolution = sensor_get_resolution(s);
- sensor_desc[s].power = sensor_get_power(s);
+ /* Set default scaling - if num_channels is zero, we have one channel */
+
+ sensor[s].channel[0].opt_scale = 1;
+
+ for (c = 1; c < num_channels; c++)
+ sensor[s].channel[c].opt_scale = 1;
- if (sensor_info[s].internal_name[0] == '\0') {
+ /* Read ACPI _PLD attributes for this sensor, if there are any */
+ decode_placement_information(dev_num, num_channels, s);
+
+ /*
+ * See if we have optional correction scaling factors for each of the
+ * channels of this sensor. These would be expressed using properties
+ * like iio.accel.y.opt_scale = -1. In case of a single channel we also
+ * support things such as iio.temp.opt_scale = -1. Note that this works
+ * for all types of sensors, and whatever transform is selected, on top
+ * of any previous conversions.
+ */
+
+ if (num_channels) {
+ for (c = 0; c < num_channels; c++) {
+ ch_name = sensor_catalog[catalog_index].channel[c].name;
+ sprintf(suffix, "%s.opt_scale", ch_name);
+ if (!sensor_get_fl_prop(s, suffix, &opt_scale))
+ sensor[s].channel[c].opt_scale = opt_scale;
+ }
+ } else
+ if (!sensor_get_fl_prop(s, "opt_scale", &opt_scale))
+ sensor[s].channel[0].opt_scale = opt_scale;
+
+ populate_descriptors(s, sensor_type);
+
+ /* Populate the quirks array */
+ sensor_get_quirks(s);
+
+ if (sensor[s].internal_name[0] == '\0') {
/*
* In case the kernel-mode driver doesn't expose a name for
* the iio device, use (null)-dev%d as the trigger name...
* This can be considered a kernel-mode iio driver bug.
*/
ALOGW("Using null trigger on sensor %d (dev %d)\n", s, dev_num);
- strcpy(sensor_info[s].internal_name, "(null)");
+ strcpy(sensor[s].internal_name, "(null)");
}
+ switch (sensor_type) {
+ case SENSOR_TYPE_GYROSCOPE:
+ sensor[s].cal_data = malloc(sizeof(gyro_cal_t));
+ break;
+
+ case SENSOR_TYPE_MAGNETIC_FIELD:
+ sensor[s].cal_data = malloc(sizeof(compass_cal_t));
+ break;
+ }
+
+ sensor[s].max_cal_level = sensor_get_cal_steps(s);
+
/* Select one of the available sensor sample processing styles */
select_transform(s);
+ /* Initialize fields related to sysfs reads offloading */
+ sensor[s].thread_data_fd[0] = -1;
+ sensor[s].thread_data_fd[1] = -1;
+ sensor[s].acquisition_thread = -1;
+
+ /* Check if we have a special ordering property on this sensor */
+ if (sensor_get_order(s, sensor[s].order))
+ sensor[s].quirks |= QUIRK_FIELD_ORDERING;
+
sensor_count++;
}
{
char base_dir[PATH_MAX];
DIR *dir;
- char sysfs_dir[PATH_MAX];
- struct sensor *sensor;
struct dirent *d;
unsigned int i;
int c;
dir = opendir(base_dir);
if (!dir) {
- return;
+ return;
}
/* Enumerate entries in this iio device's base folder */
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
- /* If the name matches a catalog entry, flag it */
- for (i = 0; i<CATALOG_SIZE; i++)
- for (c=0; c<sensor_catalog[i].num_channels; c++)
- if (!strcmp(d->d_name,
- sensor_catalog[i].channel[c].raw_path) ||
- !strcmp(d->d_name,
- sensor_catalog[i].channel[c].input_path)) {
- map[i] = 1;
- break;
- }
+ /* If the name matches a catalog entry, flag it */
+ for (i = 0; i < CATALOG_SIZE; i++) {
+ /* No discovery for virtual sensors */
+ if (sensor_catalog[i].is_virtual)
+ continue;
+ for (c=0; c<sensor_catalog[i].num_channels; c++)
+ if (!strcmp(d->d_name,sensor_catalog[i].channel[c].raw_path) ||
+ !strcmp(d->d_name, sensor_catalog[i].channel[c].input_path)) {
+ map[i] = 1;
+ break;
+ }
+ }
}
closedir(dir);
{
char scan_elem_dir[PATH_MAX];
DIR *dir;
- char sysfs_dir[PATH_MAX];
- struct sensor *sensor;
struct dirent *d;
unsigned int i;
- memset(map, 0, CATALOG_SIZE);
+ memset(map, 0, CATALOG_SIZE);
/* Enumerate entries in this iio device's scan_elements folder */
dir = opendir(scan_elem_dir);
if (!dir) {
- return;
+ return;
}
while ((d = readdir(dir))) {
/* Compare en entry to known ones and create matching sensors */
- for (i = 0; i<CATALOG_SIZE; i++)
+ for (i = 0; i<CATALOG_SIZE; i++) {
+ /* No discovery for virtual sensors */
+ if (sensor_catalog[i].is_virtual)
+ continue;
if (!strcmp(d->d_name,
- sensor_catalog[i].channel[0].en_path)) {
- map[i] = 1;
- break;
- }
+ sensor_catalog[i].channel[0].en_path)) {
+ map[i] = 1;
+ break;
+ }
+ }
}
closedir(dir);
}
-static void orientation_sensor_check(void)
+static void orientation_sensor_check (void)
{
/*
* If we have accel + gyro + magn but no rotation vector sensor,
int has_mag = 0;
int has_rot = 0;
int has_ori = 0;
+ int catalog_size = CATALOG_SIZE;
for (i=0; i<sensor_count; i++)
- switch (sensor_catalog[sensor_info[i].catalog_index].type) {
+ switch (sensor[i].type) {
case SENSOR_TYPE_ACCELEROMETER:
has_acc = 1;
break;
}
if (has_acc && has_gyr && has_mag && !has_rot && !has_ori)
- for (i=0; i<CATALOG_SIZE; i++)
+ for (i=0; i<catalog_size; i++)
if (sensor_catalog[i].type == SENSOR_TYPE_ORIENTATION) {
ALOGI("Adding placeholder orientation sensor");
add_sensor(0, i, 1);
}
+static void propose_new_trigger (int s, char trigger_name[MAX_NAME_SIZE],
+ int sensor_name_len)
+{
+ /*
+ * A new trigger has been enumerated for this sensor. Check if it makes
+ * sense to use it over the currently selected one, and select it if it
+ * is so. The format is something like sensor_name-dev0.
+ */
+
+ const char *suffix = trigger_name + sensor_name_len + 1;
+
+ /* dev is the default, and lowest priority; no need to update */
+ if (!memcmp(suffix, "dev", 3))
+ return;
+
+ /* If we found any-motion trigger, record it */
+
+ if (!memcmp(suffix, "any-motion-", 11)) {
+ strcpy(sensor[s].motion_trigger_name, trigger_name);
+ return;
+ }
+
+ /*
+ * It's neither the default "dev" nor an "any-motion" one. Make sure we
+ * use this though, as we may not have any other indication of the name
+ * of the trigger to use with this sensor.
+ */
+ strcpy(sensor[s].init_trigger_name, trigger_name);
+}
+
+
+static void update_sensor_matching_trigger_name (char name[MAX_NAME_SIZE])
+{
+ /*
+ * Check if we have a sensor matching the specified trigger name,
+ * which should then begin with the sensor name, and end with a number
+ * equal to the iio device number the sensor is associated to. If so,
+ * update the string we're going to write to trigger/current_trigger
+ * when enabling this sensor.
+ */
+
+ int s;
+ int dev_num;
+ int len;
+ char* cursor;
+ int sensor_name_len;
+
+ /*
+ * First determine the iio device number this trigger refers to. We
+ * expect the last few characters (typically one) of the trigger name
+ * to be this number, so perform a few checks.
+ */
+ len = strnlen(name, MAX_NAME_SIZE);
+
+ if (len < 2)
+ return;
+
+ cursor = name + len - 1;
+
+ if (!isdigit(*cursor))
+ return;
+
+ while (len && isdigit(*cursor)) {
+ len--;
+ cursor--;
+ }
+
+ dev_num = atoi(cursor+1);
+
+ /* See if that matches a sensor */
+ for (s=0; s<sensor_count; s++)
+ if (sensor[s].dev_num == dev_num) {
+
+ sensor_name_len = strlen(sensor[s].internal_name);
+
+ if (!strncmp(name,
+ sensor[s].internal_name,
+ sensor_name_len))
+ /* Switch to new trigger if appropriate */
+ propose_new_trigger(s, name, sensor_name_len);
+ }
+}
+
+
+static void setup_trigger_names (void)
+{
+ char filename[PATH_MAX];
+ char buf[MAX_NAME_SIZE];
+ int len;
+ int s;
+ int trigger;
+ int ret;
+
+ /* By default, use the name-dev convention that most drivers use */
+ for (s=0; s<sensor_count; s++)
+ snprintf(sensor[s].init_trigger_name,
+ MAX_NAME_SIZE, "%s-dev%d",
+ sensor[s].internal_name, sensor[s].dev_num);
+
+ /* Now have a look to /sys/bus/iio/devices/triggerX entries */
+
+ for (trigger=0; trigger<MAX_TRIGGERS; trigger++) {
+
+ snprintf(filename, sizeof(filename), TRIGGER_FILE_PATH,trigger);
+
+ ret = sysfs_read_str(filename, buf, sizeof(buf));
+
+ if (ret < 0)
+ break;
+
+ /* Record initial and any-motion triggers names */
+ update_sensor_matching_trigger_name(buf);
+ }
+
+ /*
+ * Certain drivers expose only motion triggers even though they should
+ * be continous. For these, use the default trigger name as the motion
+ * trigger. The code generating intermediate events is dependent on
+ * motion_trigger_name being set to a non empty string.
+ */
+
+ for (s=0; s<sensor_count; s++)
+ if ((sensor[s].quirks & QUIRK_TERSE_DRIVER) &&
+ sensor[s].motion_trigger_name[0] == '\0')
+ strcpy( sensor[s].motion_trigger_name,
+ sensor[s].init_trigger_name);
+
+ for (s=0; s<sensor_count; s++)
+ if (sensor[s].num_channels) {
+ ALOGI("Sensor %d (%s) default trigger: %s\n", s,
+ sensor[s].friendly_name,
+ sensor[s].init_trigger_name);
+ if (sensor[s].motion_trigger_name[0])
+ ALOGI("Sensor %d (%s) motion trigger: %s\n",
+ s, sensor[s].friendly_name,
+ sensor[s].motion_trigger_name);
+ }
+}
+
+
+static void uncalibrated_gyro_check (void)
+{
+ unsigned int has_gyr = 0;
+ unsigned int dev_num;
+ int i;
+
+ int cal_idx = 0;
+ int uncal_idx = 0;
+ int catalog_size = CATALOG_SIZE; /* Avoid GCC sign comparison warning */
+
+ if (sensor_count == MAX_SENSORS)
+ return;
+ /* Checking to see if we have a gyroscope - we can only have uncal if we have the base sensor */
+ for (i=0; i < sensor_count; i++)
+ if (sensor[i].type == SENSOR_TYPE_GYROSCOPE) {
+ has_gyr=1;
+ cal_idx = i;
+ break;
+ }
+
+ if (has_gyr) {
+ uncal_idx = sensor_count;
+ sensor[uncal_idx].base_count = 1;
+ sensor[uncal_idx].base[0] = cal_idx;
+
+ for (i=0; i<catalog_size; i++)
+ if (sensor_catalog[i].type == SENSOR_TYPE_GYROSCOPE_UNCALIBRATED) {
+ add_virtual_sensor(i);
+ break;
+ }
+ }
+}
+
+
void enumerate_sensors (void)
{
/*
char trig_sensors[CATALOG_SIZE];
int dev_num;
unsigned int i;
+ int trig_found;
for (dev_num=0; dev_num<MAX_DEVICES; dev_num++) {
+ trig_found = 0;
+
discover_poll_sensors(dev_num, poll_sensors);
discover_trig_sensors(dev_num, trig_sensors);
for (i=0; i<CATALOG_SIZE; i++)
- if (trig_sensors[i])
+ if (trig_sensors[i]) {
add_sensor(dev_num, i, 0);
+ trig_found = 1;
+ }
else
if (poll_sensors[i])
add_sensor(dev_num, i, 1);
+
+ if (trig_found) {
+ build_sensor_report_maps(dev_num);
+ }
}
ALOGI("Discovered %d sensors\n", sensor_count);
+ /* Set up default - as well as custom - trigger names */
+ setup_trigger_names();
+
/* Make sure Android fall backs to its own orientation sensor */
orientation_sensor_check();
+
+ /*
+ * Create the uncalibrated counterpart to the compensated gyroscope.
+ * This is is a new sensor type in Android 4.4.
+ */
+
+ uncalibrated_gyro_check();
}
void delete_enumeration_data (void)
{
+ int i;
+ for (i = 0; i < sensor_count; i++)
+ if (sensor[i].cal_data) {
+ free(sensor[i].cal_data);
+ sensor[i].cal_data = NULL;
+ sensor[i].cal_level = 0;
+ }
+
/* Reset sensor count */
sensor_count = 0;
}
-int get_sensors_list( struct sensors_module_t* module,
- struct sensor_t const** list)
+int get_sensors_list (__attribute__((unused)) struct sensors_module_t* module,
+ struct sensor_t const** list)
{
*list = sensor_desc;
return sensor_count;
OSDN Git Service
