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

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

diff --git a/common.h b/common.h
index d63d3c9..fcc2025 100644 (file)
--- a/common.h
+++ b/common.h
@@ -27,6 +27,7 @@
 
 #define PROP_BASE      "ro.iio.%s.%s" /* Note: PROPERTY_KEY_MAX is small */
 
+#define MAX_EVENTS 1000        /* 1000 hz */
 #define MAX_TYPE_SPEC_LEN 32   /* Channel type spec len; ex: "le:u10/16>>0" */
 #define MAX_SENSOR_REPORT_SIZE 32      /* Sensor report buffer size */
 
@@ -36,8 +37,10 @@
 
 #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
 
 struct channel_descriptor_t
@@ -97,14 +100,25 @@ struct sample_ops_t
 
 struct sensor_info_t
 {
-       char friendly_name[MAX_NAME_SIZE];      /* ex: Accelerometer */
-       char internal_name[MAX_NAME_SIZE];      /* ex: accel_3d */
-       char vendor_name[MAX_NAME_SIZE];        /* ex: Intel */
-       char trigger_name[MAX_NAME_SIZE];       /* ex: accel-name-dev1 */
+       char friendly_name[MAX_NAME_SIZE];      /* ex: Accelerometer         */
+       char internal_name[MAX_NAME_SIZE];      /* ex: accel_3d              */
+       char vendor_name[MAX_NAME_SIZE];        /* ex: Intel                 */
+       char init_trigger_name[MAX_NAME_SIZE];  /* ex: accel-name-dev1       */
+       char motion_trigger_name[MAX_NAME_SIZE];/* ex: accel-any-motion-dev1 */
        float max_range;
        float resolution;
        float power;
 
+       /*
+        * Currently active trigger - either a pointer to the initial (default)
+        * trigger name buffer, or a pointer to the motion trigger name buffer,
+        * or something else (typically NULL or a pointer to some static "\n".
+        * This is used to determine if the conditions are met to switch from
+        * the default trigger to the motion trigger for a sensor, or rather for
+        * the interrupt-driven sensors associated to a given iio device.
+        */
+       const char* selected_trigger;
+
        float offset;   /* (cooked = raw + offset) * scale */
        float scale;    /*default: 1. when set to 0, use channel specific value*/
        float illumincalib;     /* to set the calibration for the ALS */
@@ -151,7 +165,7 @@ struct sensor_info_t
 
        struct sample_ops_t ops;
 
-       int calibrated;
+       int cal_level; /* 0 means not calibrated */
        void* cal_data;
 
        float prev_val; /* Previously reported value, for on-change sensors */
@@ -182,10 +196,17 @@ struct sensor_info_t
         * a sample containing 4 fields.
         */
        unsigned char order[MAX_CHANNELS];
+
+       /* A few variables used for data filtering */
+       float *history;         /* Working buffer containing recorded samples */
+       int history_size;       /* Number of recorded samples                 */
+       int history_entries;    /* How many of these are initialized          */
+       int history_index;      /* Index of sample to evict next time         */
 };
 
 /* Reference a few commonly used variables... */
 extern int                             sensor_count;
+extern struct sensor_t      sensor_desc[MAX_SENSORS];
 extern struct sensor_info_t            sensor_info[MAX_SENSORS];
 extern struct sensor_catalog_entry_t   sensor_catalog[];