diff options
author | Steven Moreland <smoreland@google.com> | 2019-01-16 12:06:26 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-16 12:06:26 -0800 |
commit | 528258118a799a1a5fce7d1ff1670cf4d6213819 (patch) | |
tree | 54e1fbfefca675532e616419d7bdf4967e965429 | |
parent | f2ce75ef3b07a864bf57e7f66255f3ba3a488ba1 (diff) | |
parent | 8abf35a07b8ef6536366078c2466e7ccca460240 (diff) | |
download | libhardware-528258118a799a1a5fce7d1ff1670cf4d6213819.tar.gz |
Merge "Update auto-generated files." am: 5449a46982 am: b8914c64cf
am: 8abf35a07b
Change-Id: I22741b5a1f7e08afb0d62e7f8894dc021e626a36
-rw-r--r-- | include/hardware/gnss-base.h | 205 | ||||
-rw-r--r-- | include/hardware/nfc-base.h | 26 | ||||
-rw-r--r-- | include/hardware/sensors-base.h | 82 |
3 files changed, 157 insertions, 156 deletions
diff --git a/include/hardware/gnss-base.h b/include/hardware/gnss-base.h index e56020da..706aa387 100644 --- a/include/hardware/gnss-base.h +++ b/include/hardware/gnss-base.h @@ -1,6 +1,6 @@ // This file is autogenerated by hidl-gen. Do not edit manually. // Source: android.hardware.gnss@1.0 -// Root: android.hardware:hardware/interfaces +// Location: hardware/interfaces/gnss/1.0/ #ifndef HIDL_GENERATED_ANDROID_HARDWARE_GNSS_V1_0_EXPORTED_CONSTANTS_H_ #define HIDL_GENERATED_ANDROID_HARDWARE_GNSS_V1_0_EXPORTED_CONSTANTS_H_ @@ -10,7 +10,7 @@ extern "C" { #endif enum { - GNSS_MAX_SVS_COUNT = 64u, // 64 + GNSS_MAX_SVS_COUNT = 64u, }; enum { @@ -24,14 +24,14 @@ enum { }; enum { - GPS_LOCATION_HAS_LAT_LONG = 1, // 0x0001 - GPS_LOCATION_HAS_ALTITUDE = 2, // 0x0002 - GPS_LOCATION_HAS_SPEED = 4, // 0x0004 - GPS_LOCATION_HAS_BEARING = 8, // 0x0008 - GPS_LOCATION_HAS_HORIZONTAL_ACCURACY = 16, // 0x0010 - GPS_LOCATION_HAS_VERTICAL_ACCURACY = 32, // 0x0020 - GPS_LOCATION_HAS_SPEED_ACCURACY = 64, // 0x0040 - GPS_LOCATION_HAS_BEARING_ACCURACY = 128, // 0x0080 + GPS_LOCATION_HAS_LAT_LONG = 1 /* 0x0001 */, + GPS_LOCATION_HAS_ALTITUDE = 2 /* 0x0002 */, + GPS_LOCATION_HAS_SPEED = 4 /* 0x0004 */, + GPS_LOCATION_HAS_BEARING = 8 /* 0x0008 */, + GPS_LOCATION_HAS_HORIZONTAL_ACCURACY = 16 /* 0x0010 */, + GPS_LOCATION_HAS_VERTICAL_ACCURACY = 32 /* 0x0020 */, + GPS_LOCATION_HAS_SPEED_ACCURACY = 64 /* 0x0040 */, + GPS_LOCATION_HAS_BEARING_ACCURACY = 128 /* 0x0080 */, }; enum { @@ -77,8 +77,8 @@ enum { }; enum { - AGPS_RIL_REQUEST_SETID_IMSI = 1u, // (1 << 0L) - AGPS_RIL_REQUEST_SETID_MSISDN = 2u, // (1 << 1L) + AGPS_RIL_REQUEST_SETID_IMSI = 1u /* (1 << 0L) */, + AGPS_RIL_REQUEST_SETID_MSISDN = 2u /* (1 << 1L) */, }; enum { @@ -88,39 +88,39 @@ enum { }; enum { - GPS_POSITION_RECURRENCE_PERIODIC = 0u, // 0 - GPS_POSITION_RECURRENCE_SINGLE = 1u, // 1 + GPS_POSITION_RECURRENCE_PERIODIC = 0u, + GPS_POSITION_RECURRENCE_SINGLE = 1u, }; enum { - GPS_DELETE_EPHEMERIS = 1, // 0x0001 - GPS_DELETE_ALMANAC = 2, // 0x0002 - GPS_DELETE_POSITION = 4, // 0x0004 - GPS_DELETE_TIME = 8, // 0x0008 - GPS_DELETE_IONO = 16, // 0x0010 - GPS_DELETE_UTC = 32, // 0x0020 - GPS_DELETE_HEALTH = 64, // 0x0040 - GPS_DELETE_SVDIR = 128, // 0x0080 - GPS_DELETE_SVSTEER = 256, // 0x0100 - GPS_DELETE_SADATA = 512, // 0x0200 - GPS_DELETE_RTI = 1024, // 0x0400 - GPS_DELETE_CELLDB_INFO = 32768, // 0x8000 - GPS_DELETE_ALL = 65535, // 0xFFFF + GPS_DELETE_EPHEMERIS = 1 /* 0x0001 */, + GPS_DELETE_ALMANAC = 2 /* 0x0002 */, + GPS_DELETE_POSITION = 4 /* 0x0004 */, + GPS_DELETE_TIME = 8 /* 0x0008 */, + GPS_DELETE_IONO = 16 /* 0x0010 */, + GPS_DELETE_UTC = 32 /* 0x0020 */, + GPS_DELETE_HEALTH = 64 /* 0x0040 */, + GPS_DELETE_SVDIR = 128 /* 0x0080 */, + GPS_DELETE_SVSTEER = 256 /* 0x0100 */, + GPS_DELETE_SADATA = 512 /* 0x0200 */, + GPS_DELETE_RTI = 1024 /* 0x0400 */, + GPS_DELETE_CELLDB_INFO = 32768 /* 0x8000 */, + GPS_DELETE_ALL = 65535 /* 0xFFFF */, }; enum { - FLP_BATCH_WAKEUP_ON_FIFO_FULL = 1, // 0x01 + FLP_BATCH_WAKEUP_ON_FIFO_FULL = 1 /* 0x01 */, }; enum { - GPS_CAPABILITY_SCHEDULING = 1u, // (1 << 0) - GPS_CAPABILITY_MSB = 2u, // (1 << 1) - GPS_CAPABILITY_MSA = 4u, // (1 << 2) - GPS_CAPABILITY_SINGLE_SHOT = 8u, // (1 << 3) - GPS_CAPABILITY_ON_DEMAND_TIME = 16u, // (1 << 4) - GPS_CAPABILITY_GEOFENCING = 32u, // (1 << 5) - GPS_CAPABILITY_MEASUREMENTS = 64u, // (1 << 6) - GPS_CAPABILITY_NAV_MESSAGES = 128u, // (1 << 7) + GPS_CAPABILITY_SCHEDULING = 1u /* (1 << 0) */, + GPS_CAPABILITY_MSB = 2u /* (1 << 1) */, + GPS_CAPABILITY_MSA = 4u /* (1 << 2) */, + GPS_CAPABILITY_SINGLE_SHOT = 8u /* (1 << 3) */, + GPS_CAPABILITY_ON_DEMAND_TIME = 16u /* (1 << 4) */, + GPS_CAPABILITY_GEOFENCING = 32u /* (1 << 5) */, + GPS_CAPABILITY_MEASUREMENTS = 64u /* (1 << 6) */, + GPS_CAPABILITY_NAV_MESSAGES = 128u /* (1 << 7) */, }; enum { @@ -133,55 +133,55 @@ enum { enum { GNSS_SV_FLAGS_NONE = 0, - GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA = 1, // (1 << 0) - GNSS_SV_FLAGS_HAS_ALMANAC_DATA = 2, // (1 << 1) - GNSS_SV_FLAGS_USED_IN_FIX = 4, // (1 << 2) - GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY = 8, // (1 << 3) + GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA = 1 /* (1 << 0) */, + GNSS_SV_FLAGS_HAS_ALMANAC_DATA = 2 /* (1 << 1) */, + GNSS_SV_FLAGS_USED_IN_FIX = 4 /* (1 << 2) */, + GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY = 8 /* (1 << 3) */, }; enum { - GPS_GEOFENCE_ENTERED = 1, // (1 << 0L) - GPS_GEOFENCE_EXITED = 2, // (1 << 1L) - GPS_GEOFENCE_UNCERTAIN = 4, // (1 << 2L) + GPS_GEOFENCE_ENTERED = 1 /* (1 << 0L) */, + GPS_GEOFENCE_EXITED = 2 /* (1 << 1L) */, + GPS_GEOFENCE_UNCERTAIN = 4 /* (1 << 2L) */, }; enum { - GPS_GEOFENCE_UNAVAILABLE = 1, // (1 << 0L) - GPS_GEOFENCE_AVAILABLE = 2, // (1 << 1L) + GPS_GEOFENCE_UNAVAILABLE = 1 /* (1 << 0L) */, + GPS_GEOFENCE_AVAILABLE = 2 /* (1 << 1L) */, }; enum { GPS_GEOFENCE_OPERATION_SUCCESS = 0, - GPS_GEOFENCE_ERROR_TOO_MANY_GEOFENCES = -100, // (-100) - GPS_GEOFENCE_ERROR_ID_EXISTS = -101, // (-101) - GPS_GEOFENCE_ERROR_ID_UNKNOWN = -102, // (-102) - GPS_GEOFENCE_ERROR_INVALID_TRANSITION = -103, // (-103) - GPS_GEOFENCE_ERROR_GENERIC = -149, // (-149) + GPS_GEOFENCE_ERROR_TOO_MANY_GEOFENCES = -100 /* (-100) */, + GPS_GEOFENCE_ERROR_ID_EXISTS = -101 /* (-101) */, + GPS_GEOFENCE_ERROR_ID_UNKNOWN = -102 /* (-102) */, + GPS_GEOFENCE_ERROR_INVALID_TRANSITION = -103 /* (-103) */, + GPS_GEOFENCE_ERROR_GENERIC = -149 /* (-149) */, }; enum { GPS_MEASUREMENT_SUCCESS = 0, - GPS_MEASUREMENT_ERROR_ALREADY_INIT = -100, // (-100) - GPS_MEASUREMENT_ERROR_GENERIC = -101, // (-101) + GPS_MEASUREMENT_ERROR_ALREADY_INIT = -100 /* (-100) */, + GPS_MEASUREMENT_ERROR_GENERIC = -101 /* (-101) */, }; enum { - GNSS_CLOCK_HAS_LEAP_SECOND = 1, // (1 << 0) - GNSS_CLOCK_HAS_TIME_UNCERTAINTY = 2, // (1 << 1) - GNSS_CLOCK_HAS_FULL_BIAS = 4, // (1 << 2) - GNSS_CLOCK_HAS_BIAS = 8, // (1 << 3) - GNSS_CLOCK_HAS_BIAS_UNCERTAINTY = 16, // (1 << 4) - GNSS_CLOCK_HAS_DRIFT = 32, // (1 << 5) - GNSS_CLOCK_HAS_DRIFT_UNCERTAINTY = 64, // (1 << 6) + GNSS_CLOCK_HAS_LEAP_SECOND = 1 /* (1 << 0) */, + GNSS_CLOCK_HAS_TIME_UNCERTAINTY = 2 /* (1 << 1) */, + GNSS_CLOCK_HAS_FULL_BIAS = 4 /* (1 << 2) */, + GNSS_CLOCK_HAS_BIAS = 8 /* (1 << 3) */, + GNSS_CLOCK_HAS_BIAS_UNCERTAINTY = 16 /* (1 << 4) */, + GNSS_CLOCK_HAS_DRIFT = 32 /* (1 << 5) */, + GNSS_CLOCK_HAS_DRIFT_UNCERTAINTY = 64 /* (1 << 6) */, }; enum { - GNSS_MEASUREMENT_HAS_SNR = 1u, // (1 << 0) - GNSS_MEASUREMENT_HAS_CARRIER_FREQUENCY = 512u, // (1 << 9) - GNSS_MEASUREMENT_HAS_CARRIER_CYCLES = 1024u, // (1 << 10) - GNSS_MEASUREMENT_HAS_CARRIER_PHASE = 2048u, // (1 << 11) - GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY = 4096u, // (1 << 12) - GNSS_MEASUREMENT_HAS_AUTOMATIC_GAIN_CONTROL = 8192u, // (1 << 13) + GNSS_MEASUREMENT_HAS_SNR = 1u /* (1 << 0) */, + GNSS_MEASUREMENT_HAS_CARRIER_FREQUENCY = 512u /* (1 << 9) */, + GNSS_MEASUREMENT_HAS_CARRIER_CYCLES = 1024u /* (1 << 10) */, + GNSS_MEASUREMENT_HAS_CARRIER_PHASE = 2048u /* (1 << 11) */, + GNSS_MEASUREMENT_HAS_CARRIER_PHASE_UNCERTAINTY = 4096u /* (1 << 12) */, + GNSS_MEASUREMENT_HAS_AUTOMATIC_GAIN_CONTROL = 8192u /* (1 << 13) */, }; enum { @@ -191,54 +191,54 @@ enum { }; enum { - GNSS_MEASUREMENT_STATE_UNKNOWN = 0u, // 0 - GNSS_MEASUREMENT_STATE_CODE_LOCK = 1u, // (1 << 0) - GNSS_MEASUREMENT_STATE_BIT_SYNC = 2u, // (1 << 1) - GNSS_MEASUREMENT_STATE_SUBFRAME_SYNC = 4u, // (1 << 2) - GNSS_MEASUREMENT_STATE_TOW_DECODED = 8u, // (1 << 3) - GNSS_MEASUREMENT_STATE_MSEC_AMBIGUOUS = 16u, // (1 << 4) - GNSS_MEASUREMENT_STATE_SYMBOL_SYNC = 32u, // (1 << 5) - GNSS_MEASUREMENT_STATE_GLO_STRING_SYNC = 64u, // (1 << 6) - GNSS_MEASUREMENT_STATE_GLO_TOD_DECODED = 128u, // (1 << 7) - GNSS_MEASUREMENT_STATE_BDS_D2_BIT_SYNC = 256u, // (1 << 8) - GNSS_MEASUREMENT_STATE_BDS_D2_SUBFRAME_SYNC = 512u, // (1 << 9) - GNSS_MEASUREMENT_STATE_GAL_E1BC_CODE_LOCK = 1024u, // (1 << 10) - GNSS_MEASUREMENT_STATE_GAL_E1C_2ND_CODE_LOCK = 2048u, // (1 << 11) - GNSS_MEASUREMENT_STATE_GAL_E1B_PAGE_SYNC = 4096u, // (1 << 12) - GNSS_MEASUREMENT_STATE_SBAS_SYNC = 8192u, // (1 << 13) - GNSS_MEASUREMENT_STATE_TOW_KNOWN = 16384u, // (1 << 14) - GNSS_MEASUREMENT_STATE_GLO_TOD_KNOWN = 32768u, // (1 << 15) + GNSS_MEASUREMENT_STATE_UNKNOWN = 0u, + GNSS_MEASUREMENT_STATE_CODE_LOCK = 1u /* (1 << 0) */, + GNSS_MEASUREMENT_STATE_BIT_SYNC = 2u /* (1 << 1) */, + GNSS_MEASUREMENT_STATE_SUBFRAME_SYNC = 4u /* (1 << 2) */, + GNSS_MEASUREMENT_STATE_TOW_DECODED = 8u /* (1 << 3) */, + GNSS_MEASUREMENT_STATE_MSEC_AMBIGUOUS = 16u /* (1 << 4) */, + GNSS_MEASUREMENT_STATE_SYMBOL_SYNC = 32u /* (1 << 5) */, + GNSS_MEASUREMENT_STATE_GLO_STRING_SYNC = 64u /* (1 << 6) */, + GNSS_MEASUREMENT_STATE_GLO_TOD_DECODED = 128u /* (1 << 7) */, + GNSS_MEASUREMENT_STATE_BDS_D2_BIT_SYNC = 256u /* (1 << 8) */, + GNSS_MEASUREMENT_STATE_BDS_D2_SUBFRAME_SYNC = 512u /* (1 << 9) */, + GNSS_MEASUREMENT_STATE_GAL_E1BC_CODE_LOCK = 1024u /* (1 << 10) */, + GNSS_MEASUREMENT_STATE_GAL_E1C_2ND_CODE_LOCK = 2048u /* (1 << 11) */, + GNSS_MEASUREMENT_STATE_GAL_E1B_PAGE_SYNC = 4096u /* (1 << 12) */, + GNSS_MEASUREMENT_STATE_SBAS_SYNC = 8192u /* (1 << 13) */, + GNSS_MEASUREMENT_STATE_TOW_KNOWN = 16384u /* (1 << 14) */, + GNSS_MEASUREMENT_STATE_GLO_TOD_KNOWN = 32768u /* (1 << 15) */, }; enum { GNSS_ADR_STATE_UNKNOWN = 0, - GNSS_ADR_STATE_VALID = 1, // (1 << 0) - GNSS_ADR_STATE_RESET = 2, // (1 << 1) - GNSS_ADR_STATE_CYCLE_SLIP = 4, // (1 << 2) + GNSS_ADR_STATE_VALID = 1 /* (1 << 0) */, + GNSS_ADR_STATE_RESET = 2 /* (1 << 1) */, + GNSS_ADR_STATE_CYCLE_SLIP = 4 /* (1 << 2) */, }; enum { GPS_NAVIGATION_MESSAGE_SUCCESS = 0, - GPS_NAVIGATION_MESSAGE_ERROR_ALREADY_INIT = -100, // (-100) - GPS_NAVIGATION_MESSAGE_ERROR_GENERIC = -101, // (-101) + GPS_NAVIGATION_MESSAGE_ERROR_ALREADY_INIT = -100 /* (-100) */, + GPS_NAVIGATION_MESSAGE_ERROR_GENERIC = -101 /* (-101) */, }; enum { GNSS_NAVIGATION_MESSAGE_TYPE_UNKNOWN = 0, - GNSS_NAVIGATION_MESSAGE_TYPE_GNSS_L1CA = 257, // 0x0101 - GNSS_NAVIGATION_MESSAGE_TYPE_GNSS_L2CNAV = 258, // 0x0102 - GNSS_NAVIGATION_MESSAGE_TYPE_GNSS_L5CNAV = 259, // 0x0103 - GNSS_NAVIGATION_MESSAGE_TYPE_GNSS_CNAV2 = 260, // 0x0104 - GNSS_NAVIGATION_MESSAGE_TYPE_GLO_L1CA = 769, // 0x0301 - GNSS_NAVIGATION_MESSAGE_TYPE_BDS_D1 = 1281, // 0x0501 - GNSS_NAVIGATION_MESSAGE_TYPE_BDS_D2 = 1282, // 0x0502 - GNSS_NAVIGATION_MESSAGE_TYPE_GAL_I = 1537, // 0x0601 - GNSS_NAVIGATION_MESSAGE_TYPE_GAL_F = 1538, // 0x0602 + GNSS_NAVIGATION_MESSAGE_TYPE_GPS_L1CA = 257 /* 0x0101 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GPS_L2CNAV = 258 /* 0x0102 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GPS_L5CNAV = 259 /* 0x0103 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GPS_CNAV2 = 260 /* 0x0104 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GLO_L1CA = 769 /* 0x0301 */, + GNSS_NAVIGATION_MESSAGE_TYPE_BDS_D1 = 1281 /* 0x0501 */, + GNSS_NAVIGATION_MESSAGE_TYPE_BDS_D2 = 1282 /* 0x0502 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GAL_I = 1537 /* 0x0601 */, + GNSS_NAVIGATION_MESSAGE_TYPE_GAL_F = 1538 /* 0x0602 */, }; typedef enum { - NAV_MESSAGE_STATUS_PARITY_PASSED = 1, // (1 << 0) - NAV_MESSAGE_STATUS_PARITY_REBUILT = 2, // (1 << 1) + NAV_MESSAGE_STATUS_PARITY_PASSED = 1 /* (1 << 0) */, + NAV_MESSAGE_STATUS_PARITY_REBUILT = 2 /* (1 << 1) */, NAV_MESSAGE_STATUS_UNKNOWN = 0, } navigation_message_status; @@ -246,12 +246,13 @@ enum { GPS_NI_TYPE_VOICE = 1, GPS_NI_TYPE_UMTS_SUPL = 2, GPS_NI_TYPE_UMTS_CTRL_PLANE = 3, + GPS_NI_TYPE_EMERGENCY_SUPL = 4, }; enum { - GPS_NI_NEED_NOTIFY = 1u, // 0x0001 - GPS_NI_NEED_VERIFY = 2u, // 0x0002 - GPS_NI_PRIVACY_OVERRIDE = 4u, // 0x0004 + GPS_NI_NEED_NOTIFY = 1u /* 0x0001 */, + GPS_NI_NEED_VERIFY = 2u /* 0x0002 */, + GPS_NI_PRIVACY_OVERRIDE = 4u /* 0x0004 */, }; enum { @@ -265,7 +266,7 @@ enum { GPS_ENC_SUPL_GSM_DEFAULT = 1, GPS_ENC_SUPL_UTF8 = 2, GPS_ENC_SUPL_UCS2 = 3, - GPS_ENC_UNKNOWN = -1, // (-1) + GPS_ENC_UNKNOWN = -1 /* (-1) */, }; #ifdef __cplusplus diff --git a/include/hardware/nfc-base.h b/include/hardware/nfc-base.h index 6b63ad24..d22cd5d8 100644 --- a/include/hardware/nfc-base.h +++ b/include/hardware/nfc-base.h @@ -1,6 +1,6 @@ // This file is autogenerated by hidl-gen. Do not edit manually. // Source: android.hardware.nfc@1.0 -// Root: android.hardware:hardware/interfaces +// Location: hardware/interfaces/nfc/1.0/ #ifndef HIDL_GENERATED_ANDROID_HARDWARE_NFC_V1_0_EXPORTED_CONSTANTS_H_ #define HIDL_GENERATED_ANDROID_HARDWARE_NFC_V1_0_EXPORTED_CONSTANTS_H_ @@ -10,21 +10,21 @@ extern "C" { #endif enum { - HAL_NFC_OPEN_CPLT_EVT = 0u, // 0 - HAL_NFC_CLOSE_CPLT_EVT = 1u, // 1 - HAL_NFC_POST_INIT_CPLT_EVT = 2u, // 2 - HAL_NFC_PRE_DISCOVER_CPLT_EVT = 3u, // 3 - HAL_NFC_REQUEST_CONTROL_EVT = 4u, // 4 - HAL_NFC_RELEASE_CONTROL_EVT = 5u, // 5 - HAL_NFC_ERROR_EVT = 6u, // 6 + HAL_NFC_OPEN_CPLT_EVT = 0u, + HAL_NFC_CLOSE_CPLT_EVT = 1u, + HAL_NFC_POST_INIT_CPLT_EVT = 2u, + HAL_NFC_PRE_DISCOVER_CPLT_EVT = 3u, + HAL_NFC_REQUEST_CONTROL_EVT = 4u, + HAL_NFC_RELEASE_CONTROL_EVT = 5u, + HAL_NFC_ERROR_EVT = 6u, }; enum { - HAL_NFC_STATUS_OK = 0u, // 0 - HAL_NFC_STATUS_FAILED = 1u, // 1 - HAL_NFC_STATUS_ERR_TRANSPORT = 2u, // 2 - HAL_NFC_STATUS_ERR_CMD_TIMEOUT = 3u, // 3 - HAL_NFC_STATUS_REFUSED = 4u, // 4 + HAL_NFC_STATUS_OK = 0u, + HAL_NFC_STATUS_FAILED = 1u, + HAL_NFC_STATUS_ERR_TRANSPORT = 2u, + HAL_NFC_STATUS_ERR_CMD_TIMEOUT = 3u, + HAL_NFC_STATUS_REFUSED = 4u, }; #ifdef __cplusplus diff --git a/include/hardware/sensors-base.h b/include/hardware/sensors-base.h index b0f62233..a87cf526 100644 --- a/include/hardware/sensors-base.h +++ b/include/hardware/sensors-base.h @@ -1,6 +1,6 @@ // This file is autogenerated by hidl-gen. Do not edit manually. // Source: android.hardware.sensors@1.0 -// Root: android.hardware:hardware/interfaces +// Location: hardware/interfaces/sensors/1.0/ #ifndef HIDL_GENERATED_ANDROID_HARDWARE_SENSORS_V1_0_EXPORTED_CONSTANTS_H_ #define HIDL_GENERATED_ANDROID_HARDWARE_SENSORS_V1_0_EXPORTED_CONSTANTS_H_ @@ -51,23 +51,23 @@ enum { SENSOR_TYPE_ADDITIONAL_INFO = 33, SENSOR_TYPE_LOW_LATENCY_OFFBODY_DETECT = 34, SENSOR_TYPE_ACCELEROMETER_UNCALIBRATED = 35, - SENSOR_TYPE_DEVICE_PRIVATE_BASE = 65536, // 0x10000 + SENSOR_TYPE_DEVICE_PRIVATE_BASE = 65536 /* 0x10000 */, }; enum { - SENSOR_FLAG_WAKE_UP = 1u, // 1 - SENSOR_FLAG_CONTINUOUS_MODE = 0u, // 0 - SENSOR_FLAG_ON_CHANGE_MODE = 2u, // 2 - SENSOR_FLAG_ONE_SHOT_MODE = 4u, // 4 - SENSOR_FLAG_SPECIAL_REPORTING_MODE = 6u, // 6 - SENSOR_FLAG_DATA_INJECTION = 16u, // 0x10 - SENSOR_FLAG_DYNAMIC_SENSOR = 32u, // 0x20 - SENSOR_FLAG_ADDITIONAL_INFO = 64u, // 0x40 - SENSOR_FLAG_DIRECT_CHANNEL_ASHMEM = 1024u, // 0x400 - SENSOR_FLAG_DIRECT_CHANNEL_GRALLOC = 2048u, // 0x800 - SENSOR_FLAG_MASK_REPORTING_MODE = 14u, // 0xE - SENSOR_FLAG_MASK_DIRECT_REPORT = 896u, // 0x380 - SENSOR_FLAG_MASK_DIRECT_CHANNEL = 3072u, // 0xC00 + SENSOR_FLAG_WAKE_UP = 1u, + SENSOR_FLAG_CONTINUOUS_MODE = 0u, + SENSOR_FLAG_ON_CHANGE_MODE = 2u, + SENSOR_FLAG_ONE_SHOT_MODE = 4u, + SENSOR_FLAG_SPECIAL_REPORTING_MODE = 6u, + SENSOR_FLAG_DATA_INJECTION = 16u /* 0x10 */, + SENSOR_FLAG_DYNAMIC_SENSOR = 32u /* 0x20 */, + SENSOR_FLAG_ADDITIONAL_INFO = 64u /* 0x40 */, + SENSOR_FLAG_DIRECT_CHANNEL_ASHMEM = 1024u /* 0x400 */, + SENSOR_FLAG_DIRECT_CHANNEL_GRALLOC = 2048u /* 0x800 */, + SENSOR_FLAG_MASK_REPORTING_MODE = 14u /* 0xE */, + SENSOR_FLAG_MASK_DIRECT_REPORT = 896u /* 0x380 */, + SENSOR_FLAG_MASK_DIRECT_CHANNEL = 3072u /* 0xC00 */, }; typedef enum { @@ -80,7 +80,7 @@ typedef enum { } sensor_flag_shift_t; enum { - SENSOR_STATUS_NO_CONTACT = -1, // (-1) + SENSOR_STATUS_NO_CONTACT = -1 /* (-1) */, SENSOR_STATUS_UNRELIABLE = 0, SENSOR_STATUS_ACCURACY_LOW = 1, SENSOR_STATUS_ACCURACY_MEDIUM = 2, @@ -88,42 +88,42 @@ enum { }; enum { - META_DATA_FLUSH_COMPLETE = 1u, // 1 + META_DATA_FLUSH_COMPLETE = 1u, }; typedef enum { - AINFO_BEGIN = 0u, // 0 - AINFO_END = 1u, // 1 - AINFO_UNTRACKED_DELAY = 65536u, // 0x10000 - AINFO_INTERNAL_TEMPERATURE = 65537u, // 65537 - AINFO_VEC3_CALIBRATION = 65538u, // 65538 - AINFO_SENSOR_PLACEMENT = 65539u, // 65539 - AINFO_SAMPLING = 65540u, // 65540 - AINFO_CHANNEL_NOISE = 131072u, // 0x20000 - AINFO_CHANNEL_SAMPLER = 131073u, // 131073 - AINFO_CHANNEL_FILTER = 131074u, // 131074 - AINFO_CHANNEL_LINEAR_TRANSFORM = 131075u, // 131075 - AINFO_CHANNEL_NONLINEAR_MAP = 131076u, // 131076 - AINFO_CHANNEL_RESAMPLER = 131077u, // 131077 - AINFO_LOCAL_GEOMAGNETIC_FIELD = 196608u, // 0x30000 - AINFO_LOCAL_GRAVITY = 196609u, // 196609 - AINFO_DOCK_STATE = 196610u, // 196610 - AINFO_HIGH_PERFORMANCE_MODE = 196611u, // 196611 - AINFO_MAGNETIC_FIELD_CALIBRATION = 196612u, // 196612 - AINFO_CUSTOM_START = 268435456u, // 0x10000000 - AINFO_DEBUGGING_START = 1073741824u, // 0x40000000 + AINFO_BEGIN = 0u, + AINFO_END = 1u, + AINFO_UNTRACKED_DELAY = 65536u /* 0x10000 */, + AINFO_INTERNAL_TEMPERATURE = 65537u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_UNTRACKED_DELAY implicitly + 1) */, + AINFO_VEC3_CALIBRATION = 65538u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_INTERNAL_TEMPERATURE implicitly + 1) */, + AINFO_SENSOR_PLACEMENT = 65539u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_VEC3_CALIBRATION implicitly + 1) */, + AINFO_SAMPLING = 65540u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_SENSOR_PLACEMENT implicitly + 1) */, + AINFO_CHANNEL_NOISE = 131072u /* 0x20000 */, + AINFO_CHANNEL_SAMPLER = 131073u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_CHANNEL_NOISE implicitly + 1) */, + AINFO_CHANNEL_FILTER = 131074u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_CHANNEL_SAMPLER implicitly + 1) */, + AINFO_CHANNEL_LINEAR_TRANSFORM = 131075u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_CHANNEL_FILTER implicitly + 1) */, + AINFO_CHANNEL_NONLINEAR_MAP = 131076u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_CHANNEL_LINEAR_TRANSFORM implicitly + 1) */, + AINFO_CHANNEL_RESAMPLER = 131077u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_CHANNEL_NONLINEAR_MAP implicitly + 1) */, + AINFO_LOCAL_GEOMAGNETIC_FIELD = 196608u /* 0x30000 */, + AINFO_LOCAL_GRAVITY = 196609u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_LOCAL_GEOMAGNETIC_FIELD implicitly + 1) */, + AINFO_DOCK_STATE = 196610u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_LOCAL_GRAVITY implicitly + 1) */, + AINFO_HIGH_PERFORMANCE_MODE = 196611u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_DOCK_STATE implicitly + 1) */, + AINFO_MAGNETIC_FIELD_CALIBRATION = 196612u /* (::android::hardware::sensors::V1_0::AdditionalInfoType.AINFO_HIGH_PERFORMANCE_MODE implicitly + 1) */, + AINFO_CUSTOM_START = 268435456u /* 0x10000000 */, + AINFO_DEBUGGING_START = 1073741824u /* 0x40000000 */, } additional_info_type_t; typedef enum { SENSOR_DIRECT_RATE_STOP = 0, - SENSOR_DIRECT_RATE_NORMAL = 1, - SENSOR_DIRECT_RATE_FAST = 2, - SENSOR_DIRECT_RATE_VERY_FAST = 3, + SENSOR_DIRECT_RATE_NORMAL = 1 /* (::android::hardware::sensors::V1_0::RateLevel.STOP implicitly + 1) */, + SENSOR_DIRECT_RATE_FAST = 2 /* (::android::hardware::sensors::V1_0::RateLevel.NORMAL implicitly + 1) */, + SENSOR_DIRECT_RATE_VERY_FAST = 3 /* (::android::hardware::sensors::V1_0::RateLevel.FAST implicitly + 1) */, } direct_rate_level_t; typedef enum { SENSOR_DIRECT_MEM_TYPE_ASHMEM = 1, - SENSOR_DIRECT_MEM_TYPE_GRALLOC = 2, + SENSOR_DIRECT_MEM_TYPE_GRALLOC = 2 /* (::android::hardware::sensors::V1_0::SharedMemType.ASHMEM implicitly + 1) */, } direct_mem_type_t; typedef enum { |