X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=control.c;h=c36085eab7c92db937b23e6e6a2e3e8279883693;hb=d3fcd6151aa98afa8ac7649dbe692d358bf3a6f2;hp=dca2eb2413035c717f3a259f027e3bfc1b61659a;hpb=378432a4f0cb62a7189340ee1424a529fcf2085a;p=android-x86%2Fhardware-intel-libsensors.git diff --git a/control.c b/control.c index dca2eb2..c36085e 100644 --- a/control.c +++ b/control.c @@ -1,6 +1,18 @@ /* - * Copyright (C) 2014-2015 Intel Corporation. - */ +// Copyright (c) 2015 Intel Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +*/ #include #include @@ -21,7 +33,12 @@ #include "calibration.h" #include "description.h" #include "filtering.h" +#ifndef __NO_EVENTS__ #include +#include +#endif +#include + /* Currently active sensors count, per device */ static int poll_sensors_per_dev[MAX_DEVICES]; /* poll-mode sensors */ static int trig_sensors_per_dev[MAX_DEVICES]; /* trigger, event based */ @@ -34,11 +51,14 @@ static int poll_fd; /* epoll instance covering all enabled sensors */ static int active_poll_sensors; /* Number of enabled poll-mode sensors */ +static int flush_event_fd[2]; /* Pipe used for flush signaling */ + /* We use pthread condition variables to get worker threads out of sleep */ static pthread_condattr_t thread_cond_attr [MAX_SENSORS]; static pthread_cond_t thread_release_cond [MAX_SENSORS]; static pthread_mutex_t thread_release_mutex [MAX_SENSORS]; +#define FLUSH_REPORT_TAG 900 /* * We associate tags to each of our poll set entries. These tags have the following values: * - a iio device number if the fd is a iio character device fd @@ -300,6 +320,8 @@ void build_sensor_report_maps (int dev_num) known_channels++; } + sensor_update_max_range(s); + /* Stop sampling - if we are recovering from hal restart */ enable_buffer(dev_num, 0); setup_trigger(s, "\n"); @@ -727,20 +749,60 @@ static float get_group_max_sampling_rate (int s) return arbitrated_rate; } +extern float sensor_get_max_freq (int s); + +static float select_closest_available_rate(int s, float requested_rate) +{ + float sr; + int j; + float selected_rate = 0; + float max_rate_from_prop = sensor_get_max_freq(s); + int dev_num = sensor[s].dev_num; + + if (!sensor[s].avail_freqs_count) + return requested_rate; + + for (j = 0; j < sensor[s].avail_freqs_count; j++) { + + sr = sensor[s].avail_freqs[j]; + + /* If this matches the selected rate, we're happy. Have some tolerance for rounding errors and avoid needless jumps to higher rates */ + if ((fabs(requested_rate - sr) <= 0.01) && (sr <= max_rate_from_prop)) { + return sr; + } + + /* Select rate if it's less than max freq */ + if ((sr > selected_rate) && (sr <= max_rate_from_prop)) { + selected_rate = sr; + } + + /* + * If we reached a higher value than the desired rate, adjust selected rate so it matches the first higher available one and + * stop parsing - this makes the assumption that rates are sorted by increasing value in the allowed frequencies string. + */ + if (sr > requested_rate) { + return selected_rate; + } + } + + /* Check for wrong values */ + if (selected_rate < 0.1) { + return requested_rate; + } else { + return selected_rate; + } +} static int sensor_set_rate (int s, float requested_rate) { /* Set the rate at which a specific sensor should report events. See Android sensors.h for indication on sensor trigger modes */ char sysfs_path[PATH_MAX]; - char avail_sysfs_path[PATH_MAX]; int dev_num = sensor[s].dev_num; int i = sensor[s].catalog_index; const char *prefix = sensor_catalog[i].tag; int per_sensor_sampling_rate; int per_device_sampling_rate; - char freqs_buf[100]; - char* cursor; int n; float sr; float group_max_sampling_rate; @@ -807,49 +869,15 @@ static int sensor_set_rate (int s, float requested_rate) return -ENOSYS; } - /* Check if we have contraints on allowed sampling rates */ - - sprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num); - - if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) > 0) { - cursor = freqs_buf; - - /* Decode allowed sampling rates string, ex: "10 20 50 100" */ - - /* While we're not at the end of the string */ - while (*cursor && cursor[0]) { - - /* Decode a single value */ - sr = strtod(cursor, NULL); - - /* If this matches the selected rate, we're happy. Have some tolerance for rounding errors and avoid needless jumps to higher rates */ - if (fabs(arb_sampling_rate - sr) <= 0.01) { - arb_sampling_rate = sr; - break; - } - - /* - * If we reached a higher value than the desired rate, adjust selected rate so it matches the first higher available one and - * stop parsing - this makes the assumption that rates are sorted by increasing value in the allowed frequencies string. - */ - if (sr > arb_sampling_rate) { - arb_sampling_rate = sr; - break; - } - - /* Skip digits */ - while (cursor[0] && !isspace(cursor[0])) - cursor++; - - /* Skip spaces */ - while (cursor[0] && isspace(cursor[0])) - cursor++; - } - } - - if (sensor[s].max_supported_rate && - arb_sampling_rate > sensor[s].max_supported_rate) { - arb_sampling_rate = sensor[s].max_supported_rate; + if (sensor[s].hrtimer_trigger_name[0] != '\0') { + snprintf(trigger_path, PATH_MAX, "%s%s%d/", IIO_DEVICES, "trigger", sensor[s].trigger_nr); + snprintf(hrtimer_sampling_path, PATH_MAX, "%s%s", trigger_path, "sampling_frequency"); + /* Enforce frequency update when software trigger + * frequency and current sampling rate are different */ + if (sysfs_read_float(hrtimer_sampling_path, &sr) != -1 && sr != cur_sampling_rate) + cur_sampling_rate = -1; + } else { + arb_sampling_rate = select_closest_available_rate(s, arb_sampling_rate); } /* Record the rate that was agreed upon with the sensor taken in isolation ; this avoid uncontrolled ripple effects between colocated sensor rates */ @@ -879,16 +907,17 @@ static int sensor_set_rate (int s, float requested_rate) ALOGI("Sensor %d (%s) sampling rate set to %g\n", s, sensor[s].friendly_name, arb_sampling_rate); - if (sensor[s].hrtimer_trigger_name[0] != '\0') { - snprintf(trigger_path, PATH_MAX, "%s%s%d/", IIO_DEVICES, "trigger", sensor[s].trigger_nr); - snprintf (hrtimer_sampling_path, PATH_MAX, "%s%s", trigger_path, "sampling_frequency"); - sysfs_write_float(hrtimer_sampling_path, arb_sampling_rate); - } + if (sensor[s].hrtimer_trigger_name[0] != '\0') + sysfs_write_float(hrtimer_sampling_path, ceilf(arb_sampling_rate)); if (trig_sensors_per_dev[dev_num]) enable_buffer(dev_num, 0); - sysfs_write_float(sysfs_path, arb_sampling_rate); + if (sensor[s].hrtimer_trigger_name[0] != '\0') { + sysfs_write_float(sysfs_path, select_closest_available_rate(s, arb_sampling_rate)); + } else { + sysfs_write_float(sysfs_path, arb_sampling_rate); + } /* Check if it makes sense to use an alternate trigger */ tentative_switch_trigger(s); @@ -1081,6 +1110,9 @@ int sensor_activate (int s, int enabled, int from_virtual) } /* Note: poll-mode fds are not readable */ +#ifdef __NO_EVENTS__ + } +#else } else if (sensor[s].mode == MODE_EVENT) { event_fd = events_fd[dev_num]; @@ -1112,6 +1144,7 @@ int sensor_activate (int s, int enabled, int from_virtual) device_fd[dev_num] = -1; } } +#endif } /* Ensure that on-change sensors send at least one event after enable */ @@ -1249,7 +1282,6 @@ static int integrate_device_report_from_dev(int dev_num, int fd) sensor[s].report_pending = DATA_TRIGGER; sensor[s].report_initialized = 1; - ts_offset += sr_offset; } /* Tentatively switch to an any-motion trigger if conditions are met */ @@ -1290,11 +1322,13 @@ static int integrate_device_report_from_dev(int dev_num, int fd) return 0; } +#ifndef __NO_EVENTS__ static int integrate_device_report_from_event(int dev_num, int fd) { int len, s; int64_t ts; struct iio_event_data event; + int64_t boot_to_rt_delta = get_timestamp_boot() - get_timestamp_realtime(); /* There's an incoming report on the specified iio device char dev fd */ if (fd == -1) { @@ -1311,9 +1345,9 @@ static int integrate_device_report_from_event(int dev_num, int fd) return -1; } - ts = event.timestamp; + ts = event.timestamp + boot_to_rt_delta; - ALOGV("Read event %lld from fd %d of iio device %d\n", event.id, fd, dev_num); + ALOGV("Read event %lld from fd %d of iio device %d - ts %lld\n", event.id, fd, dev_num, ts); /* Map device report to sensor reports */ for (s = 0; s < MAX_SENSORS; s++) @@ -1327,6 +1361,7 @@ static int integrate_device_report_from_event(int dev_num, int fd) } return 0; } +#endif static int integrate_device_report(int dev_num) { @@ -1337,11 +1372,13 @@ static int integrate_device_report(int dev_num) return -1; } +#ifndef __NO_EVENTS__ if (events_fd[dev_num] != -1) { ret = integrate_device_report_from_event(dev_num, events_fd[dev_num]); if (ret < 0) return ret; } +#endif if (device_fd[dev_num] != -1) ret = integrate_device_report_from_dev(dev_num, device_fd[dev_num]); @@ -1395,6 +1432,7 @@ static int propagate_sensor_report (int s, sensors_event_t *data) data->type = sensor_desc[s].type; /* sensor_desc[s].type can differ from sensor[s].type ; internal types are remapped */ data->timestamp = sensor[s].report_ts; +#ifndef __NO_EVENTS__ if (sensor[s].mode == MODE_EVENT) { ALOGV("Reporting event\n"); /* Android requires events to return 1.0 */ @@ -1415,6 +1453,7 @@ static int propagate_sensor_report (int s, sensors_event_t *data) data->data[2] = 0.0; return 1; } +#endif /* Convert the data into the expected Android-level format */ @@ -1621,6 +1660,12 @@ await_event: /* Get report from acquisition thread */ integrate_thread_report(ev[i].data.u32); break; + case FLUSH_REPORT_TAG: + { + char flush_event_content; + read(flush_event_fd[0], &flush_event_content, sizeof(flush_event_content)); + break; + } default: ALOGW("Unexpected event source!\n"); @@ -1660,18 +1705,21 @@ int sensor_set_delay (int s, int64_t ns) int sensor_flush (int s) { + char flush_event_content = 0; /* If one shot or not enabled return -EINVAL */ if (sensor_desc[s].flags & SENSOR_FLAG_ONE_SHOT_MODE || !is_enabled(s)) return -EINVAL; sensor[s].meta_data_pending++; + write(flush_event_fd[1], &flush_event_content, sizeof(flush_event_content)); return 0; } int allocate_control_data (void) { - int i; + int i, ret; + struct epoll_event ev = {0}; for (i=0; i