tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I589fdd3ed84c0221059a8c87cae1eae217aeb594
This commit is contained in:
Treehugger Robot 2021-03-19 22:10:33 +00:00 committed by Automerger Merge Worker
commit 157000483e
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OWNERS
View file

@ -1,4 +1,4 @@
eisenbach@google.com zachoverflow@google.com
elaurent@google.com elaurent@google.com
jpawlowski@google.com jpawlowski@google.com
malchev@google.com malchev@google.com

33
include/hardware/bluetooth.h
View file

@ -258,19 +258,25 @@ typedef struct
void *val; void *val;
} bt_property_t; } bt_property_t;
/** Bluetooth Out Of Band data for bonding */ /** Represents the actual Out of Band data itself */
typedef struct typedef struct {
{ // Both
uint8_t le_bt_dev_addr[7]; /* LE Bluetooth Device Address */ uint8_t address[7]; /* Bluetooth Device Address (6) plus Address Type (1) */
uint8_t c192[16]; /* Simple Pairing Hash C-192 */ uint8_t c[16]; /* Simple Pairing Hash C-192/256 (Classic or LE) */
uint8_t r192[16]; /* Simple Pairing Randomizer R-192 */ uint8_t r[16]; /* Simple Pairing Randomizer R-192/256 (Classic or LE) */
uint8_t c256[16]; /* Simple Pairing Hash C-256 */ uint8_t device_name[256]; /* Name of the device */
uint8_t r256[16]; /* Simple Pairing Randomizer R-256 */
uint8_t sm_tk[16]; /* Security Manager TK Value */
uint8_t le_sc_c[16]; /* LE Secure Connections Confirmation Value */
uint8_t le_sc_r[16]; /* LE Secure Connections Random Value */
} bt_out_of_band_data_t;
// Classic
uint8_t oob_data_length[2]; /* Classic only data Length. Value includes this
in length */
uint8_t class_of_device[2]; /* Class of Device (Classic or LE) */
// LE
uint8_t le_device_role; /* Supported and preferred role of device */
uint8_t sm_tk[16]; /* Security Manager TK Value (LE Only) */
uint8_t le_flags; /* LE Flags for discoverability and features */
uint8_t le_appearance[2]; /* For the appearance of the device */
} bt_oob_data_t;
/** Bluetooth Device Type */ /** Bluetooth Device Type */
@ -508,7 +514,8 @@ typedef struct {
/** Create Bluetooth Bond using out of band data */ /** Create Bluetooth Bond using out of band data */
int (*create_bond_out_of_band)(const RawAddress *bd_addr, int transport, int (*create_bond_out_of_band)(const RawAddress *bd_addr, int transport,
const bt_out_of_band_data_t *oob_data); const bt_oob_data_t *p192_data,
const bt_oob_data_t *p256_data);
/** Remove Bond */ /** Remove Bond */
int (*remove_bond)(const RawAddress *bd_addr); int (*remove_bond)(const RawAddress *bd_addr);