X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=description.c;h=9e0702d7d9bc8df80b6f67f032aaaa0618dbcfd0;hb=53b3fe263b1716d46b0e74234323a159497cb1e1;hp=3d99614724f48d1861556778affaae2f62636e83;hpb=8c426f37d87c2049951809e67e51f424690a3c91;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/description.c b/description.c
index 3d99614..9e0702d 100644
--- a/description.c
+++ b/description.c
@@ -16,6 +16,7 @@
 
 #define MIN_ON_CHANGE_SAMPLING_PERIOD_US   200000 /* For on change sensors (temperature, proximity, ALS, etc.) report we support 5 Hz max (0.2 s min period) */
 #define MAX_ON_CHANGE_SAMPLING_PERIOD_US 10000000 /* 0.1 Hz min (10 s max period)*/
+#define ANDROID_MAX_FREQ 1000 /* 1000 Hz - This is how much Android requests for the fastest frequency */
 
 /*
  * About properties
@@ -281,7 +282,7 @@ static float sensor_get_max_freq (int s)
 	if (!sensor_get_fl_prop(s, "max_freq", &max_freq))
 		return max_freq;
 
-	return 1000;
+	return ANDROID_MAX_FREQ;
 }
 
 int sensor_get_cal_steps (int s)
@@ -370,6 +371,12 @@ uint32_t sensor_get_quirks (int s)
 		if (strstr(quirks_buf, "noisy"))
 			sensor[s].quirks |= QUIRK_NOISY;
 
+		if (strstr(quirks_buf, "biased"))
+			sensor[s].quirks |= QUIRK_BIASED;
+
+		if (strstr(quirks_buf, "spotty"))
+			sensor[s].quirks |= QUIRK_SPOTTY;
+
 		sensor[s].quirks |= QUIRK_ALREADY_DECODED;
 	}
 
@@ -586,6 +593,7 @@ int32_t sensor_get_min_delay (int s)
 	char freqs_buf[100];
 	char* cursor;
 	float max_supported_rate = 0;
+	float max_from_prop = sensor_get_max_freq(s);
 	float sr;
 
 	/* continuous, on change: minimum sampling period allowed in microseconds.
@@ -620,8 +628,12 @@ int32_t sensor_get_min_delay (int s)
 
 	if (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) < 0) {
 		if (sensor[s].mode == MODE_POLL) {
-			/* The should rate */
-			max_supported_rate = get_cdd_freq(s, 0);
+			/* If we have max specified via a property use it */
+			if (max_from_prop != ANDROID_MAX_FREQ)
+				max_supported_rate = max_from_prop;
+			else
+				/* The should rate */
+				max_supported_rate = get_cdd_freq(s, 0);
 		}
 	} else {
 		cursor = freqs_buf;
@@ -630,7 +642,7 @@ int32_t sensor_get_min_delay (int s)
 			/* Decode a single value */
 			sr = strtod(cursor, NULL);
 
-			if (sr > max_supported_rate && sr <= sensor_get_max_freq(s))
+			if (sr > max_supported_rate && sr <= max_from_prop)
 				max_supported_rate = sr;
 
 			/* Skip digits */