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

Commit 14e5073e authored by Chris Manton's avatar Chris Manton
Browse files

Remove unnecessary type definitions tBTA_AUTH_REQ 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I25ea66a32fc3358b5b7b4b3c55e6256777563fa1
parent 99b3fbce

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, tBTA_AUTH_REQ auth_req) {

                          tBTA_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, tBTA_AUTH_REQ auth_req)

                      tBTA_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

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ typedef struct { 
  RawAddress bd_addr;

  tBTM_IO_CAP io_cap;

  tBTA_OOB_DATA oob_data;

  tBTA_AUTH_REQ auth_req;

  tBTM_AUTH_REQ auth_req;

} tBTA_DM_CI_IO_REQ;



typedef struct {
@@ -316,8 +316,8 @@ typedef struct { 
  tBTA_DM_SEC_EVT pin_evt;

  tBTM_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTM_IO_CAP rmt_io_caps;    /* IO Capabilities of remote device */

  tBTA_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTA_AUTH_REQ rmt_auth_req;

  tBTM_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTM_AUTH_REQ rmt_auth_req;

  uint32_t num_val; /* the numeric value for comparison. If just_works, do not

                       show this number to UI */

  bool just_works;  /* true, if "Just Works" association model */
@@ -519,7 +519,7 @@ extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT, 
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,

                                 tBTA_AUTH_REQ auth_req);

                                 tBTM_AUTH_REQ auth_req);

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



extern void bta_dm_init_pm(void);

system/bta/include/bta_api.h

+3 −4
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ typedef struct { 
                      bonding                                               \

                      Use IO Capabilities to determine authentication       \

                      procedure */

typedef tBTM_AUTH_REQ tBTA_AUTH_REQ;



#define BTA_AUTH_DD_BOND \

  BTM_AUTH_DD_BOND /* 2 this bit is set for dedicated bonding */
@@ -573,10 +572,10 @@ typedef struct { 
  uint32_t num_val; /* the numeric value for comparison. If just_works, do not

                       show this number to UI */

  bool just_works;  /* true, if "Just Works" association model */

  tBTA_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTA_AUTH_REQ rmt_auth_req; /* Authentication required for peer device */

  tBTM_AUTH_REQ loc_auth_req; /* Authentication required for local device */

  tBTM_AUTH_REQ rmt_auth_req; /* Authentication required for peer device */

  tBTM_IO_CAP loc_io_caps;    /* IO Capabilities of local device */

  tBTA_AUTH_REQ rmt_io_caps;  /* IO Capabilities of remote device */

  tBTM_AUTH_REQ rmt_io_caps;  /* IO Capabilities of remote device */

} tBTA_DM_SP_CFM_REQ;



enum {

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, tBTA_AUTH_REQ auth_req);

                             tBTA_OOB_DATA oob_data, tBTM_AUTH_REQ auth_req);



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

 *