X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-libsensors.git;a=blobdiff_plain;f=control.c;h=e260b94a182d07b0f25136ec628583242c1266db;hp=018ebf21e9b6df15cbee37be589b5589e4a11b19;hb=3068a3668fbb4961f531df01b5bcb644e959f8a2;hpb=eb4520a1ecbd1a14b83ba942e92d08e32c9c449e

diff --git a/control.c b/control.c
index 018ebf2..e260b94 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 <linux/iio/events.h>
 /* 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				*/
@@ -382,12 +373,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 +391,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 +439,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 +448,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		*/
@@ -843,13 +850,17 @@ static int sensor_set_rate (int s, float requested_rate)
 		arb_sampling_rate = sensor[s].max_supported_rate;
 	}
 
+	/* Record the rate that was agreed upon with the sensor taken in isolation ; this avoid uncontrolled ripple effects between colocated sensor rates */
+	sensor[s].semi_arbitrated_rate = arb_sampling_rate;
+
 	/* Coordinate with others active sensors on the same device, if any */
 	if (per_device_sampling_rate)
 		for (n=0; n<sensor_count; n++)
-			if (n != s && sensor[n].dev_num == dev_num && sensor[n].num_channels && is_enabled(n) && sensor[n].sampling_rate > arb_sampling_rate) {
+			if (n != s && sensor[n].dev_num == dev_num && sensor[n].num_channels && is_enabled(n) &&
+				sensor[n].semi_arbitrated_rate > arb_sampling_rate) {
 				ALOGV("Sampling rate shared between %s and %s, using %g instead of %g\n", sensor[s].friendly_name, sensor[n].friendly_name,
-													  sensor[n].sampling_rate, arb_sampling_rate);
-				arb_sampling_rate = sensor[n].sampling_rate;
+													  sensor[n].semi_arbitrated_rate, arb_sampling_rate);
+				arb_sampling_rate = sensor[n].semi_arbitrated_rate;
 			}
 
 	sensor[s].sampling_rate = arb_sampling_rate;
@@ -1163,8 +1174,12 @@ static void stamp_reports (int dev_num, int64_t ts)
 	int s;
 
 	for (s=0; s<MAX_SENSORS; s++)
-		if (sensor[s].dev_num == dev_num && is_enabled(s) && sensor[s].mode != MODE_POLL)
-			set_report_ts(s, ts);
+		if (sensor[s].dev_num == dev_num && is_enabled(s) && sensor[s].mode != MODE_POLL) {
+			if (sensor[s].quirks & QUIRK_SPOTTY)
+				set_report_ts(s, ts);
+			else
+				sensor[s].report_ts = ts;
+		}
 }
 
 
@@ -1292,6 +1307,7 @@ static int integrate_device_report_from_event(int dev_num, int fd)
 	for (s = 0; s < MAX_SENSORS; s++)
 		if (sensor[s].dev_num == dev_num &&
 		    is_enabled(s)) {
+			sensor[s].event_id = event.id;
 			sensor[s].report_ts = ts;
 			sensor[s].report_pending = 1;
 			sensor[s].report_initialized = 1;
@@ -1328,7 +1344,7 @@ static int propagate_vsensor_report (int s, sensors_event_t *data)
 	memcpy(data, &sensor[s].sample, 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 */
 	return 1;
 }
 
@@ -1364,13 +1380,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;