From: Chris Manton Date: Fri, 16 Apr 2021 21:21:11 +0000 (+0000) Subject: Merge changes Ic583e487,Ic589759c,Ibe9720b5,I3fc83d6d,I3cccdf77, ... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1db32f98b01d27461540634f3b8813efce2a318e;p=android-x86%2Fsystem-bt.git Merge changes Ic583e487,Ic589759c,Ibe9720b5,I3fc83d6d,I3cccdf77, ... * changes: shim: Move disconnect classic/le into thread safe space shim: Add acl tests shim: Replace mock do_in_main_thread with a fake shim: Move dumpsys map off heap into static allocation shim: Clean up mock entry and add common header inclusion gd: Make address protected to set it for tests Untangle HCI_STATUS/BTM_STATUS bta/dm/bta_dm_act Enum-ify tSMP_STATUS --- 1db32f98b01d27461540634f3b8813efce2a318e diff --cc stack/include/smp_api_types.h index 955402b03,7541cbc7f..ba345c156 --- a/stack/include/smp_api_types.h +++ b/stack/include/smp_api_types.h @@@ -44,63 -46,60 +46,63 @@@ typedef enum : uint8_t } tSMP_OPCODE; /* SMP event type */ -#define SMP_EVT_NONE 0 /* Default no event */ -#define SMP_IO_CAP_REQ_EVT 1 /* IO capability request event */ -#define SMP_SEC_REQUEST_EVT 2 /* SMP pairing request */ -#define SMP_PASSKEY_NOTIF_EVT 3 /* passkey notification event */ -#define SMP_PASSKEY_REQ_EVT 4 /* passkey request event */ -#define SMP_OOB_REQ_EVT 5 /* OOB request event */ -#define SMP_NC_REQ_EVT 6 /* Numeric Comparison request event */ -#define SMP_COMPLT_EVT 7 /* SMP complete event */ -#define SMP_PEER_KEYPR_NOT_EVT 8 /* Peer keypress notification */ +typedef enum : uint8_t { + SMP_EVT_NONE = 0, /* Default no event */ + SMP_IO_CAP_REQ_EVT = 1, /* IO capability request event */ + SMP_SEC_REQUEST_EVT = 2, /* SMP pairing request */ + SMP_PASSKEY_NOTIF_EVT = 3, /* passkey notification event */ + SMP_PASSKEY_REQ_EVT = 4, /* passkey request event */ + SMP_OOB_REQ_EVT = 5, /* OOB request event */ + SMP_NC_REQ_EVT = 6, /* Numeric Comparison request event */ + SMP_COMPLT_EVT = 7, /* SMP complete event */ + SMP_PEER_KEYPR_NOT_EVT = 8, /* Peer keypress notification */ -/* SC OOB request event (both local and peer OOB data can be expected in - * response) */ -#define SMP_SC_OOB_REQ_EVT 9 -/* SC OOB local data set is created (as result of SMP_CrLocScOobData(...)) */ -#define SMP_SC_LOC_OOB_DATA_UP_EVT 10 -#define SMP_BR_KEYS_REQ_EVT 12 /* SMP over BR keys request event */ -#define SMP_CONSENT_REQ_EVT 14 /* Consent request event */ -typedef uint8_t tSMP_EVT; + /* SC OOB request event (both local and peer OOB data can be expected in + * response) */ + SMP_SC_OOB_REQ_EVT = 9, + /* SC OOB local data set is created (as result of SMP_CrLocScOobData(...)) */ + SMP_SC_LOC_OOB_DATA_UP_EVT = 10, + SMP_UNUSED11 = 11, + SMP_BR_KEYS_REQ_EVT = 12, /* SMP over BR keys request event */ + SMP_UNUSED13 = 13, + SMP_CONSENT_REQ_EVT = 14, /* Consent request event */ +} tSMP_EVT; /* pairing failure reason code */ - #define SMP_PASSKEY_ENTRY_FAIL 0x01 - #define SMP_OOB_FAIL 0x02 - #define SMP_PAIR_AUTH_FAIL 0x03 - #define SMP_CONFIRM_VALUE_ERR 0x04 - #define SMP_PAIR_NOT_SUPPORT 0x05 - #define SMP_ENC_KEY_SIZE 0x06 - #define SMP_INVALID_CMD 0x07 - #define SMP_PAIR_FAIL_UNKNOWN 0x08 - #define SMP_REPEATED_ATTEMPTS 0x09 - #define SMP_INVALID_PARAMETERS 0x0A - #define SMP_DHKEY_CHK_FAIL 0x0B - #define SMP_NUMERIC_COMPAR_FAIL 0x0C - #define SMP_BR_PARING_IN_PROGR 0x0D - #define SMP_XTRANS_DERIVE_NOT_ALLOW 0x0E - #define SMP_MAX_FAIL_RSN_PER_SPEC SMP_XTRANS_DERIVE_NOT_ALLOW - - /* self defined error code */ - #define SMP_PAIR_INTERNAL_ERR (SMP_MAX_FAIL_RSN_PER_SPEC + 0x01) /* 0x0F */ + typedef enum : uint8_t { + SMP_SUCCESS = 0, + SMP_PASSKEY_ENTRY_FAIL = 0x01, + SMP_OOB_FAIL = 0x02, + SMP_PAIR_AUTH_FAIL = 0x03, + SMP_CONFIRM_VALUE_ERR = 0x04, + SMP_PAIR_NOT_SUPPORT = 0x05, + SMP_ENC_KEY_SIZE = 0x06, + SMP_INVALID_CMD = 0x07, + SMP_PAIR_FAIL_UNKNOWN = 0x08, + SMP_REPEATED_ATTEMPTS = 0x09, + SMP_INVALID_PARAMETERS = 0x0A, + SMP_DHKEY_CHK_FAIL = 0x0B, + SMP_NUMERIC_COMPAR_FAIL = 0x0C, + SMP_BR_PARING_IN_PROGR = 0x0D, + SMP_XTRANS_DERIVE_NOT_ALLOW = 0x0E, + SMP_MAX_FAIL_RSN_PER_SPEC = SMP_XTRANS_DERIVE_NOT_ALLOW, - /* Unknown IO capability, unable to decide association model */ - #define SMP_UNKNOWN_IO_CAP (SMP_MAX_FAIL_RSN_PER_SPEC + 0x02) /* 0x10 */ + /* self defined error code */ + SMP_PAIR_INTERNAL_ERR = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x01), /* 0x0F */ - #define SMP_BUSY (SMP_MAX_FAIL_RSN_PER_SPEC + 0x05) /* 0x13 */ - #define SMP_ENC_FAIL (SMP_MAX_FAIL_RSN_PER_SPEC + 0x06) /* 0x14 */ - #define SMP_STARTED (SMP_MAX_FAIL_RSN_PER_SPEC + 0x07) /* 0x15 */ - #define SMP_RSP_TIMEOUT (SMP_MAX_FAIL_RSN_PER_SPEC + 0x08) /* 0x16 */ + /* Unknown IO capability, unable to decide association model */ + SMP_UNKNOWN_IO_CAP = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x02), /* 0x10 */ - /* Unspecified failure reason */ - #define SMP_FAIL (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0A) /* 0x18 */ + SMP_BUSY = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x05), /* 0x13 */ + SMP_ENC_FAIL = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x06), /* 0x14 */ + SMP_STARTED = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x07), /* 0x15 */ + SMP_RSP_TIMEOUT = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x08), /* 0x16 */ - #define SMP_CONN_TOUT (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0B) /* 0x19 */ - #define SMP_SUCCESS 0 + /* Unspecified failure reason */ + SMP_FAIL = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0A), /* 0x18 */ - typedef uint8_t tSMP_STATUS; + SMP_CONN_TOUT = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0B), /* 0x19 */ + } tSMP_STATUS; /* Device IO capability */ #define SMP_IO_CAP_IO BTM_IO_CAP_IO /* DisplayYesNo */