X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=control.c;h=1a5cd4d75fc2d0ed0f82277c141f066b8a084793;hb=1ee37bf989b90d3b8dd24bae497c15350de5fbec;hp=c527a554561b9dc2d6f521ffdfbd38d08109d17c;hpb=a80f4c9fdecfa1c44ae12dfd2f7abf19e974ec57;p=android-x86%2Fhardware-intel-libsensors.git diff --git a/control.c b/control.c index c527a55..1a5cd4d 100644 --- a/control.c +++ b/control.c @@ -21,16 +21,7 @@ #include "calibration.h" #include "description.h" #include "filtering.h" - -/* Couple of temporary defines until we get a suitable linux/iio/events.h include */ - -struct iio_event_data { - __u64 id; - __s64 timestamp; -}; - -#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int) - +#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 */ @@ -43,11 +34,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 @@ -309,6 +303,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"); @@ -382,12 +378,16 @@ int adjust_counters (int s, int enabled, int from_virtual) ALOGI("Enabling sensor %d (iio device %d: %s)\n", s, dev_num, sensor[s].friendly_name); switch (sensor[s].type) { + case SENSOR_TYPE_ACCELEROMETER: + accel_cal_init(s); + break; + case SENSOR_TYPE_MAGNETIC_FIELD: - compass_read_data(&sensor[s]); + compass_read_data(s); break; case SENSOR_TYPE_GYROSCOPE: - gyro_cal_init(&sensor[s]); + gyro_cal_init(s); break; } } else { @@ -396,11 +396,20 @@ int adjust_counters (int s, int enabled, int from_virtual) /* Sensor disabled, lower report available flag */ sensor[s].report_pending = 0; - if (sensor[s].type == SENSOR_TYPE_MAGNETIC_FIELD) - compass_store_data(&sensor[s]); + /* Save calibration data to persistent storage */ + switch (sensor[s].type) { + case SENSOR_TYPE_ACCELEROMETER: + accel_cal_store(s); + break; + + case SENSOR_TYPE_MAGNETIC_FIELD: + compass_store_data(s); + break; - if (sensor[s].type == SENSOR_TYPE_GYROSCOPE) - gyro_store_data(&sensor[s]); + case SENSOR_TYPE_GYROSCOPE: + gyro_store_data(s); + break; + } } /* We changed the state of a sensor: adjust device ref counts */ @@ -435,6 +444,7 @@ int adjust_counters (int s, int enabled, int from_virtual) static int get_field_count (int s, size_t *field_size) { *field_size = sizeof(float); + switch (sensor[s].type) { case SENSOR_TYPE_ACCELEROMETER: /* m/s^2 */ case SENSOR_TYPE_MAGNETIC_FIELD: /* micro-tesla */ @@ -443,6 +453,8 @@ static int get_field_count (int s, size_t *field_size) case SENSOR_TYPE_GYROSCOPE: /* radians/s */ return 3; + case SENSOR_TYPE_INTERNAL_INTENSITY: + case SENSOR_TYPE_INTERNAL_ILLUMINANCE: case SENSOR_TYPE_LIGHT: /* SI lux units */ case SENSOR_TYPE_AMBIENT_TEMPERATURE: /* °C */ case SENSOR_TYPE_TEMPERATURE: /* °C */ @@ -529,7 +541,7 @@ static void* acquisition_routine (void* param) /* Initialize data fields that will be shared by all sensor reports */ data.version = sizeof(sensors_event_t); data.sensor = s; - data.type = sensor[s].type; + data.type = sensor_desc[s].type; num_fields = get_field_count(s, &field_size); @@ -720,25 +732,67 @@ 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; float cur_sampling_rate; /* Currently used sampling rate */ float arb_sampling_rate; /* Granted sampling rate after arbitration */ + char hrtimer_sampling_path[PATH_MAX]; + char trigger_path[PATH_MAX]; ALOGV("Sampling rate %g requested on sensor %d (%s)\n", requested_rate, s, sensor[s].friendly_name); @@ -798,49 +852,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.001) { - 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 */ @@ -870,10 +890,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') + 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); @@ -984,7 +1011,11 @@ int sensor_activate (int s, int enabled, int from_virtual) if (trig_sensors_per_dev[dev_num]) { /* Start sampling */ - setup_trigger(s, sensor[s].init_trigger_name); + if (sensor[s].hrtimer_trigger_name[0] != '\0') + setup_trigger(s, sensor[s].hrtimer_trigger_name); + else + setup_trigger(s, sensor[s].init_trigger_name); + enable_buffer(dev_num, 1); } } else if (sensor[s].mode == MODE_POLL) { @@ -1167,8 +1198,12 @@ static void stamp_reports (int dev_num, int64_t ts) int s; for (s=0; ssensor = s; - data->type = sensor[s].type; + data->type = sensor_desc[s].type; /* sensor_desc[s].type can differ from sensor[s].type ; internal types are remapped */ return 1; } @@ -1367,13 +1404,25 @@ static int propagate_sensor_report (int s, sensors_event_t *data) data->version = sizeof(sensors_event_t); data->sensor = s; - data->type = sensor[s].type; + 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; if (sensor[s].mode == MODE_EVENT) { ALOGV("Reporting event\n"); /* Android requires events to return 1.0 */ - data->data[0] = 1.0; + int dir = IIO_EVENT_CODE_EXTRACT_DIR(sensor[s].event_id); + switch (sensor[s].type) { + case SENSOR_TYPE_PROXIMITY: + if (dir == IIO_EV_DIR_FALLING) + data->data[0] = 0.0; + else + data->data[0] = 1.0; + break; + default: + data->data[0] = 1.0; + break; + + } data->data[1] = 0.0; data->data[2] = 0.0; return 1; @@ -1584,6 +1633,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"); @@ -1623,18 +1678,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