Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de1531c authored by Chris Manton's avatar Chris Manton
Browse files

Remove unnecessary type definition tBTA_LE_AUTH_REQ 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I664102783cd0fb0eedfc003955f64e453a7ac3f7
parent 34e37678

system/bta/include/bta_api.h

+0 −2
Original line number Diff line number Diff line
@@ -553,8 +553,6 @@ typedef struct { 
#define BTA_LE_AUTH_REQ_SC_BOND BTM_LE_AUTH_REQ_SC_BOND           /* 1001 */

#define BTA_LE_AUTH_REQ_SC_MITM BTM_LE_AUTH_REQ_SC_MITM           /* 1100 */

#define BTA_LE_AUTH_REQ_SC_MITM_BOND BTM_LE_AUTH_REQ_SC_MITM_BOND /* 1101 */

typedef tBTM_LE_AUTH_REQ

    tBTA_LE_AUTH_REQ; /* combination of the above bit pattern */



#define BTA_OOB_NONE BTM_OOB_NONE

#define BTA_OOB_PRESENT BTM_OOB_PRESENT

system/bta/include/bta_dm_co.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status); 
 ******************************************************************************/

extern void bta_dm_co_ble_io_req(

    const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, tBTA_OOB_DATA* p_oob_data,

    tBTA_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,

    tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,

    tBTA_LE_KEY_TYPE* p_init_key, tBTA_LE_KEY_TYPE* p_resp_key);



/*******************************************************************************

system/btif/co/bta_dm_co.cc

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void bta_dm_co_ble_load_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, 
 ******************************************************************************/

void bta_dm_co_ble_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,

                          tBTA_OOB_DATA* p_oob_data,

                          tBTA_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,

                          tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,

                          tBTA_LE_KEY_TYPE* p_init_key,

                          tBTA_LE_KEY_TYPE* p_resp_key) {

  bte_appl_cfg.ble_io_cap = btif_storage_get_local_io_caps_ble();

system/btif/include/btif_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void btif_dm_proc_io_rsp(const RawAddress& bd_addr, tBTM_IO_CAP io_cap, 
void btif_dm_set_oob_for_io_req(tBTA_OOB_DATA* p_oob_data);

void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,

                                   tBTA_OOB_DATA* p_oob_data,

                                   tBTA_LE_AUTH_REQ* p_auth_req);

                                   tBTM_LE_AUTH_REQ* p_auth_req);

#ifdef BTIF_DM_OOB_TEST

void btif_dm_load_local_oob(void);

void btif_dm_proc_loc_oob(bool valid, const Octet16& c, const Octet16& r);