X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=common.h;h=01cb59948ccf90e87f35ee2678a199edcf6330c4;hb=241eb5678262b8bcfa61c6c0a273b3bcf64dbaff;hp=fd673ac62e09ac1e34ff4fbe155cee6a395e5bfa;hpb=f4cb7dc91324cc194d1503743027e8937cd712e8;p=android-x86%2Fhardware-intel-libsensors.git diff --git a/common.h b/common.h index fd673ac..01cb599 100644 --- a/common.h +++ b/common.h @@ -25,28 +25,24 @@ #define DEVICE_AVAIL_FREQ_PATH BASE_PATH "sampling_frequency_available" #define ILLUMINATION_CALIBPATH BASE_PATH "in_illuminance_calibscale" -#define PROP_BASE "ro.iio.%s.%s" /* Note: PROPERTY_KEY_MAX is small */ +#define PROP_BASE "ro.iio.%s.%s" /* Note: PROPERTY_KEY_MAX is small */ -#define MAX_EVENTS 400 /* 400 Hz */ -#define MAX_TYPE_SPEC_LEN 32 /* Channel type spec len; ex: "le:u10/16>>0" */ +#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 */ +#define MAX_DEVICE_REPORT_SIZE 32 /* iio device scan buffer size */ #define MAX_NAME_SIZE 32 -#define MIN_SAMPLES 5 +#define MAX_SENSOR_BASES 3 /* Max number of base sensors a sensor can rely on */ #define ARRAY_SIZE(x) sizeof(x)/sizeof(x[0]) #define REPORTING_MODE(x) ((x) & 0x06) -#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 +#define FILTER_TYPE_NONE 0 +#define FILTER_TYPE_MOVING_AVERAGE 1 +#define FILTER_TYPE_MEDIAN 2 -struct channel_descriptor_t +typedef struct { const char *name; /* channel name ; ex: x */ @@ -59,58 +55,69 @@ struct channel_descriptor_t const char *raw_path; /* _raw sysfs file name */ const char *input_path; /* _input sysfs file name */ const char *scale_path; /* _scale sysfs file name */ -}; +} +channel_descriptor_t; + -struct sensor_catalog_entry_t +typedef struct { - const char *tag; /* Prefix such as "accel", "gyro", "temp"... */ - const int type; /* Sensor type ; ex: SENSOR_TYPE_ACCELEROMETER */ + const char *tag; /* Prefix such as "accel", "gyro", "temp"... */ + const int type; /* Sensor type ; ex: SENSOR_TYPE_ACCELEROMETER */ const int num_channels; /* Expected iio channels for this sensor */ - struct channel_descriptor_t channel[MAX_CHANNELS]; -}; + const int is_virtual; /* Is the sensor virtual or not */ + channel_descriptor_t channel[MAX_CHANNELS]; +} +sensor_catalog_entry_t; + -struct datum_info_t +typedef struct { char sign; char endianness; short realbits; short storagebits; short shift; -}; +} +datum_info_t; -struct channel_info_t + +typedef struct { - int offset; /* Offset in bytes within the iio character device report */ - int size; /* Field size in bytes */ - float scale; /* scale for each channel */ - char type_spec[MAX_TYPE_SPEC_LEN]; /* From driver; ex: le:u10/16>>0 */ - struct datum_info_t type_info; /* Decoded contents of type spec */ - float opt_scale; /* Optional correction scale read from a property such - * as iio.accel.x.scale, allowing late compensation of - * problems such as misconfigured axes ; set to 1 by - * default. Applied at the end of the scaling process. + int offset; /* Offset in bytes within the iio character device report */ + int size; /* Field size in bytes */ + float scale; /* scale for each channel */ + char type_spec[MAX_TYPE_SPEC_LEN]; /* From driver; ex: le:u10/16>>0 */ + datum_info_t type_info; /* Decoded contents of type spec */ + float opt_scale; /* + * Optional correction scale read from a property such as iio.accel.x.scale, allowing late compensation of + * problems such as misconfigured axes ; set to 1 by default. Applied at the end of the scaling process. */ -}; +} +channel_info_t; + -struct sample_ops_t +typedef struct { /* Conversion function called once per channel */ - float (*transform)(int s, int c, unsigned char* sample_data); + float (*transform) (int s, int c, unsigned char* sample_data); /* Function called once per sample */ - int (*finalize)(int s, struct sensors_event_t* data); -}; + int (*finalize) (int s, sensors_event_t* data); +} +sample_ops_t; + /* * Whenever we have sensor data recorded for a sensor in the associated - * sensor_info cell, its report_pending field is set to a non-zero value + * sensor cell, its report_pending field is set to a non-zero value * indicating how we got this data. */ #define DATA_TRIGGER 1 /* From /dev/iio:device fd */ #define DATA_SYSFS 2 /* Through polling */ #define DATA_DUPLICATE 3 /* Duplicate of triggered motion sample */ -struct sensor_info_t + +typedef struct { char friendly_name[MAX_NAME_SIZE]; /* ex: Accelerometer */ char internal_name[MAX_NAME_SIZE]; /* ex: accel_3d */ @@ -122,57 +129,50 @@ struct sensor_info_t 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. + * 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 */ + 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 */ + + float requested_rate; /* requested events / second */ + float sampling_rate; /* setup events / second */ + + float min_supported_rate; + float max_supported_rate; - float sampling_rate; /* requested events / second */ + int dev_num; /* Associated iio dev num, ex: 3 for /dev/iio:device3 */ - int dev_num; /* Associated iio dev num, ex: 3 for /dev/iio:device3 */ - int enable_count; + int catalog_index; /* Associated entry within the sensor_catalog array */ + int type; /* Sensor type, such as SENSOR_TYPE_GYROSCOPE */ - int catalog_index;/* Associated entry within the sensor_catalog array */ - int type; /* Sensor type, such as SENSOR_TYPE_GYROSCOPE */ + int num_channels; /* Actual channel count ; 0 for poll mode sensors */ - int num_channels; /* Actual channel count ; 0 for poll mode sensors */ + int is_polling; /* 1 if we use the sensor in poll mode, 0 if triggered */ /* - * The array below indicates where to gather report data for this - * sensor inside the reports that we read from the iio character device. - * It is updated whenever channels are enabled or disabled on the same - * device. Channel size indicates the size in bytes of fields, and - * should be zero for disabled channels. The type field indicates how a - * specific channel data item is structured. + * The array below indicates where to gather report data for this sensor inside the reports that we read from the iio character device. + * It is updated whenever channels are enabled or disabled on the same device. Channel size indicates the size in bytes of fields, and + * should be zero for disabled channels. The type field indicates how a specific channel data item is structured. */ - struct channel_info_t channel[MAX_CHANNELS]; + channel_info_t channel[MAX_CHANNELS]; /* - * This flag is set if we acquired data from the sensor but did not - * forward it to upper layers (i.e. Android) yet. If so, report_buffer - * contains that data. Valid values are 0: empty, 1: normal, 2: repeat - * of last acquired value after timeout. + * This flag is set if we acquired data from the sensor but did not forward it to upper layers (i.e. Android) yet. If so, report_buffer + * contains that data. Valid values are 0: empty, 1: normal, 2: repeat of last acquired value after timeout. */ int report_pending; - /* - * This flag is set if we have a meta data event pending - */ - volatile int meta_data_pending; + /* This flag is set if we have a meta data event pending */ + int meta_data_pending; /* - * Timestamp closely matching the date of sampling, preferably retrieved - * from a iio channel alongside sample data. Value zero indicates that - * we couldn't get such a closely correlated timestamp, and that one - * has to be generated before the report gets sent up to Android. + * Timestamp closely matching the date of sampling, preferably retrieved from a iio channel alongside sample data. Value zero indicates that + * we couldn't get such a closely correlated timestamp, and that one has to be generated before the report gets sent up to Android. */ int64_t report_ts; @@ -182,65 +182,70 @@ struct sensor_info_t /* Whether or not the above buffer contains data from a device report */ int report_initialized; - struct sample_ops_t ops; + /* Channel and sample finalization callbacks for this sensor */ + sample_ops_t ops; int cal_level; /* 0 means not calibrated */ - void* cal_data; - /* Filtering data for noisy sensors */ - void* filter; + /* + * Depending on the sensor, calibration may take too much time at higher levels. Allow optional capping to a certain level. + */ + int max_cal_level; + + void *cal_data; /* Sensor calibration data, e.g. for magnetometer */ + + void* filter; /* Filtering data for noisy sensors */ + int filter_type;/* FILTER_ specification for this sensor ; default is FILTER_NONE */ float prev_val; /* Previously reported value, for on-change sensors */ /* - * Certain sensors expose their readings through sysfs files that have - * a long response time (100-200 ms for ALS). Rather than block our - * global control loop for several hundred ms each second, offload those - * lengthy blocking reads to dedicated threads, which will then report + * Certain sensors expose their readings through sysfs files that have a long response time (100-200 ms for ALS). Rather than block our + * global control loop for several hundred ms each second, offload those lengthy blocking reads to dedicated threads, which will then report * their data through a fd that we can add to our poll fd set. */ int thread_data_fd[2]; pthread_t acquisition_thread; - /* For cal-uncal sensor pairs - index to the pair sensor in sensor_info */ - int pair_idx; + int base_count; /* How many base sensors is the sensor depending on */ + int base[MAX_SENSOR_BASES]; uint32_t quirks; /* Bit mask expressing the need for special tweaks */ /* Note: we may have to explicitely serialize access to some fields */ + int is_virtual; /* Composite sensor, exposed from data acquired through other sensors */ + + uint32_t ref_count; /* Dependency count - for a real sensor how many active virtual sensors are depending on it */ + + uint32_t directly_enabled; /* Flag showing if a sensor was enabled directly by Android */ /* - * If the QUIRK_FIELD_ORDERING bit is set in quirks, the contents of - * this array are used in the finalization stage to swap sample fields - * before transmitting them to Android ; they form a mapping between - * the indices of the input and output arrays: ex: 0123 is identity for + * Current sample for a virtual sensor - when a report is ready we'll keep the data here until it's finally processed. Can be modified for + * more than one at a later time. + */ + sensors_event_t sample; + + /* + * If the QUIRK_FIELD_ORDERING bit is set in quirks, the contents of this array are used in the finalization stage to swap sample fields + * before transmitting them to Android ; they form a mapping between the indices of the input and output arrays: ex: 0123 is identity for * a sample containing 4 fields. */ unsigned char order[MAX_CHANNELS]; - /* A few variables used for data filtering */ - float *history; /* Working buffer containing recorded samples */ - float *history_sum; /* The current sum of the history elements */ - 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 */ - /* - * Event counter - will be used to check if we have a significant sample - * for noisy sensors. We want to make sure we do not send any wrong + * Event counter - will be used to check if we have a significant sample for noisy sensors. We want to make sure we do not send any wrong * events before filtering kicks in. We can also use it for statistics. */ uint64_t event_count; -}; +} +sensor_info_t; -/* 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[]; -/* We are required to be in sync with SystemClock.getNanos */ -extern int64_t ts_delta; +/* Reference a few commonly used variables... */ +extern int sensor_count; +extern struct sensor_t sensor_desc[MAX_SENSORS]; +extern sensor_info_t sensor[MAX_SENSORS]; +extern sensor_catalog_entry_t sensor_catalog[]; #endif