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

Commit 7c651ec0 authored by Chris Manton's avatar Chris Manton
Browse files

Remove unnecessary type definition tBTA_OOB_DATA 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib34521cb929fd95ed91e5142994dd7282d5b12e8
parent 5de1531c

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ void bta_dm_confirm(const RawAddress& bd_addr, bool accept) { 


/** respond to the IO capabilities request from BTM */

void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                          tBTA_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req) {

                          tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req) {

  BTM_IoCapRsp(bd_addr, io_cap, oob_data,

               auth_req ? BTM_AUTH_AP_YES : BTM_AUTH_AP_NO);

}

system/bta/dm/bta_dm_ci.cc

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
 *

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

void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                      tBTA_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req)

                      tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req)



{

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_ci_io_req_act, bd_addr, io_cap,

system/bta/dm/bta_dm_int.h

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ typedef struct { 
  BT_HDR hdr;

  RawAddress bd_addr;

  tBTM_IO_CAP io_cap;

  tBTA_OOB_DATA oob_data;

  tBTM_OOB_DATA oob_data;

  tBTM_AUTH_REQ auth_req;

} tBTA_DM_CI_IO_REQ;
@@ -518,7 +518,7 @@ extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT, 
                                  tBTA_DM_ENCRYPT_CBACK*, tBTA_DM_BLE_SEC_ACT);

extern void bta_dm_confirm(const RawAddress&, bool);

extern void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                                 tBTA_OOB_DATA oob_data,

                                 tBTM_OOB_DATA oob_data,

                                 tBTM_AUTH_REQ auth_req);

extern void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg);

system/bta/include/bta_api.h

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ typedef struct { 
#define BTA_OOB_PRESENT BTM_OOB_PRESENT

#define BTA_OOB_UNKNOWN BTM_OOB_UNKNOWN



typedef tBTM_OOB_DATA tBTA_OOB_DATA;



/* Structure associated with BTA_DM_SP_CFM_REQ_EVT */

typedef struct {

  /* Note: First 3 data members must be, bd_addr, dev_class, and bd_name in

system/bta/include/bta_dm_ci.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 *

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

extern void bta_dm_ci_io_req(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                             tBTA_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req);

                             tBTM_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req);



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

 *