X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=description.h;h=80868e9818675a20fec344da6d51cffa9f93c629;hb=7b6c078;hp=a614a4fa7365d2b5e14b3a514cc9b967c77a1c04;hpb=af418943f636a36ae1077a01d62049afbd60785f;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/description.h b/description.h
index a614a4f..80868e9 100644
--- a/description.h
+++ b/description.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  */
 
 #ifndef __DESCRIPTION_H__
@@ -13,26 +13,39 @@
 #define QUIRK_TERSE_DRIVER	0x08  /* Force duplicate events generation    */
 #define QUIRK_NOISY		0x10  /* High noise level on readings	      */
 #define QUIRK_FORCE_CONTINUOUS	0x20  /* Force usage of continuous trigger    */
+#define QUIRK_BIASED		0x40  /* Biased sensor, requires compensation */
+#define QUIRK_SPOTTY		0x80  /* Driver may lose events		      */
+#define QUIRK_NO_EVENT_MODE	0x100 /* Disable event mode		      */
+#define QUIRK_NO_TRIG_MODE	0x200 /* Disable trigger mode                 */
+#define QUIRK_NO_POLL_MODE	0x400 /* Disable poll mode 		      */
+#define QUIRK_MOUNTING_MATRIX	0x800  /* Mounting information present */
+#define QUIRK_HRTIMER		0x1000	/* We may use a hrtimer if there is no other trigger */
+
+#ifdef __LP64__
+	typedef uint64_t	flag_t;
+	typedef int64_t		max_delay_t;
+#else
+	typedef uint32_t	flag_t;
+	typedef int32_t		max_delay_t;
+#endif
 
-char*	sensor_get_name		(int handle);
-char*	sensor_get_vendor	(int handle);
-int	sensor_get_version	(int handle);
-float	sensor_get_max_range	(int handle);
-float	sensor_get_resolution	(int handle);
-float	sensor_get_power	(int handle);
-float	sensor_get_illumincalib (int handle);
-
+char*		sensor_get_name		(int s);
+char*		sensor_get_vendor	(int s);
+int		sensor_get_version	(int s);
+float		sensor_get_max_range	(int s);
+float		sensor_get_resolution	(int s);
+float		sensor_get_power	(int s);
+flag_t		sensor_get_flags	(int s);
+int32_t		sensor_get_min_delay	(int s);
+max_delay_t	sensor_get_max_delay	(int s);
+float		sensor_get_illumincalib (int s);
+uint32_t	sensor_get_quirks	(int s);
 int		sensor_get_prop		(int s, const char* sel, int* val);
 int		sensor_get_fl_prop	(int s, const char* sel, float* val);
-
-int		sensor_get_order	(int s, unsigned char map[MAX_CHANNELS]);
-
-char* sensor_get_string_type(int s);
-flag_t sensor_get_flags (int s);
-
-uint32_t sensor_get_quirks (int s);
-
-int32_t sensor_get_min_delay(int s);
-max_delay_t sensor_get_max_delay (int s);
+int		sensor_get_order	(int s,unsigned char map[MAX_CHANNELS]);
+int		sensor_get_mounting_matrix(int s,float mounting_matrix[9]);
+int		sensor_get_cal_steps	(int s);
+char*		sensor_get_string_type	(int s);
+int 		sensor_get_st_prop	(int s, const char* sel, char val[MAX_NAME_SIZE]);
 
 #endif