X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=enumeration.c;h=55fe165c572601b53e6c13ff45323dee6e3e2da9;hb=6dd7dd1b4b8fb2e833671956ad936cbd635ed4db;hp=f3e6752793dd0539119170a58ef9e0d9382742fc;hpb=115f76c8fe40f5e1ece9349b1da4fe1514767aee;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/enumeration.c b/enumeration.c
index f3e6752..55fe165 100644
--- a/enumeration.c
+++ b/enumeration.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <utils/Log.h>
+#include <sys/stat.h>
 #include <hardware/sensors.h>
 #include "enumeration.h"
 #include "description.h"
@@ -16,6 +17,8 @@
 #include "control.h"
 #include "calibration.h"
 
+#include <errno.h>
+
 /*
  * This table maps syfs entries in scan_elements directories to sensor types,
  * and will also be used to determine other sysfs names as well as the iio
@@ -32,6 +35,7 @@
 sensor_catalog_entry_t sensor_catalog[] = {
 	{
 		.tag		= "accel",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_ACCELEROMETER,
 		.num_channels	= 3,
 		.is_virtual	= 0,
@@ -43,6 +47,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "anglvel",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_GYROSCOPE,
 		.num_channels	= 3,
 		.is_virtual	= 0,
@@ -54,6 +59,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "magn",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_MAGNETIC_FIELD,
 		.num_channels	= 3,
 		.is_virtual	= 0,
@@ -65,7 +71,8 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "intensity",
-		.type		= SENSOR_TYPE_LIGHT,
+		.shorthand	= "",
+		.type		= SENSOR_TYPE_INTERNAL_INTENSITY,
 		.num_channels	= 1,
 		.is_virtual	= 0,
 		.channel = {
@@ -74,7 +81,8 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "illuminance",
-		.type		= SENSOR_TYPE_LIGHT,
+		.shorthand	= "",
+		.type		= SENSOR_TYPE_INTERNAL_ILLUMINANCE,
 		.num_channels	= 1,
 		.is_virtual	= 0,
 		.channel = {
@@ -83,6 +91,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "incli",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_ORIENTATION,
 		.num_channels	= 3,
 		.is_virtual	= 0,
@@ -94,6 +103,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "rot",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_ROTATION_VECTOR,
 		.num_channels	= 4,
 		.is_virtual	= 0,
@@ -106,6 +116,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "temp",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_AMBIENT_TEMPERATURE,
 		.num_channels	= 1,
 		.is_virtual	= 0,
@@ -115,6 +126,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "proximity",
+		.shorthand	= "prox",
 		.type		= SENSOR_TYPE_PROXIMITY,
 		.num_channels	= 1,
 		.is_virtual	= 0,
@@ -124,6 +136,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_GYROSCOPE_UNCALIBRATED,
 		.num_channels	= 0,
 		.is_virtual	= 1,
@@ -134,6 +147,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED,
 		.num_channels	= 0,
 		.is_virtual	= 1,
@@ -143,6 +157,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "steps",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_STEP_COUNTER,
 		.num_channels	= 1,
 		.is_virtual	= 0,
@@ -152,6 +167,7 @@ sensor_catalog_entry_t sensor_catalog[] = {
 	},
 	{
 		.tag		= "steps",
+		.shorthand	= "",
 		.type		= SENSOR_TYPE_STEP_DETECTOR,
 		.num_channels	= 1,
 		.is_virtual	= 0,
@@ -165,15 +181,55 @@ sensor_catalog_entry_t sensor_catalog[] = {
 			},
 		},
 	},
+	{
+		.tag		= "proximity",
+		.shorthand	= "prox",
+		.type		= SENSOR_TYPE_PROXIMITY,
+		.num_channels	= 4,
+		.is_virtual	= 0,
+		.channel = {
+			{
+				DECLARE_VOID_CHANNEL("proximity0")
+				.num_events = 1,
+				.event = {
+					{ DECLARE_EVENT("proximity0", "_", "", "", "thresh", "_", "either") },
+				},
+			},
+			{
+				DECLARE_VOID_CHANNEL("proximity1")
+				.num_events = 1,
+				.event = {
+					{ DECLARE_EVENT("proximity1", "_", "", "", "thresh", "_", "either") },
+				},
+			},
+			{
+				DECLARE_VOID_CHANNEL("proximity2")
+				.num_events = 1,
+				.event = {
+					{ DECLARE_EVENT("proximity2", "_", "", "", "thresh", "_", "either") },
+				},
+			},
+			{
+				DECLARE_VOID_CHANNEL("proximity3")
+				.num_events = 1,
+				.event = {
+					{ DECLARE_EVENT("proximity3", "_", "", "", "thresh", "_", "either") },
+				},
+			},
+		},
+	},
 };
 
-#define CATALOG_SIZE	ARRAY_SIZE(sensor_catalog)
+unsigned int 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
 
+/* Buffer default length */
+#define BUFFER_LENGTH	16
+
 /* We equate sensor handles to indices in these tables */
 
 struct sensor_t	sensor_desc[MAX_SENSORS];	/* Android-level descriptors */
@@ -340,6 +396,20 @@ static void decode_placement_information (int dev_num, int num_channels, int s)
 }
 
 
+static int map_internal_to_external_type (int sensor_type)
+{
+	/* Most sensors are internally identified using the Android type, but for some we use a different type specification internally */
+
+	switch (sensor_type) {
+		case SENSOR_TYPE_INTERNAL_ILLUMINANCE:
+		case SENSOR_TYPE_INTERNAL_INTENSITY:
+			return SENSOR_TYPE_LIGHT;
+
+		default:
+			return sensor_type;
+	}
+}
+
 static void populate_descriptors (int s, int sensor_type)
 {
 	int32_t		min_delay_us;
@@ -350,7 +420,7 @@ static void populate_descriptors (int s, int sensor_type)
 	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].type		= map_internal_to_external_type(sensor_type);
 
 	sensor_desc[s].maxRange		= sensor_get_max_range(s);
 	sensor_desc[s].resolution	= sensor_get_resolution(s);
@@ -410,7 +480,7 @@ static void add_virtual_sensor (int catalog_index)
 }
 
 
-static void add_sensor (int dev_num, int catalog_index, int mode)
+static int add_sensor (int dev_num, int catalog_index, int mode)
 {
 	int s;
 	int sensor_type;
@@ -424,10 +494,11 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 	int num_channels;
 	char suffix[MAX_NAME_SIZE + 8];
 	int calib_bias;
+	int buffer_length;
 
 	if (sensor_count == MAX_SENSORS) {
 		ALOGE("Too many sensors!\n");
-		return;
+		return -1;
 	}
 
 	sensor_type = sensor_catalog[catalog_index].type;
@@ -444,6 +515,7 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 	sensor[s].catalog_index	= catalog_index;
 	sensor[s].type		= sensor_type;
 	sensor[s].mode		= mode;
+	sensor[s].trigger_nr = -1;	/* -1 means no trigger - we'll populate these at a later time */
 
         num_channels = sensor_catalog[catalog_index].num_channels;
 
@@ -452,13 +524,24 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
         else
                 sensor[s].num_channels = num_channels;
 
+	/* Populate the quirks array */
+	sensor_get_quirks(s);
+
+	/* Reject interfaces that may have been disabled through a quirk for this driver */
+	if ((mode == MODE_EVENT   && (sensor[s].quirks & QUIRK_NO_EVENT_MODE)) ||
+	    (mode == MODE_TRIGGER && (sensor[s].quirks & QUIRK_NO_TRIG_MODE )) ||
+            (mode == MODE_POLL    && (sensor[s].quirks & QUIRK_NO_POLL_MODE ))) {
+		memset(&sensor[s], 0, sizeof(sensor[0]));
+		return -1;
+	}
+
 	prefix = sensor_catalog[catalog_index].tag;
 
 	/*
 	 * receiving the illumination sensor calibration inputs from
 	 * the Android properties and setting it within sysfs
 	 */
-	if (sensor_type == SENSOR_TYPE_LIGHT) {
+	if (sensor_type == SENSOR_TYPE_INTERNAL_ILLUMINANCE) {
 		retval = sensor_get_illumincalib(s);
                 if (retval > 0) {
 			sprintf(sysfs_path, ILLUMINATION_CALIBPATH, dev_num);
@@ -488,6 +571,19 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 				sysfs_write_int(sysfs_path, calib_bias);
 			}
 
+	/* Change buffer length according to the property or use default value */
+	if (mode == MODE_TRIGGER) {
+                if (sensor_get_prop(s, "buffer_length", &buffer_length)) {
+                        buffer_length = BUFFER_LENGTH;
+                }
+
+                sprintf(sysfs_path, BUFFER_LENGTH_PATH, dev_num);
+
+                if (sysfs_write_int(sysfs_path, buffer_length) <= 0) {
+                        ALOGE("Failed to set buffer length on dev%d", dev_num);
+                }
+        }
+
 	/* Read name attribute, if available */
 	sprintf(sysfs_path, NAME_PATH, dev_num);
 	sysfs_read_str(sysfs_path, sensor[s].internal_name, MAX_NAME_SIZE);
@@ -559,34 +655,37 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 		sensor[s].channel[c].raw_path_present = (access(sysfs_path, R_OK) != -1);
 	}
 
-	/* Read ACPI _PLD attributes for this sensor, if there are any */
-	decode_placement_information(dev_num, num_channels, s);
+	sensor_get_available_frequencies(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 (sensor_get_mounting_matrix(s, sensor[s].mounting_matrix))
+		sensor[s].quirks |= QUIRK_MOUNTING_MATRIX;
+	else
+		/* Read ACPI _PLD attributes for this sensor, if there are any */
+		decode_placement_information(dev_num, num_channels, s);
 
-        if (num_channels) {
+	/*
+	 * 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
+        } 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
@@ -598,7 +697,13 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 	}
 
 	switch (sensor_type) {
-		case SENSOR_TYPE_GYROSCOPE:
+		case SENSOR_TYPE_ACCELEROMETER:
+			/* Only engage accelerometer bias compensation if really needed */
+			if (sensor_get_quirks(s) & QUIRK_BIASED)
+				sensor[s].cal_data = calloc(1, sizeof(accel_cal_t));
+			break;
+
+			case SENSOR_TYPE_GYROSCOPE:
 			sensor[s].cal_data = malloc(sizeof(gyro_cal_t));
 			break;
 
@@ -624,75 +729,7 @@ static void add_sensor (int dev_num, int catalog_index, int mode)
 	sensor[s].needs_enable = get_needs_enable(dev_num, sensor_catalog[catalog_index].tag);
 
 	sensor_count++;
-}
-
-
-static void discover_sensors (int dev_num, char *sysfs_base_path, char map[CATALOG_SIZE],
-			      void (*discover_sensor)(int, char*, char*))
-{
-	char sysfs_dir[PATH_MAX];
-	DIR *dir;
-	struct dirent *d;
-	unsigned int i;
-
-	memset(map, 0, CATALOG_SIZE);
-
-	snprintf(sysfs_dir, sizeof(sysfs_dir), sysfs_base_path, dev_num);
-
-	dir = opendir(sysfs_dir);
-	if (!dir) {
-		return;
-	}
-
-	/* Enumerate entries in this iio device's base folder */
-
-	while ((d = readdir(dir))) {
-		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++) {
-
-			/* No discovery for virtual sensors */
-			if (sensor_catalog[i].is_virtual)
-				continue;
-			discover_sensor(i, d->d_name, map);
-		}
-	}
-
-	closedir(dir);
-}
-
-static void check_poll_sensors (int i, char *sysfs_file, char map[CATALOG_SIZE])
-{
-        int c;
-
-	for (c = 0; c < sensor_catalog[i].num_channels; c++)
-		if (!strcmp(sysfs_file, sensor_catalog[i].channel[c].raw_path) ||
-		    !strcmp(sysfs_file, sensor_catalog[i].channel[c].input_path)) {
-			map[i] = 1;
-			break;
-		}
-}
-static void check_trig_sensors (int i, char *sysfs_file, char map[CATALOG_SIZE])
-{
-
-	if (!strcmp(sysfs_file, sensor_catalog[i].channel[0].en_path)) {
-		map[i] = 1;
-		return;
-	}
-}
-
-static void check_event_sensors(int i, char *sysfs_file, char map[CATALOG_SIZE])
-{
-	int j, k;
-
-	for (j = 0; j < sensor_catalog[i].num_channels; j++)
-		for (k = 0; k < sensor_catalog[i].channel[j].num_events; k++)
-			if (!strcmp(sysfs_file, sensor_catalog[i].channel[j].event[k].ev_en_path)) {
-				map[i] = 1;
-				return ;
-			}
+	return 0;
 }
 
 static void virtual_sensors_check (void)
@@ -703,9 +740,9 @@ static void virtual_sensors_check (void)
 	int has_mag = 0;
 	int has_rot = 0;
 	int has_ori = 0;
-	int catalog_size = CATALOG_SIZE;
 	int gyro_cal_idx = 0;
 	int magn_cal_idx = 0;
+	unsigned int j;
 
 	for (i=0; i<sensor_count; i++)
 		switch (sensor[i].type) {
@@ -728,38 +765,38 @@ static void virtual_sensors_check (void)
 				break;
 		}
 
-	for (i=0; i<catalog_size; i++)
-		switch (sensor_catalog[i].type) {
+	for (j=0; j<catalog_size; j++)
+		switch (sensor_catalog[j].type) {
 			/*
-	 		* If we have accel + gyro + magn but no rotation vector sensor,
-	 		* SensorService replaces the HAL provided orientation sensor by the
-	 		* AOSP version... provided we report one. So initialize a virtual
-	 		* orientation sensor with zero values, which will get replaced. See:
-	 		* frameworks/native/services/sensorservice/SensorService.cpp, looking
-	 		* for SENSOR_TYPE_ROTATION_VECTOR; that code should presumably fall
-	 		* back to mUserSensorList.add instead of replaceAt, but accommodate it.
-	 		*/
+			 * If we have accel + gyro + magn but no rotation vector sensor,
+			 * SensorService replaces the HAL provided orientation sensor by the
+			 * AOSP version... provided we report one. So initialize a virtual
+			 * orientation sensor with zero values, which will get replaced. See:
+			 * frameworks/native/services/sensorservice/SensorService.cpp, looking
+			 * for SENSOR_TYPE_ROTATION_VECTOR; that code should presumably fall
+			 * back to mUserSensorList.add instead of replaceAt, but accommodate it.
+			 */
 
 			case SENSOR_TYPE_ORIENTATION:
 				if (has_acc && has_gyr && has_mag && !has_rot && !has_ori)
-					add_sensor(0, i, MODE_POLL);
+					add_sensor(0, j, MODE_POLL);
 				break;
 			case SENSOR_TYPE_GYROSCOPE_UNCALIBRATED:
 				if (has_gyr) {
 					sensor[sensor_count].base_count = 1;
 					sensor[sensor_count].base[0] = gyro_cal_idx;
-					add_virtual_sensor(i);
+					add_virtual_sensor(j);
 				}
 				break;
 			case SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED:
 				if (has_mag) {
 					sensor[sensor_count].base_count = 1;
 					sensor[sensor_count].base[0] = magn_cal_idx;
-					add_virtual_sensor(i);
+					add_virtual_sensor(j);
 				}
 				break;
 			default:
-			break;
+				break;
 		}
 }
 
@@ -785,6 +822,11 @@ static void propose_new_trigger (int s, char trigger_name[MAX_NAME_SIZE],
 		return;
 	}
 
+	/* If we found a hrtimer trigger, record it */
+	if (!memcmp(suffix, "hr-dev", 6)) {
+		strcpy(sensor[s].hrtimer_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.
@@ -793,7 +835,7 @@ static void propose_new_trigger (int s, char trigger_name[MAX_NAME_SIZE],
 }
 
 
-static void update_sensor_matching_trigger_name (char name[MAX_NAME_SIZE])
+static void update_sensor_matching_trigger_name (char name[MAX_NAME_SIZE], int* updated, int trigger)
 {
 	/*
 	 * Check if we have a sensor matching the specified trigger name, which should then begin with the sensor name, and end with a number
@@ -837,9 +879,60 @@ static void update_sensor_matching_trigger_name (char name[MAX_NAME_SIZE])
 			if (!strncmp(name, sensor[s].internal_name, sensor_name_len))
 				/* Switch to new trigger if appropriate */
 				propose_new_trigger(s, name, sensor_name_len);
+				updated[s] = 1;
+				sensor[s].trigger_nr = trigger;
 		}
 }
 
+extern float sensor_get_max_static_freq(int s);
+extern float sensor_get_min_freq (int s);
+
+static int create_hrtimer_trigger(int s, int trigger)
+{
+	struct stat dir_status;
+	char buf[MAX_NAME_SIZE];
+	char hrtimer_path[PATH_MAX];
+	char hrtimer_name[MAX_NAME_SIZE];
+	float min_supported_rate = 1, min_rate_cap, max_supported_rate;
+
+	snprintf(buf, MAX_NAME_SIZE, "hrtimer-%s-hr-dev%d", sensor[s].internal_name, sensor[s].dev_num);
+	snprintf(hrtimer_name, MAX_NAME_SIZE, "%s-hr-dev%d", sensor[s].internal_name, sensor[s].dev_num);
+	snprintf(hrtimer_path, PATH_MAX, "%s%s", CONFIGFS_TRIGGER_PATH, buf);
+
+	/* Get parent dir status */
+	if (stat(CONFIGFS_TRIGGER_PATH, &dir_status))
+		return -1;
+
+	/* Create hrtimer with the same access rights as it's parent */
+	if (mkdir(hrtimer_path, dir_status.st_mode))
+		if (errno != EEXIST)
+			return -1;
+
+	strncpy (sensor[s].hrtimer_trigger_name, hrtimer_name, MAX_NAME_SIZE);
+	sensor[s].trigger_nr = trigger;
+
+	max_supported_rate = sensor_get_max_static_freq(s);
+
+	/* set 0 for wrong values */
+	if (max_supported_rate < 0.1) {
+		max_supported_rate = 0;
+	}
+
+	sensor[s].max_supported_rate = max_supported_rate;
+	sensor_desc[s].minDelay = max_supported_rate ? (int32_t) (1000000.0 / max_supported_rate) : 0;
+
+	/* Check if a minimum rate was specified for this sensor */
+	min_rate_cap = sensor_get_min_freq(s);
+
+	if (min_supported_rate < min_rate_cap) {
+		min_supported_rate = min_rate_cap;
+	}
+
+	sensor[s].min_supported_rate = min_supported_rate;
+	sensor_desc[s].maxDelay = (max_delay_t) (1000000.0 / min_supported_rate);
+
+	return 0;
+}
 
 static void setup_trigger_names (void)
 {
@@ -848,6 +941,7 @@ static void setup_trigger_names (void)
 	int s;
 	int trigger;
 	int ret;
+	int updated[MAX_SENSORS] = {0};
 
 	/* By default, use the name-dev convention that most drivers use */
 	for (s=0; s<sensor_count; s++)
@@ -857,7 +951,7 @@ static void setup_trigger_names (void)
 
 	for (trigger=0; trigger<MAX_TRIGGERS; trigger++) {
 
-		snprintf(filename, sizeof(filename), TRIGGER_FILE_PATH,trigger);
+		snprintf(filename, sizeof(filename), TRIGGER_FILE_PATH, trigger);
 
 		ret = sysfs_read_str(filename, buf, sizeof(buf));
 
@@ -865,7 +959,16 @@ static void setup_trigger_names (void)
 			break;
 
 		/* Record initial and any-motion triggers names */
-		update_sensor_matching_trigger_name(buf);
+		update_sensor_matching_trigger_name(buf, updated, trigger);
+	}
+
+
+	/* If we don't have any other trigger exposed and quirk hrtimer is set setup the hrtimer name here  - and create it also */
+	for (s=0; s<sensor_count && trigger<MAX_TRIGGERS; s++) {
+		if ((sensor[s].quirks & QUIRK_HRTIMER) && !updated[s]) {
+			create_hrtimer_trigger(s, trigger);
+			trigger++;
+		}
 	}
 
 	/*
@@ -882,9 +985,89 @@ static void setup_trigger_names (void)
 			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);
+			if (sensor[s].hrtimer_trigger_name[0])
+				ALOGI("Sensor %d (%s) hrtimer trigger: %s\n", s, sensor[s].friendly_name, sensor[s].hrtimer_trigger_name);
 		}
 }
 
+
+static int catalog_index_from_sensor_type (int type)
+{
+	/* Return first matching catalog entry index for selected type */
+	unsigned int i;
+
+	for (i=0; i<catalog_size; i++)
+		if (sensor_catalog[i].type == type)
+			return i;
+
+	return -1;
+}
+
+
+static void post_process_sensor_list (char poll_map[catalog_size], char trig_map[catalog_size], char event_map[catalog_size])
+{
+	int illuminance_cat_index = catalog_index_from_sensor_type(SENSOR_TYPE_INTERNAL_ILLUMINANCE);
+	int intensity_cat_index	  = catalog_index_from_sensor_type(SENSOR_TYPE_INTERNAL_INTENSITY);
+	int illuminance_found	  = poll_map[illuminance_cat_index] || trig_map[illuminance_cat_index] || event_map[illuminance_cat_index];
+
+	/* If an illumimance sensor has been reported */
+	if (illuminance_found) {
+		/* Hide any intensity sensors we can have for the same iio device */
+		poll_map [intensity_cat_index     ] = 0;
+		trig_map [intensity_cat_index     ] = 0;
+		event_map[intensity_cat_index     ] = 0;
+		return;
+	}
+}
+
+
+static void swap_sensors (int s1, int s2)
+{
+	struct sensor_t	temp_sensor_desc;
+	sensor_info_t	temp_sensor;
+
+	/* S1 -> temp */
+	memcpy(&temp_sensor, &sensor[s1], sizeof(sensor_info_t));
+	memcpy(&temp_sensor_desc, &sensor_desc[s1], sizeof(struct sensor_t));
+
+	/* S2 -> S1 */
+	memcpy(&sensor[s1], &sensor[s2], sizeof(sensor_info_t));
+	memcpy(&sensor_desc[s1], &sensor_desc[s2], sizeof(struct sensor_t));
+
+	/* temp -> S2 */
+	memcpy(&sensor[s2], &temp_sensor, sizeof(sensor_info_t));
+	memcpy(&sensor_desc[s2], &temp_sensor_desc,  sizeof(struct sensor_t));
+
+	/* Fix-up sensor id mapping, which is stale */
+	sensor_desc[s1].handle	= s1;
+	sensor_desc[s2].handle	= s2;
+
+	/* Fix up name and vendor buffer pointers, which are potentially stale pointers */
+	sensor_desc[s1].name		= sensor_get_name(s1);
+	sensor_desc[s1].vendor		= sensor_get_vendor(s1);
+	sensor_desc[s2].name		= sensor_get_name(s2);
+	sensor_desc[s2].vendor		= sensor_get_vendor(s2);
+}
+
+
+static void reorder_sensors (void)
+{
+	/* Some sensors may be marked as secondary - these need to be listed after other sensors of the same type */
+	int s1, s2;
+
+	for (s1=0; s1<sensor_count-1; s1++)
+		if (sensor[s1].quirks & QUIRK_SECONDARY) {
+			/* Search for subsequent sensors of same type */
+			for (s2 = s1+1; s2<sensor_count; s2++)
+				if (sensor[s2].type == sensor[s1].type && !(sensor[s2].quirks & QUIRK_SECONDARY)) {
+					ALOGI("Sensor S%d has higher priority than S%d, swapping\n", s2, s1);
+					swap_sensors(s1, s2);
+					break;
+				}
+		}
+}
+
+
 void enumerate_sensors (void)
 {
 	/*
@@ -892,12 +1075,13 @@ void enumerate_sensors (void)
 	 * using their own channels). We can't have multiple sensors of the same type on the same device. In case of detection as both a poll-mode
 	 * and trigger-based sensor, use the trigger usage mode.
 	 */
-	char poll_sensors[CATALOG_SIZE];
-	char trig_sensors[CATALOG_SIZE];
-	char event_sensors[CATALOG_SIZE];
+	char poll_sensors[catalog_size];
+	char trig_sensors[catalog_size];
+	char event_sensors[catalog_size];
 	int dev_num;
 	unsigned int i;
 	int trig_found;
+	int s;
 
 	for (dev_num=0; dev_num<MAX_DEVICES; dev_num++) {
 		trig_found = 0;
@@ -906,32 +1090,44 @@ void enumerate_sensors (void)
 		discover_sensors(dev_num, CHANNEL_PATH, trig_sensors, check_trig_sensors);
 		discover_sensors(dev_num, EVENTS_PATH, event_sensors, check_event_sensors);
 
-		for (i=0; i<CATALOG_SIZE; i++) {
-			if (event_sensors[i]) {
-				add_sensor(dev_num, i, MODE_EVENT);
+		/* Hide specific sensor types if appropriate */
+		post_process_sensor_list(poll_sensors, trig_sensors, event_sensors);
+
+		for (i=0; i<catalog_size; i++) {
+			/* Try using events interface */
+			if (event_sensors[i] && !add_sensor(dev_num, i, MODE_EVENT))
 				continue;
-			}
-			if (trig_sensors[i]) {
-				add_sensor(dev_num, i, MODE_TRIGGER);
+
+			/* Then trigger */
+			if (trig_sensors[i] && !add_sensor(dev_num, i, MODE_TRIGGER)) {
 				trig_found = 1;
 				continue;
 			}
-			if (poll_sensors[i]) {
+
+			/* Try polling otherwise */
+			if (poll_sensors[i])
 				add_sensor(dev_num, i, MODE_POLL);
-				continue;
-			}
 		}
 
 		if (trig_found)
 			build_sensor_report_maps(dev_num);
 	}
 
+	/* Make sure secondary sensors appear after primary ones */
+	reorder_sensors();
+
 	ALOGI("Discovered %d sensors\n", sensor_count);
 
 	/* Set up default - as well as custom - trigger names */
 	setup_trigger_names();
 
+	ALOGI("Discovered %d sensors\n", sensor_count);
+
 	virtual_sensors_check();
+
+	for (s=0; s<sensor_count; s++) {
+		ALOGI("S%d: %s\n", s, sensor[s].friendly_name);
+	}
 }