Remove unnecessary type definitions tBTA_AUTH_REQ
Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I25ea66a32fc3358b5b7b4b3c55e6256777563fa1
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 8b64fe2..85a3a3c 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -923,7 +923,7 @@
/** 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);
}
diff --git a/system/bta/dm/bta_dm_ci.cc b/system/bta/dm/bta_dm_ci.cc
index 5bd3dd4..a2c98b1 100644
--- a/system/bta/dm/bta_dm_ci.cc
+++ b/system/bta/dm/bta_dm_ci.cc
@@ -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,
diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h
index b71202c..edddc89 100644
--- a/system/bta/dm/bta_dm_int.h
+++ b/system/bta/dm/bta_dm_int.h
@@ -113,7 +113,7 @@
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 @@
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_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);
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 99c79ae..c7b409a 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -537,7 +537,6 @@
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 @@
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 {
diff --git a/system/bta/include/bta_dm_ci.h b/system/bta/include/bta_dm_ci.h
index 2c3017c..11d24ce 100644
--- a/system/bta/include/bta_dm_ci.h
+++ b/system/bta/include/bta_dm_ci.h
@@ -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);
/*******************************************************************************
*
diff --git a/system/bta/include/bta_dm_co.h b/system/bta/include/bta_dm_co.h
index 75bffdc..9b81ea2 100644
--- a/system/bta/include/bta_dm_co.h
+++ b/system/bta/include/bta_dm_co.h
@@ -54,7 +54,7 @@
******************************************************************************/
extern void bta_dm_co_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,
tBTA_OOB_DATA* p_oob_data,
- tBTA_AUTH_REQ* p_auth_req, bool is_orig);
+ tBTM_AUTH_REQ* p_auth_req, bool is_orig);
/*******************************************************************************
*
@@ -74,7 +74,7 @@
*
******************************************************************************/
extern void bta_dm_co_io_rsp(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);
/*******************************************************************************
*
diff --git a/system/btif/co/bta_dm_co.cc b/system/btif/co/bta_dm_co.cc
index 558f0be..d6be0eb 100644
--- a/system/btif/co/bta_dm_co.cc
+++ b/system/btif/co/bta_dm_co.cc
@@ -76,7 +76,7 @@
******************************************************************************/
void bta_dm_co_io_req(UNUSED_ATTR const RawAddress& bd_addr,
tBTM_IO_CAP* p_io_cap, tBTA_OOB_DATA* p_oob_data,
- tBTA_AUTH_REQ* p_auth_req, bool is_orig) {
+ tBTM_AUTH_REQ* p_auth_req, bool is_orig) {
btif_dm_set_oob_for_io_req(p_oob_data);
btif_dm_proc_io_req(bd_addr, p_io_cap, p_oob_data, p_auth_req, is_orig);
BTIF_TRACE_DEBUG("bta_dm_co_io_req *p_oob_data = %d", *p_oob_data);
@@ -103,7 +103,7 @@
*
******************************************************************************/
void bta_dm_co_io_rsp(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) {
btif_dm_proc_io_rsp(bd_addr, io_cap, oob_data, auth_req);
}
diff --git a/system/btif/include/btif_dm.h b/system/btif/include/btif_dm.h
index a8ba1d0..917c143 100644
--- a/system/btif/include/btif_dm.h
+++ b/system/btif/include/btif_dm.h
@@ -44,13 +44,13 @@
* Callout for handling io_capabilities request
*/
void btif_dm_proc_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,
- tBTA_OOB_DATA* p_oob_data, tBTA_AUTH_REQ* p_auth_req,
+ tBTA_OOB_DATA* p_oob_data, tBTM_AUTH_REQ* p_auth_req,
bool is_orig);
/**
* Callout for handling io_capabilities response
*/
void btif_dm_proc_io_rsp(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);
/**
* Out-of-band functions
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 0dab24f..dd98024 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -2663,7 +2663,7 @@
void btif_dm_proc_io_req(UNUSED_ATTR const RawAddress& bd_addr,
UNUSED_ATTR tBTM_IO_CAP* p_io_cap,
UNUSED_ATTR tBTA_OOB_DATA* p_oob_data,
- tBTA_AUTH_REQ* p_auth_req, bool is_orig) {
+ tBTM_AUTH_REQ* p_auth_req, bool is_orig) {
uint8_t yes_no_bit = BTA_AUTH_SP_YES & *p_auth_req;
/* if local initiated:
** 1. set DD + MITM
@@ -2699,7 +2699,7 @@
void btif_dm_proc_io_rsp(UNUSED_ATTR const RawAddress& bd_addr,
tBTM_IO_CAP io_cap, UNUSED_ATTR tBTA_OOB_DATA oob_data,
- tBTA_AUTH_REQ auth_req) {
+ tBTM_AUTH_REQ auth_req) {
if (auth_req & BTA_AUTH_BONDS) {
BTIF_TRACE_DEBUG("%s auth_req:%d", __func__, auth_req);
pairing_cb.auth_req = auth_req;
@@ -2718,7 +2718,7 @@
void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,
tBTA_OOB_DATA* p_has_oob_data,
- tBTA_LE_AUTH_REQ* p_auth_req) {
+ tBTM_LE_AUTH_REQ* p_auth_req) {
if (!is_empty_128bit(oob_cb.oob_data.le_sc_c) &&
!is_empty_128bit(oob_cb.oob_data.le_sc_r)) {
/* We have LE SC OOB data */
@@ -2738,7 +2738,7 @@
/* make sure OOB data is for this particular device */
if (bd_addr == oob_cb.bdaddr) {
// When using OOB with TK, SC Secure Connections bit must be disabled.
- tBTA_LE_AUTH_REQ mask = ~BTM_LE_AUTH_REQ_SC_ONLY;
+ tBTM_LE_AUTH_REQ mask = ~BTM_LE_AUTH_REQ_SC_ONLY;
*p_auth_req = ((*p_auth_req) & mask);
*p_has_oob_data = true;
