[sensors] Minor tuning of hal definition
* Swap GEOMAGNETIC_FIELD with MAGNETIC_FIELD for more accurate
definition.
* Clarify that string type will be omitted for well defined sensor
types.
* Remove legacy 8-bit restriction to sensor handle. This is an
unnecessary limit for since long time ago. Still leave the define
for code compatibility and change the value to 32.
* update sensors-base.h with companion .hal file change.
Test: test with sensorlogger, all sensor works
Change-Id: I6ff7022146eb25f7efdce87b70bf5ed488a70c6d
diff --git a/include/hardware/sensors-base.h b/include/hardware/sensors-base.h
index 03e3729..7fc304f 100644
--- a/include/hardware/sensors-base.h
+++ b/include/hardware/sensors-base.h
@@ -16,7 +16,7 @@
enum {
SENSOR_TYPE_META_DATA = 0,
SENSOR_TYPE_ACCELEROMETER = 1,
- SENSOR_TYPE_GEOMAGNETIC_FIELD = 2,
+ SENSOR_TYPE_MAGNETIC_FIELD = 2,
SENSOR_TYPE_ORIENTATION = 3,
SENSOR_TYPE_GYROSCOPE = 4,
SENSOR_TYPE_LIGHT = 5,
@@ -59,7 +59,7 @@
SENSOR_FLAG_ON_CHANGE_MODE = 2ull, // 2
SENSOR_FLAG_ONE_SHOT_MODE = 4ull, // 4
SENSOR_FLAG_SPECIAL_REPORTING_MODE = 6ull, // 6
- SENSOR_FLAG_SUPPORTS_DATA_INJECTION = 16ull, // 0x10
+ SENSOR_FLAG_DATA_INJECTION = 16ull, // 0x10
SENSOR_FLAG_DYNAMIC_SENSOR = 32ull, // 0x20
SENSOR_FLAG_ADDITIONAL_INFO = 64ull, // 0x40
SENSOR_FLAG_DIRECT_CHANNEL_ASHMEM = 1024ull, // 0x400
@@ -69,6 +69,15 @@
SENSOR_FLAG_MASK_DIRECT_CHANNEL = 3072ull, // 0xC00
};
+typedef enum {
+ SENSOR_FLAG_SHIFT_REPORTING_MODE = 1,
+ SENSOR_FLAG_SHIFT_DATA_INJECTION = 4,
+ SENSOR_FLAG_SHIFT_DYNAMIC_SENSOR = 5,
+ SENSOR_FLAG_SHIFT_ADDITIONAL_INFO = 6,
+ SENSOR_FLAG_SHIFT_DIRECT_REPORT = 7,
+ SENSOR_FLAG_SHIFT_DIRECT_CHANNEL = 10,
+} sensor_flag_shift_t;
+
enum {
SENSOR_STATUS_NO_CONTACT = -1, // (-1)
SENSOR_STATUS_UNRELIABLE = 0,