Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/mr1/sensors/master' into mr1

[android-x86/hardware-intel-libsensors.git] / description.h

diff --git a/description.h b/description.h
index 9f4b486..e4f0641 100644 (file)
--- 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,6 +13,20 @@
 #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 */
+
+#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 s);
 char*          sensor_get_vendor       (int s);
@@ -28,7 +42,9 @@ 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]);
+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