From 50cf52cf6b097ecb57922d69c22d559097a205b0 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 15 Jun 2017 11:10:08 -0700 Subject: [PATCH] Replace BD_ADDR with bt_bdaddr_t in HL related code Test: compilation test Change-Id: Ife04e0839a4a6f61b77a60f49bf44ab5bdacc874 --- bta/hl/bta_hl_act.cc | 17 +++--- bta/hl/bta_hl_api.cc | 6 +- bta/hl/bta_hl_int.h | 25 ++++---- bta/hl/bta_hl_main.cc | 4 +- bta/hl/bta_hl_utils.cc | 52 ++++++++-------- bta/include/bta_hl_api.h | 14 ++--- btif/include/btif_hl.h | 12 ++-- btif/src/btif_hl.cc | 152 ++++++++++++++--------------------------------- 8 files changed, 115 insertions(+), 167 deletions(-) diff --git a/bta/hl/bta_hl_act.cc b/bta/hl/bta_hl_act.cc index 569f66c0c..028ed2128 100644 --- a/bta/hl/bta_hl_act.cc +++ b/bta/hl/bta_hl_act.cc @@ -1254,7 +1254,7 @@ void bta_hl_dch_mca_create_ind(uint8_t app_idx, uint8_t mcl_idx, evt_data.dch_create_ind.local_mdep_id = p_dcb->local_mdep_id; evt_data.dch_create_ind.mdl_id = p_dcb->mdl_id; evt_data.dch_create_ind.cfg = p_dcb->remote_cfg; - bdcpy(evt_data.dch_create_ind.bd_addr, p_mcb->bd_addr); + evt_data.dch_create_ind.bd_addr = p_mcb->bd_addr; p_acb->p_cback(BTA_HL_DCH_CREATE_IND_EVT, (tBTA_HL*)&evt_data); } else { if (MCA_CreateMdlRsp((tMCA_CL)p_mcb->mcl_handle, p_dcb->local_mdep_id, @@ -1848,8 +1848,8 @@ tBTA_HL_STATUS bta_hl_init_sdp(tBTA_HL_SDP_OPER sdp_oper, uint8_t app_idx, SDP_InitDiscoveryDb(p_cb->p_db, BTA_HL_DISC_SIZE, 1, &uuid_list, num_attrs, attr_list); - if (!SDP_ServiceSearchAttributeRequest(p_cb->bd_addr, p_cb->p_db, - p_cb->sdp_cback)) { + if (!SDP_ServiceSearchAttributeRequest(to_BD_ADDR(p_cb->bd_addr), + p_cb->p_db, p_cb->sdp_cback)) { status = BTA_HL_STATUS_FAIL; } else { status = BTA_HL_STATUS_OK; @@ -1920,8 +1920,9 @@ void bta_hl_cch_mca_open(uint8_t app_idx, uint8_t mcl_idx, &sdp_idx)) { p_mcb->ctrl_psm = p_mcb->sdp.sdp_rec[sdp_idx].ctrl_psm; p_mcb->data_psm = p_mcb->sdp.sdp_rec[sdp_idx].data_psm; - if (MCA_ConnectReq((tMCA_HANDLE)p_acb->app_handle, p_mcb->bd_addr, - p_mcb->ctrl_psm, p_mcb->sec_mask) != MCA_SUCCESS) { + if (MCA_ConnectReq((tMCA_HANDLE)p_acb->app_handle, + to_BD_ADDR(p_mcb->bd_addr), p_mcb->ctrl_psm, + p_mcb->sec_mask) != MCA_SUCCESS) { bta_hl_cch_sm_execute(app_idx, mcl_idx, BTA_HL_CCH_CLOSE_CMPL_EVT, p_data); } @@ -1986,7 +1987,7 @@ void bta_hl_cch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, #if (BTA_HL_DEBUG == TRUE) APPL_TRACE_DEBUG("bta_hl_cch_close_cmpl"); #endif - bta_sys_conn_close(BTA_ID_HL, p_acb->app_id, p_mcb->bd_addr); + bta_sys_conn_close(BTA_ID_HL, p_acb->app_id, to_BD_ADDR(p_mcb->bd_addr)); if (p_mcb->cch_oper == BTA_HL_CCH_OP_LOCAL_CLOSE && p_mcb->force_close_local_cch_opening) { @@ -2131,10 +2132,10 @@ void bta_hl_cch_mca_connect(uint8_t app_idx, uint8_t mcl_idx, #endif p_mcb->mcl_handle = p_data->mca_evt.mcl_handle; - bdcpy(p_mcb->bd_addr, p_data->mca_evt.mca_data.connect_ind.bd_addr); + p_mcb->bd_addr = from_BD_ADDR(p_data->mca_evt.mca_data.connect_ind.bd_addr); p_mcb->cch_mtu = p_data->mca_evt.mca_data.connect_ind.mtu; - bta_sys_conn_open(BTA_ID_HL, p_acb->app_id, p_mcb->bd_addr); + bta_sys_conn_open(BTA_ID_HL, p_acb->app_id, to_BD_ADDR(p_mcb->bd_addr)); switch (p_mcb->cch_oper) { case BTA_HL_CCH_OP_LOCAL_OPEN: bta_hl_build_cch_open_cfm(&evt_data, p_mcb->app_id, p_acb->app_handle, diff --git a/bta/hl/bta_hl_api.cc b/bta/hl/bta_hl_api.cc index cc0ae0603..a9739a6cb 100644 --- a/bta/hl/bta_hl_api.cc +++ b/bta/hl/bta_hl_api.cc @@ -227,7 +227,7 @@ void BTA_HlCchOpen(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, p_buf->app_handle = app_handle; p_buf->sec_mask = (p_open_param->sec_mask | BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT); - bdcpy(p_buf->bd_addr, p_open_param->bd_addr); + p_buf->bd_addr = p_open_param->bd_addr; p_buf->ctrl_psm = p_open_param->ctrl_psm; bta_sys_sendmsg(p_buf); @@ -443,14 +443,14 @@ void BTA_HlDchEchoTest(tBTA_HL_MCL_HANDLE mcl_handle, * ******************************************************************************/ void BTA_HlSdpQuery(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, - BD_ADDR bd_addr) { + const bt_bdaddr_t& bd_addr) { tBTA_HL_API_SDP_QUERY* p_buf = (tBTA_HL_API_SDP_QUERY*)osi_malloc(sizeof(tBTA_HL_API_SDP_QUERY)); p_buf->hdr.event = BTA_HL_API_SDP_QUERY_EVT; p_buf->app_id = app_id; p_buf->app_handle = app_handle; - bdcpy(p_buf->bd_addr, bd_addr); + p_buf->bd_addr = bd_addr; bta_sys_sendmsg(p_buf); } diff --git a/bta/hl/bta_hl_int.h b/bta/hl/bta_hl_int.h index 4d5168d7a..c4c6aa46b 100644 --- a/bta/hl/bta_hl_int.h +++ b/bta/hl/bta_hl_int.h @@ -267,8 +267,8 @@ typedef struct { uint8_t app_id; tBTA_HL_APP_HANDLE app_handle; uint16_t ctrl_psm; - BD_ADDR bd_addr; /* Address of peer device */ - tBTA_SEC sec_mask; /* security mask for initiating connection*/ + bt_bdaddr_t bd_addr; /* Address of peer device */ + tBTA_SEC sec_mask; /* security mask for initiating connection*/ } tBTA_HL_API_CCH_OPEN; typedef struct { @@ -359,7 +359,7 @@ typedef struct { BT_HDR hdr; tBTA_HL_APP_HANDLE app_handle; uint8_t app_id; - BD_ADDR bd_addr; /* Address of peer device */ + bt_bdaddr_t bd_addr; /* Address of peer device */ } tBTA_HL_API_SDP_QUERY; typedef struct { @@ -455,7 +455,7 @@ typedef struct { uint16_t req_ctrl_psm; uint16_t ctrl_psm; uint16_t data_psm; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; uint16_t cch_mtu; uint16_t sec_mask; tBTA_HL_MCL_HANDLE mcl_handle; @@ -720,7 +720,7 @@ extern bool bta_hl_find_app_idx_using_handle(tBTA_HL_APP_HANDLE app_handle, extern bool bta_hl_find_mcl_idx_using_handle(tBTA_HL_MCL_HANDLE mcl_handle, uint8_t* p_app_idx, uint8_t* p_mcl_idx); -extern bool bta_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, +extern bool bta_hl_find_mcl_idx(uint8_t app_idx, const bt_bdaddr_t& p_bd_addr, uint8_t* p_mcl_idx); extern bool bta_hl_is_the_first_reliable_existed(uint8_t app_idx, uint8_t mcl_idx); @@ -735,9 +735,10 @@ extern bool bta_hl_find_mdl_cfg_idx(uint8_t app_idx, uint8_t mcl_idx, extern bool bta_hl_get_cur_time(uint8_t app_idx, uint8_t* p_cur_time); extern void bta_hl_sort_cfg_time_idx(uint8_t app_idx, uint8_t* a, uint8_t n); extern void bta_hl_compact_mdl_cfg_time(uint8_t app_idx, uint8_t mdep_id); -extern bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr, +extern bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, + const bt_bdaddr_t& bd_addr, tBTA_HL_MDL_ID mdl_id); -extern bool bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr, +extern bool bta_hl_delete_mdl_cfg(uint8_t app_idx, const bt_bdaddr_t& bd_addr, tBTA_HL_MDL_ID mdl_id); extern bool bta_hl_is_mdl_value_valid(tBTA_HL_MDL_ID mdl_id); extern bool bta_hl_find_mdep_cfg_idx(uint8_t app_idx, @@ -774,7 +775,7 @@ extern bool bta_hl_get_l2cap_cfg(tBTA_HL_MDL_HANDLE mdl_hnd, tBTA_HL_L2CAP_CFG_INFO* p_cfg); extern bool bta_hl_validate_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx); -extern bool bta_hl_is_cong_on(uint8_t app_id, BD_ADDR bd_addr, +extern bool bta_hl_is_cong_on(uint8_t app_id, const bt_bdaddr_t& bd_addr, tBTA_HL_MDL_ID mdl_id); extern void bta_hl_check_cch_close(uint8_t app_idx, uint8_t mcl_idx, tBTA_HL_DATA* p_data, bool check_dch_setup); @@ -810,11 +811,12 @@ extern void bta_hl_build_rcv_data_ind(tBTA_HL* p_evt_data, extern void bta_hl_build_cch_open_cfm(tBTA_HL* p_evt_data, uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, tBTA_HL_MCL_HANDLE mcl_handle, - BD_ADDR bd_addr, tBTA_HL_STATUS status); + const bt_bdaddr_t& bd_addr, + tBTA_HL_STATUS status); extern void bta_hl_build_cch_open_ind(tBTA_HL* p_evt_data, tBTA_HL_APP_HANDLE app_handle, tBTA_HL_MCL_HANDLE mcl_handle, - BD_ADDR bd_addr); + const bt_bdaddr_t& bd_addr); extern void bta_hl_build_cch_close_cfm(tBTA_HL* p_evt_data, tBTA_HL_APP_HANDLE app_handle, tBTA_HL_MCL_HANDLE mcl_handle, @@ -842,7 +844,8 @@ extern void bta_hl_build_echo_test_cfm(tBTA_HL* p_evt_data, tBTA_HL_STATUS status); extern void bta_hl_build_sdp_query_cfm(tBTA_HL* p_evt_data, uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, - BD_ADDR bd_addr, tBTA_HL_SDP* p_sdp, + const bt_bdaddr_t& bd_addr, + tBTA_HL_SDP* p_sdp, tBTA_HL_STATUS status); #if (BTA_HL_DEBUG == TRUE) diff --git a/bta/hl/bta_hl_main.cc b/bta/hl/bta_hl_main.cc index bc8f39686..69c0909cd 100644 --- a/bta/hl/bta_hl_main.cc +++ b/bta/hl/bta_hl_main.cc @@ -780,7 +780,7 @@ static void bta_hl_api_cch_open(UNUSED_ATTR tBTA_HL_CB* p_cb, p_mcb->in_use = true; p_mcb->req_ctrl_psm = p_data->api_cch_open.ctrl_psm; p_mcb->sec_mask = p_data->api_cch_open.sec_mask; - bdcpy(p_mcb->bd_addr, p_data->api_cch_open.bd_addr); + p_mcb->bd_addr = p_data->api_cch_open.bd_addr; p_mcb->cch_oper = BTA_HL_CCH_OP_LOCAL_OPEN; } else { status = BTA_HL_STATUS_NO_RESOURCE; @@ -1328,7 +1328,7 @@ static void bta_hl_api_sdp_query(UNUSED_ATTR tBTA_HL_CB* p_cb, if (bta_hl_find_avail_mcl_idx(app_idx, &mcl_idx)) { p_mcb = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); p_mcb->in_use = true; - bdcpy(p_mcb->bd_addr, p_data->api_sdp_query.bd_addr); + p_mcb->bd_addr = p_data->api_sdp_query.bd_addr; APPL_TRACE_DEBUG( "bta_hl_api_sdp_query p_mcb->app_id %d app_idx %d mcl_idx %d", p_mcb->app_id, app_idx, mcl_idx); diff --git a/bta/hl/bta_hl_utils.cc b/bta/hl/bta_hl_utils.cc index 3510cfdaa..3c2304aff 100644 --- a/bta/hl/bta_hl_utils.cc +++ b/bta/hl/bta_hl_utils.cc @@ -436,9 +436,10 @@ bool bta_hl_find_cch_cb_indexes(tBTA_HL_DATA* p_msg, uint8_t* p_app_idx, if (bta_hl_find_app_idx_using_handle(p_msg->mca_evt.app_handle, &app_idx)) { - if (bta_hl_find_mcl_idx(app_idx, - p_msg->mca_evt.mca_data.connect_ind.bd_addr, - &mcl_idx)) { + if (bta_hl_find_mcl_idx( + app_idx, + from_BD_ADDR(p_msg->mca_evt.mca_data.connect_ind.bd_addr), + &mcl_idx)) { /* local initiated */ found = true; } else if (!bta_hl_find_mcl_idx_using_handle(p_msg->mca_evt.mcl_handle, @@ -461,7 +462,9 @@ bool bta_hl_find_cch_cb_indexes(tBTA_HL_DATA* p_msg, uint8_t* p_app_idx, } else if (bta_hl_find_app_idx_using_handle(p_msg->mca_evt.app_handle, &app_idx) && bta_hl_find_mcl_idx( - app_idx, p_msg->mca_evt.mca_data.disconnect_ind.bd_addr, + app_idx, + from_BD_ADDR( + p_msg->mca_evt.mca_data.disconnect_ind.bd_addr), &mcl_idx)) { found = true; } @@ -1026,15 +1029,14 @@ bool bta_hl_find_mcl_idx_using_handle(tBTA_HL_MCL_HANDLE mcl_handle, * Returns bool true-found * ******************************************************************************/ -bool bta_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, +bool bta_hl_find_mcl_idx(uint8_t app_idx, const bt_bdaddr_t& p_bd_addr, uint8_t* p_mcl_idx) { bool found = false; uint8_t i; for (i = 0; i < BTA_HL_NUM_MCLS; i++) { if (bta_hl_cb.acb[app_idx].mcb[i].in_use && - (!memcmp(bta_hl_cb.acb[app_idx].mcb[i].bd_addr, p_bd_addr, - BD_ADDR_LEN))) { + bta_hl_cb.acb[app_idx].mcb[i].bd_addr == p_bd_addr) { found = true; *p_mcl_idx = i; break; @@ -1155,8 +1157,7 @@ bool bta_hl_find_non_active_mdl_cfg(uint8_t app_idx, uint8_t start_mdl_cfg_idx, p_mdl = BTA_HL_GET_MDL_CFG_PTR(app_idx, i); for (j = 0; j < BTA_HL_NUM_MCLS; j++) { p_mcb = BTA_HL_GET_MCL_CB_PTR(app_idx, j); - if (p_mcb->in_use && - !memcmp(p_mdl->peer_bd_addr, p_mcb->bd_addr, BD_ADDR_LEN)) { + if (p_mcb->in_use && p_mdl->peer_bd_addr == p_mcb->bd_addr) { for (k = 0; k < BTA_HL_NUM_MDLS_PER_MCL; k++) { p_dcb = BTA_HL_GET_MDL_CB_PTR(app_idx, j, k); @@ -1284,8 +1285,7 @@ bool bta_hl_find_mdl_cfg_idx(uint8_t app_idx, uint8_t mcl_idx, if (p_mdl->active) APPL_TRACE_DEBUG("bta_hl_find_mdl_cfg_idx: mdl_id =%d, p_mdl->mdl_id=%d", mdl_id, p_mdl->mdl_id); - if (p_mdl->active && - (!memcmp(p_mcb->bd_addr, p_mdl->peer_bd_addr, BD_ADDR_LEN)) && + if (p_mdl->active && p_mcb->bd_addr == p_mdl->peer_bd_addr && (p_mdl->mdl_id == mdl_id)) { found = true; *p_mdl_cfg_idx = i; @@ -1434,7 +1434,7 @@ void bta_hl_compact_mdl_cfg_time(uint8_t app_idx, uint8_t mdep_id) { * false does not exist * ******************************************************************************/ -bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr, +bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, const bt_bdaddr_t& bd_addr, tBTA_HL_MDL_ID mdl_id) { tBTA_HL_MDL_CFG* p_mdl; bool found = false; @@ -1442,7 +1442,7 @@ bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr, for (i = 0; i < BTA_HL_NUM_MDL_CFGS; i++) { p_mdl = BTA_HL_GET_MDL_CFG_PTR(app_idx, i); - if (p_mdl->active && !memcmp(p_mdl->peer_bd_addr, bd_addr, BD_ADDR_LEN)) { + if (p_mdl->active && p_mdl->peer_bd_addr == bd_addr) { if (mdl_id != BTA_HL_DELETE_ALL_MDL_IDS) { if (p_mdl->mdl_id == mdl_id) { found = true; @@ -1468,7 +1468,7 @@ bool bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr, * false Failed * ******************************************************************************/ -bool bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr, +bool bta_hl_delete_mdl_cfg(uint8_t app_idx, const bt_bdaddr_t& bd_addr, tBTA_HL_MDL_ID mdl_id) { tBTA_HL_MDL_CFG* p_mdl; bool success = false; @@ -1476,7 +1476,7 @@ bool bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr, for (i = 0; i < BTA_HL_NUM_MDL_CFGS; i++) { p_mdl = BTA_HL_GET_MDL_CFG_PTR(app_idx, i); - if (p_mdl->active && !memcmp(p_mdl->peer_bd_addr, bd_addr, BD_ADDR_LEN)) { + if (p_mdl->active && p_mdl->peer_bd_addr == bd_addr) { if (mdl_id != BTA_HL_DELETE_ALL_MDL_IDS) { if (p_mdl->mdl_id == mdl_id) { bta_hl_co_delete_mdl(p_mdl->local_mdep_id, i); @@ -2196,7 +2196,7 @@ void bta_hl_save_mdl_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx) { mdl_cfg.mtu = l2cap_cfg.mtu; mdl_cfg.fcs = l2cap_cfg.fcs; - bdcpy(mdl_cfg.peer_bd_addr, p_mcb->bd_addr); + mdl_cfg.peer_bd_addr = p_mcb->bd_addr; mdl_cfg.local_mdep_id = p_dcb->local_mdep_id; p_mdep_cfg = &p_acb->sup_feature.mdep[p_dcb->local_mdep_cfg_idx]; mdl_cfg.local_mdep_role = p_mdep_cfg->mdep_cfg.mdep_role; @@ -2422,7 +2422,8 @@ bool bta_hl_validate_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, * false not congested * ******************************************************************************/ -bool bta_hl_is_cong_on(uint8_t app_id, BD_ADDR bd_addr, tBTA_HL_MDL_ID mdl_id) +bool bta_hl_is_cong_on(uint8_t app_id, const bt_bdaddr_t& bd_addr, + tBTA_HL_MDL_ID mdl_id) { tBTA_HL_MDL_CB* p_dcb; @@ -2723,12 +2724,13 @@ void bta_hl_build_rcv_data_ind(tBTA_HL* p_evt_data, ******************************************************************************/ void bta_hl_build_cch_open_cfm(tBTA_HL* p_evt_data, uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, - tBTA_HL_MCL_HANDLE mcl_handle, BD_ADDR bd_addr, + tBTA_HL_MCL_HANDLE mcl_handle, + const bt_bdaddr_t& bd_addr, tBTA_HL_STATUS status) { p_evt_data->cch_open_cfm.app_id = app_id; p_evt_data->cch_open_cfm.app_handle = app_handle; p_evt_data->cch_open_cfm.mcl_handle = mcl_handle; - bdcpy(p_evt_data->cch_open_cfm.bd_addr, bd_addr); + p_evt_data->cch_open_cfm.bd_addr = bd_addr; p_evt_data->cch_open_cfm.status = status; APPL_TRACE_DEBUG("bta_hl_build_cch_open_cfm: status=%d", status); } @@ -2744,10 +2746,11 @@ void bta_hl_build_cch_open_cfm(tBTA_HL* p_evt_data, uint8_t app_id, ******************************************************************************/ void bta_hl_build_cch_open_ind(tBTA_HL* p_evt_data, tBTA_HL_APP_HANDLE app_handle, - tBTA_HL_MCL_HANDLE mcl_handle, BD_ADDR bd_addr) { + tBTA_HL_MCL_HANDLE mcl_handle, + const bt_bdaddr_t& bd_addr) { p_evt_data->cch_open_ind.app_handle = app_handle; p_evt_data->cch_open_ind.mcl_handle = mcl_handle; - bdcpy(p_evt_data->cch_open_ind.bd_addr, bd_addr); + p_evt_data->cch_open_ind.bd_addr = bd_addr; } /******************************************************************************* @@ -2826,15 +2829,16 @@ void bta_hl_build_dch_open_cfm(tBTA_HL* p_evt_data, * ******************************************************************************/ void bta_hl_build_sdp_query_cfm(tBTA_HL* p_evt_data, uint8_t app_id, - tBTA_HL_APP_HANDLE app_handle, BD_ADDR bd_addr, - tBTA_HL_SDP* p_sdp, tBTA_HL_STATUS status) + tBTA_HL_APP_HANDLE app_handle, + const bt_bdaddr_t& bd_addr, tBTA_HL_SDP* p_sdp, + tBTA_HL_STATUS status) { APPL_TRACE_DEBUG("bta_hl_build_sdp_query_cfm: app_id = %d, app_handle=%d", app_id, app_handle); p_evt_data->sdp_query_cfm.app_id = app_id; p_evt_data->sdp_query_cfm.app_handle = app_handle; - bdcpy(p_evt_data->sdp_query_cfm.bd_addr, bd_addr); + p_evt_data->sdp_query_cfm.bd_addr = bd_addr; p_evt_data->sdp_query_cfm.p_sdp = p_sdp; p_evt_data->sdp_query_cfm.status = status; } diff --git a/bta/include/bta_hl_api.h b/bta/include/bta_hl_api.h index 5ba9d8420..04c9983e8 100644 --- a/bta/include/bta_hl_api.h +++ b/bta/include/bta_hl_api.h @@ -263,7 +263,7 @@ typedef struct { bool active; /* true if this item is in use */ tBTA_HL_DCH_MODE dch_mode; uint8_t fcs; - BD_ADDR peer_bd_addr; + bt_bdaddr_t peer_bd_addr; } tBTA_HL_MDL_CFG; /* Maximum number of supported feature list items (list_elem in @@ -297,7 +297,7 @@ typedef struct { typedef struct { uint16_t ctrl_psm; - BD_ADDR bd_addr; /* Address of peer device */ + bt_bdaddr_t bd_addr; /* Address of peer device */ tBTA_SEC sec_mask; /* security mask for initiating connection*/ } tBTA_HL_CCH_OPEN_PARAM; @@ -429,7 +429,7 @@ typedef struct { typedef struct { tBTA_HL_MCL_HANDLE mcl_handle; tBTA_HL_APP_HANDLE app_handle; - BD_ADDR bd_addr; /* address of peer device */ + bt_bdaddr_t bd_addr; /* address of peer device */ } tBTA_HL_CCH_OPEN_IND; typedef struct { @@ -437,7 +437,7 @@ typedef struct { uint8_t app_id; tBTA_HL_MCL_HANDLE mcl_handle; tBTA_HL_APP_HANDLE app_handle; - BD_ADDR bd_addr; /* address of peer device */ + bt_bdaddr_t bd_addr; /* address of peer device */ } tBTA_HL_CCH_OPEN_CFM; typedef struct { @@ -447,7 +447,7 @@ typedef struct { tBTA_HL_MDL_ID mdl_id; /* MCAP data link ID for this data channel conenction */ tBTA_HL_DCH_CFG cfg; /* dch cfg requested by the peer device */ - BD_ADDR bd_addr; /* address of peer device */ + bt_bdaddr_t bd_addr; /* address of peer device */ } tBTA_HL_DCH_CREATE_IND; @@ -529,7 +529,7 @@ typedef struct { tBTA_HL_STATUS status; uint8_t app_id; tBTA_HL_APP_HANDLE app_handle; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; tBTA_HL_SDP* p_sdp; } tBTA_HL_SDP_QUERY_CFM; @@ -800,7 +800,7 @@ extern void BTA_HlDchEchoTest(tBTA_HL_MCL_HANDLE mcl_handle, * ******************************************************************************/ extern void BTA_HlSdpQuery(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle, - BD_ADDR bd_addr); + const bt_bdaddr_t& bd_addr); /******************************************************************************* * diff --git a/btif/include/btif_hl.h b/btif/include/btif_hl.h index 9dc4df96f..9f0adc195 100644 --- a/btif/include/btif_hl.h +++ b/btif/include/btif_hl.h @@ -118,7 +118,7 @@ typedef struct { typedef struct { int channel_id; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; uint8_t mdep_cfg_idx; int max_s; int socket_id[2]; @@ -175,7 +175,7 @@ typedef struct { bool in_use; btif_hl_chan_cb_state_t cb_state; btif_hl_pend_dch_op_t op; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; bool abort_pending; } btif_hl_pending_chan_cb_t; @@ -186,7 +186,7 @@ typedef struct { uint16_t req_ctrl_psm; uint16_t ctrl_psm; uint16_t data_psm; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; uint16_t cch_mtu; tBTA_SEC sec_mask; tBTA_HL_MCL_HANDLE mcl_handle; @@ -202,7 +202,7 @@ typedef struct { bool active; uint16_t mdl_id; uint8_t mdep_cfg_idx; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; int channel_id; } btif_hl_delete_mdl_t; @@ -252,7 +252,7 @@ typedef uint8_t btif_hl_evt_t; typedef struct { int app_id; - BD_ADDR bd_addr; + bt_bdaddr_t bd_addr; int mdep_cfg_index; int channel_id; btif_hl_chan_cb_state_t cb_state; @@ -291,7 +291,7 @@ typedef union { extern btif_hl_cb_t btif_hl_cb; extern btif_hl_cb_t* p_btif_hl_cb; -extern bool btif_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, +extern bool btif_hl_find_mcl_idx(uint8_t app_idx, const bt_bdaddr_t& p_bd_addr, uint8_t* p_mcl_idx); extern bool btif_hl_find_app_idx(uint8_t app_id, uint8_t* p_app_idx); extern bool btif_hl_find_avail_mcl_idx(uint8_t app_idx, uint8_t* p_mcl_idx); diff --git a/btif/src/btif_hl.cc b/btif/src/btif_hl.cc index 16c6c45f1..fc5d18527 100644 --- a/btif/src/btif_hl.cc +++ b/btif/src/btif_hl.cc @@ -573,8 +573,7 @@ bool btif_hl_is_reconnect_possible(uint8_t app_idx, uint8_t mcl_idx, if (p_mdl->base.active && p_mdl->extra.data_type == data_type && (p_mdl->extra.peer_mdep_id != BTA_HL_INVALID_MDEP_ID && p_mdl->extra.peer_mdep_id == peer_mdep_id) && - memcpy(p_mdl->base.peer_bd_addr, p_mcb->bd_addr, sizeof(BD_ADDR)) && - p_mdl->base.mdl_id && + p_mdl->base.peer_bd_addr != p_mcb->bd_addr && p_mdl->base.mdl_id && !btif_hl_find_mdl_idx(app_idx, mcl_idx, p_mdl->base.mdl_id, &mdl_idx)) { BTIF_TRACE_DEBUG("i=%d Matched active=%d mdl_id =%d, mdl_dch_mode=%d", i, p_mdl->base.active, p_mdl->base.mdl_id, @@ -594,8 +593,7 @@ bool btif_hl_is_reconnect_possible(uint8_t app_idx, uint8_t mcl_idx, if (p_mdl1->base.active && p_mdl1->extra.data_type == data_type && (p_mdl1->extra.peer_mdep_id != BTA_HL_INVALID_MDEP_ID && p_mdl1->extra.peer_mdep_id == peer_mdep_id) && - memcpy(p_mdl1->base.peer_bd_addr, p_mcb->bd_addr, - sizeof(BD_ADDR)) && + p_mdl1->base.peer_bd_addr != p_mcb->bd_addr && p_mdl1->base.dch_mode == BTA_HL_DCH_MODE_STREAMING) { stream_mode_avail = true; BTIF_TRACE_DEBUG("found streaming mode mdl index=%d", j); @@ -635,7 +633,7 @@ bool btif_hl_is_reconnect_possible(uint8_t app_idx, uint8_t mcl_idx, * Returns bool * ******************************************************************************/ -bool btif_hl_dch_open(uint8_t app_id, BD_ADDR bd_addr, +bool btif_hl_dch_open(uint8_t app_id, const bt_bdaddr_t& bd_addr, tBTA_HL_DCH_OPEN_PARAM* p_dch_open_api, int mdep_cfg_idx, btif_hl_pend_dch_op_t op, int* channel_id) { btif_hl_app_cb_t* p_acb; @@ -647,8 +645,7 @@ bool btif_hl_dch_open(uint8_t app_id, BD_ADDR bd_addr, tBTA_HL_DCH_RECONNECT_PARAM reconnect_param; BTIF_TRACE_DEBUG("%s app_id=%d ", __func__, app_id); - BTIF_TRACE_DEBUG("DB [%02x:%02x:%02x:%02x:%02x:%02x]", bd_addr[0], bd_addr[1], - bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]); + VLOG(0) << "DB " << bd_addr; if (btif_hl_find_app_idx(app_id, &app_idx)) { if (btif_hl_find_mcl_idx(app_idx, bd_addr, &mcl_idx)) { @@ -663,7 +660,7 @@ bool btif_hl_dch_open(uint8_t app_id, BD_ADDR bd_addr, (int)btif_hl_get_next_channel_id(app_id); p_pcb->cb_state = BTIF_HL_CHAN_CB_STATE_CONNECTING_PENDING; p_pcb->mdep_cfg_idx = mdep_cfg_idx; - memcpy(p_pcb->bd_addr, bd_addr, sizeof(BD_ADDR)); + p_pcb->bd_addr = bd_addr; p_pcb->op = op; if (p_mcb->sdp.num_recs) { @@ -698,36 +695,6 @@ bool btif_hl_dch_open(uint8_t app_id, BD_ADDR bd_addr, BTIF_TRACE_DEBUG("status=%d ", status); return status; } -/******************************************************************************* - * - * Function btif_hl_copy_bda - * - * Description copy bt_bdaddr_t to BD_ADDR format - * - * Returns void - * - ******************************************************************************/ -void btif_hl_copy_bda(bt_bdaddr_t* bd_addr, BD_ADDR bda) { - uint8_t i; - for (i = 0; i < 6; i++) { - bd_addr->address[i] = bda[i]; - } -} -/******************************************************************************* - * - * Function btif_hl_copy_bda - * - * Description display bt_bdaddr_t - * - * Returns bool - * - ******************************************************************************/ -void btif_hl_display_bt_bda(bt_bdaddr_t* bd_addr) { - BTIF_TRACE_DEBUG("DB [%02x:%02x:%02x:%02x:%02x:%02x]", bd_addr->address[0], - bd_addr->address[1], bd_addr->address[2], - bd_addr->address[3], bd_addr->address[4], - bd_addr->address[5]); -} /******************************************************************************* * @@ -758,9 +725,9 @@ void btif_hl_dch_abort(uint8_t app_idx, uint8_t mcl_idx) { * Returns Nothing * ******************************************************************************/ -bool btif_hl_cch_open(uint8_t app_id, BD_ADDR bd_addr, uint16_t ctrl_psm, - int mdep_cfg_idx, btif_hl_pend_dch_op_t op, - int* channel_id) { +bool btif_hl_cch_open(uint8_t app_id, const bt_bdaddr_t& bd_addr, + uint16_t ctrl_psm, int mdep_cfg_idx, + btif_hl_pend_dch_op_t op, int* channel_id) { btif_hl_app_cb_t* p_acb; btif_hl_mcl_cb_t* p_mcb; btif_hl_pending_chan_cb_t* p_pcb; @@ -769,8 +736,7 @@ bool btif_hl_cch_open(uint8_t app_id, BD_ADDR bd_addr, uint16_t ctrl_psm, BTIF_TRACE_DEBUG("%s app_id=%d ctrl_psm=%d mdep_cfg_idx=%d op=%d", __func__, app_id, ctrl_psm, mdep_cfg_idx, op); - BTIF_TRACE_DEBUG("DB [%02x:%02x:%02x:%02x:%02x:%02x]", bd_addr[0], bd_addr[1], - bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]); + VLOG(1) << "DB " << bd_addr; if (btif_hl_find_app_idx(app_id, &app_idx)) { p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); @@ -781,7 +747,7 @@ bool btif_hl_cch_open(uint8_t app_id, BD_ADDR bd_addr, uint16_t ctrl_psm, alarm_free(p_mcb->cch_timer); memset(p_mcb, 0, sizeof(btif_hl_mcl_cb_t)); p_mcb->in_use = true; - bdcpy(p_mcb->bd_addr, bd_addr); + p_mcb->bd_addr = bd_addr; if (!ctrl_psm) { p_mcb->cch_oper = BTIF_HL_CCH_OP_MDEP_FILTERING; @@ -793,7 +759,7 @@ bool btif_hl_cch_open(uint8_t app_id, BD_ADDR bd_addr, uint16_t ctrl_psm, p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); p_pcb->in_use = true; p_pcb->mdep_cfg_idx = mdep_cfg_idx; - memcpy(p_pcb->bd_addr, bd_addr, sizeof(BD_ADDR)); + p_pcb->bd_addr = bd_addr; p_pcb->op = op; switch (op) { @@ -996,7 +962,8 @@ bool btif_hl_find_mdl_idx_using_handle(tBTA_HL_MDL_HANDLE mdl_handle, * Returns bool * ******************************************************************************/ -static bool btif_hl_find_peer_mdep_id(uint8_t app_id, BD_ADDR bd_addr, +static bool btif_hl_find_peer_mdep_id(uint8_t app_id, + const bt_bdaddr_t& bd_addr, tBTA_HL_MDEP_ROLE local_mdep_role, uint16_t data_type, tBTA_HL_MDEP_ID* p_peer_mdep_id) { @@ -1009,9 +976,7 @@ static bool btif_hl_find_peer_mdep_id(uint8_t app_id, BD_ADDR bd_addr, BTIF_TRACE_DEBUG("%s app_id=%d local_mdep_role=%d, data_type=%d", __func__, app_id, local_mdep_role, data_type); - - BTIF_TRACE_DEBUG("DB [%02x:%02x:%02x:%02x:%02x:%02x]", bd_addr[0], bd_addr[1], - bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]); + VLOG(1) << "DB " << bd_addr; BTIF_TRACE_DEBUG("local_mdep_role=%d", local_mdep_role); BTIF_TRACE_DEBUG("data_type=%d", data_type); @@ -1095,7 +1060,7 @@ static bool btif_hl_find_mdep_cfg_idx(uint8_t app_idx, * Returns bool * ******************************************************************************/ -bool btif_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, +bool btif_hl_find_mcl_idx(uint8_t app_idx, const bt_bdaddr_t& p_bd_addr, uint8_t* p_mcl_idx) { bool found = false; uint8_t i; @@ -1104,7 +1069,7 @@ bool btif_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, *p_mcl_idx = 0; for (i = 0; i < BTA_HL_NUM_MCLS; i++) { p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, i); - if (p_mcb->in_use && (!memcmp(p_mcb->bd_addr, p_bd_addr, BD_ADDR_LEN))) { + if (p_mcb->in_use && p_mcb->bd_addr == p_bd_addr) { found = true; *p_mcl_idx = i; break; @@ -1672,7 +1637,7 @@ void btif_hl_clean_mdls_using_app_idx(uint8_t app_idx) { btif_hl_app_cb_t* p_acb; btif_hl_mcl_cb_t* p_mcb; btif_hl_mdl_cb_t* p_dcb; - uint8_t j, x, y; + uint8_t j, x; bt_bdaddr_t bd_addr; p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); @@ -1685,9 +1650,7 @@ void btif_hl_clean_mdls_using_app_idx(uint8_t app_idx) { if (p_mcb->mdl[x].in_use) { p_dcb = BTIF_HL_GET_MDL_CB_PTR(app_idx, j, x); btif_hl_release_socket(app_idx, j, x); - for (y = 0; y < 6; y++) { - bd_addr.address[y] = p_mcb->bd_addr[y]; - } + bd_addr = p_mcb->bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, p_acb->app_id, &bd_addr, p_dcb->local_mdep_cfg_idx, p_dcb->channel_id, BTHL_CONN_STATE_DISCONNECTED, @@ -1936,17 +1899,16 @@ void btif_hl_set_chan_cb_state(uint8_t app_idx, uint8_t mcl_idx, * ******************************************************************************/ void btif_hl_send_destroyed_cb(btif_hl_app_cb_t* p_acb) { - bt_bdaddr_t bd_addr; int app_id = (int)btif_hl_get_app_id(p_acb->delete_mdl.channel_id); - btif_hl_copy_bda(&bd_addr, p_acb->delete_mdl.bd_addr); + bt_bdaddr_t bd_addr = p_acb->delete_mdl.bd_addr; BTIF_TRACE_DEBUG("%s", __func__); BTIF_TRACE_DEBUG( "call channel state callback channel_id=0x%08x mdep_cfg_idx=%d, state=%d " "fd=%d", p_acb->delete_mdl.channel_id, p_acb->delete_mdl.mdep_cfg_idx, BTHL_CONN_STATE_DESTROYED, 0); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_acb->delete_mdl.mdep_cfg_idx, @@ -1966,10 +1928,9 @@ void btif_hl_send_disconnecting_cb(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx) { btif_hl_mdl_cb_t* p_dcb = BTIF_HL_GET_MDL_CB_PTR(app_idx, mcl_idx, mdl_idx); btif_hl_soc_cb_t* p_scb = p_dcb->p_scb; - bt_bdaddr_t bd_addr; int app_id = (int)btif_hl_get_app_id(p_scb->channel_id); - btif_hl_copy_bda(&bd_addr, p_scb->bd_addr); + bt_bdaddr_t bd_addr = p_scb->bd_addr; BTIF_TRACE_DEBUG("%s", __func__); BTIF_TRACE_DEBUG( @@ -1977,7 +1938,7 @@ void btif_hl_send_disconnecting_cb(uint8_t app_idx, uint8_t mcl_idx, "state=%d fd=%d", p_scb->channel_id, p_scb->mdep_cfg_idx, BTHL_CONN_STATE_DISCONNECTING, p_scb->socket_id[0]); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_scb->mdep_cfg_idx, p_scb->channel_id, BTHL_CONN_STATE_DISCONNECTING, p_scb->socket_id[0]); @@ -1993,10 +1954,9 @@ void btif_hl_send_disconnecting_cb(uint8_t app_idx, uint8_t mcl_idx, ******************************************************************************/ void btif_hl_send_setup_connecting_cb(uint8_t app_idx, uint8_t mcl_idx) { btif_hl_pending_chan_cb_t* p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); - bt_bdaddr_t bd_addr; int app_id = (int)btif_hl_get_app_id(p_pcb->channel_id); - btif_hl_copy_bda(&bd_addr, p_pcb->bd_addr); + bt_bdaddr_t bd_addr = p_pcb->bd_addr; if (p_pcb->in_use && p_pcb->cb_state == BTIF_HL_CHAN_CB_STATE_CONNECTING_PENDING) { @@ -2005,7 +1965,7 @@ void btif_hl_send_setup_connecting_cb(uint8_t app_idx, uint8_t mcl_idx) { "call channel state callback channel_id=0x%08x mdep_cfg_idx=%d " "state=%d fd=%d", p_pcb->channel_id, p_pcb->mdep_cfg_idx, BTHL_CONN_STATE_CONNECTING, 0); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_pcb->mdep_cfg_idx, p_pcb->channel_id, @@ -2025,10 +1985,9 @@ void btif_hl_send_setup_connecting_cb(uint8_t app_idx, uint8_t mcl_idx) { ******************************************************************************/ void btif_hl_send_setup_disconnected_cb(uint8_t app_idx, uint8_t mcl_idx) { btif_hl_pending_chan_cb_t* p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); - bt_bdaddr_t bd_addr; int app_id = (int)btif_hl_get_app_id(p_pcb->channel_id); - btif_hl_copy_bda(&bd_addr, p_pcb->bd_addr); + bt_bdaddr_t bd_addr = p_pcb->bd_addr; BTIF_TRACE_DEBUG("%s p_pcb->in_use=%d", __func__, p_pcb->in_use); if (p_pcb->in_use) { @@ -2039,7 +1998,7 @@ void btif_hl_send_setup_disconnected_cb(uint8_t app_idx, uint8_t mcl_idx) { "state=%d fd=%d", p_pcb->channel_id, p_pcb->mdep_cfg_idx, BTHL_CONN_STATE_CONNECTING, 0); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_pcb->mdep_cfg_idx, p_pcb->channel_id, BTHL_CONN_STATE_CONNECTING, 0); @@ -2049,7 +2008,7 @@ void btif_hl_send_setup_disconnected_cb(uint8_t app_idx, uint8_t mcl_idx) { "state=%d fd=%d", p_pcb->channel_id, p_pcb->mdep_cfg_idx, BTHL_CONN_STATE_DISCONNECTED, 0); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_pcb->mdep_cfg_idx, p_pcb->channel_id, BTHL_CONN_STATE_DISCONNECTED, 0); @@ -2059,7 +2018,7 @@ void btif_hl_send_setup_disconnected_cb(uint8_t app_idx, uint8_t mcl_idx) { "state=%d fd=%d", p_pcb->channel_id, p_pcb->mdep_cfg_idx, BTHL_CONN_STATE_DISCONNECTED, 0); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK(bt_hl_callbacks, channel_state_cb, app_id, &bd_addr, p_pcb->mdep_cfg_idx, p_pcb->channel_id, BTHL_CONN_STATE_DISCONNECTED, 0); @@ -2148,7 +2107,7 @@ static bool btif_hl_proc_sdp_query_cfm(tBTA_HL* p_data) { break; } open_param.ctrl_psm = p_mcb->ctrl_psm; - bdcpy(open_param.bd_addr, p_mcb->bd_addr); + open_param.bd_addr = p_mcb->bd_addr; open_param.sec_mask = (BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT); BTA_HlCchOpen(p_acb->app_id, p_acb->app_handle, &open_param); @@ -2202,7 +2161,7 @@ static void btif_hl_proc_cch_open_ind(tBTA_HL* p_data) p_mcb->in_use = true; p_mcb->is_connected = true; p_mcb->mcl_handle = p_data->cch_open_ind.mcl_handle; - bdcpy(p_mcb->bd_addr, p_data->cch_open_ind.bd_addr); + p_mcb->bd_addr = p_data->cch_open_ind.bd_addr; btif_hl_start_cch_timer(i, mcl_idx); } } else { @@ -2948,7 +2907,6 @@ static void btif_hl_proc_reg_request(uint8_t app_idx, uint8_t app_id, ******************************************************************************/ static void btif_hl_proc_cb_evt(uint16_t event, char* p_param) { btif_hl_evt_cb_t* p_data = (btif_hl_evt_cb_t*)p_param; - bt_bdaddr_t bd_addr; bthl_channel_state_t state = BTHL_CONN_STATE_DISCONNECTED; bool send_chan_cb = true; tBTA_HL_REG_PARAM reg_param; @@ -2969,12 +2927,12 @@ static void btif_hl_proc_cb_evt(uint16_t event, char* p_param) { send_chan_cb = false; if (send_chan_cb) { - btif_hl_copy_bda(&bd_addr, p_data->chan_cb.bd_addr); + bt_bdaddr_t bd_addr = p_data->chan_cb.bd_addr; BTIF_TRACE_DEBUG( "state callbk: ch_id=0x%08x cb_state=%d state=%d fd=%d", p_data->chan_cb.channel_id, p_data->chan_cb.cb_state, state, p_data->chan_cb.fd); - btif_hl_display_bt_bda(&bd_addr); + VLOG(1) << "BD " << bd_addr; BTIF_HL_CALL_CBACK( bt_hl_callbacks, channel_state_cb, p_data->chan_cb.app_id, &bd_addr, p_data->chan_cb.mdep_cfg_index, p_data->chan_cb.channel_id, state, @@ -3081,12 +3039,7 @@ static void btif_hl_upstreams_evt(uint16_t event, char* p_param) { p_data->sdp_query_cfm.app_handle, p_data->sdp_query_cfm.app_id, p_data->sdp_query_cfm.status); - - BTIF_TRACE_DEBUG( - "DB [%02x] [%02x] [%02x] [%02x] [%02x] [%02x]", - p_data->sdp_query_cfm.bd_addr[0], p_data->sdp_query_cfm.bd_addr[1], - p_data->sdp_query_cfm.bd_addr[2], p_data->sdp_query_cfm.bd_addr[3], - p_data->sdp_query_cfm.bd_addr[4], p_data->sdp_query_cfm.bd_addr[5]); + VLOG(0) << "DB " << p_data->sdp_query_cfm.bd_addr; if (p_data->sdp_query_cfm.status == BTA_HL_STATUS_OK) status = btif_hl_proc_sdp_query_cfm(p_data); @@ -3128,11 +3081,7 @@ static void btif_hl_upstreams_evt(uint16_t event, char* p_param) { "app_id=%d,app_handle=%d mcl_handle=%d status =%d", p_data->cch_open_cfm.app_id, p_data->cch_open_cfm.app_handle, p_data->cch_open_cfm.mcl_handle, p_data->cch_open_cfm.status); - BTIF_TRACE_DEBUG( - "DB [%02x] [%02x] [%02x] [%02x] [%02x] [%02x]", - p_data->cch_open_cfm.bd_addr[0], p_data->cch_open_cfm.bd_addr[1], - p_data->cch_open_cfm.bd_addr[2], p_data->cch_open_cfm.bd_addr[3], - p_data->cch_open_cfm.bd_addr[4], p_data->cch_open_cfm.bd_addr[5]); + VLOG(1) << "BD " << p_data->cch_open_cfm.bd_addr; if (p_data->cch_open_cfm.status == BTA_HL_STATUS_OK || p_data->cch_open_cfm.status == BTA_HL_STATUS_DUPLICATE_CCH_OPEN) { @@ -3204,11 +3153,7 @@ static void btif_hl_upstreams_evt(uint16_t event, char* p_param) { BTIF_TRACE_DEBUG("app_handle=%d mcl_handle=%d", p_data->cch_open_ind.app_handle, p_data->cch_open_ind.mcl_handle); - BTIF_TRACE_DEBUG( - "DB [%02x] [%02x] [%02x] [%02x] [%02x] [%02x]", - p_data->cch_open_ind.bd_addr[0], p_data->cch_open_ind.bd_addr[1], - p_data->cch_open_ind.bd_addr[2], p_data->cch_open_ind.bd_addr[3], - p_data->cch_open_ind.bd_addr[4], p_data->cch_open_ind.bd_addr[5]); + VLOG(0) << "DB " << p_data->cch_open_ind.bd_addr; btif_hl_proc_cch_open_ind(p_data); break; @@ -3608,19 +3553,14 @@ static bt_status_t connect_channel(int app_id, bt_bdaddr_t* bd_addr, btif_hl_mcl_cb_t* p_mcb = NULL; bt_status_t status = BT_STATUS_SUCCESS; tBTA_HL_DCH_OPEN_PARAM dch_open; - BD_ADDR bda; - uint8_t i; CHECK_BTHL_INIT(); BTIF_TRACE_EVENT("%s", __func__); btif_hl_display_calling_process_name(); - for (i = 0; i < 6; i++) { - bda[i] = (uint8_t)bd_addr->address[i]; - } if (btif_hl_find_app_idx(((uint8_t)app_id), &app_idx)) { p_acb = BTIF_HL_GET_APP_CB_PTR(app_idx); - if (btif_hl_find_mcl_idx(app_idx, bda, &mcl_idx)) { + if (btif_hl_find_mcl_idx(app_idx, *bd_addr, &mcl_idx)) { p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); if (p_mcb->is_connected) { dch_open.ctrl_psm = p_mcb->ctrl_psm; @@ -3645,8 +3585,9 @@ static bt_status_t connect_channel(int app_id, bt_bdaddr_t* bd_addr, } dch_open.sec_mask = (BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT); - if (!btif_hl_dch_open(p_acb->app_id, bda, &dch_open, mdep_cfg_index, - BTIF_HL_PEND_DCH_OP_OPEN, channel_id)) { + if (!btif_hl_dch_open(p_acb->app_id, *bd_addr, &dch_open, + mdep_cfg_index, BTIF_HL_PEND_DCH_OP_OPEN, + channel_id)) { status = BT_STATUS_FAIL; BTIF_TRACE_EVENT("%s loc0 status = BT_STATUS_FAIL", __func__); } @@ -3656,9 +3597,9 @@ static bt_status_t connect_channel(int app_id, bt_bdaddr_t* bd_addr, p_pcb = BTIF_HL_GET_PCB_PTR(app_idx, mcl_idx); p_pcb->in_use = true; p_pcb->mdep_cfg_idx = mdep_cfg_index; - memcpy(p_pcb->bd_addr, bda, sizeof(BD_ADDR)); + p_pcb->bd_addr = *bd_addr; p_pcb->op = BTIF_HL_PEND_DCH_OP_OPEN; - BTA_HlSdpQuery(app_id, p_acb->app_handle, bda); + BTA_HlSdpQuery(app_id, p_acb->app_handle, *bd_addr); } } else { status = BT_STATUS_FAIL; @@ -3674,7 +3615,7 @@ static bt_status_t connect_channel(int app_id, bt_bdaddr_t* bd_addr, else p_acb->filter.elem[0].peer_mdep_role = BTA_HL_MDEP_ROLE_SINK; - if (!btif_hl_cch_open(p_acb->app_id, bda, 0, mdep_cfg_index, + if (!btif_hl_cch_open(p_acb->app_id, *bd_addr, 0, mdep_cfg_index, BTIF_HL_PEND_DCH_OP_OPEN, channel_id)) { status = BT_STATUS_FAIL; } @@ -3723,8 +3664,7 @@ static bt_status_t destroy_channel(int channel_id) { p_acb->delete_mdl.mdl_id = p_mdl->base.mdl_id; p_acb->delete_mdl.channel_id = channel_id; p_acb->delete_mdl.mdep_cfg_idx = p_mdl->extra.mdep_cfg_idx; - memcpy(p_acb->delete_mdl.bd_addr, p_mdl->base.peer_bd_addr, - sizeof(BD_ADDR)); + p_acb->delete_mdl.bd_addr = p_mdl->base.peer_bd_addr; if (btif_hl_find_mcl_idx(app_idx, p_mdl->base.peer_bd_addr, &mcl_idx)) { p_mcb = BTIF_HL_GET_MCL_CB_PTR(app_idx, mcl_idx); @@ -4235,7 +4175,7 @@ bool btif_hl_create_socket(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx) { p_scb->mdl_idx = mdl_idx; p_scb->channel_id = p_dcb->channel_id; p_scb->mdep_cfg_idx = p_dcb->local_mdep_cfg_idx; - memcpy(p_scb->bd_addr, p_mcb->bd_addr, sizeof(BD_ADDR)); + p_scb->bd_addr = p_mcb->bd_addr; btif_hl_set_socket_state(p_scb, BTIF_HL_SOC_STATE_W4_ADD); p_scb->max_s = p_scb->socket_id[1]; list_append(soc_queue, (void*)p_scb); @@ -4286,7 +4226,7 @@ void btif_hl_add_socket_to_set(fd_set* p_org_set) { if (p_mcb && p_dcb) { btif_hl_stop_timer_using_handle(p_mcb->mcl_handle); evt_param.chan_cb.app_id = p_acb->app_id; - memcpy(evt_param.chan_cb.bd_addr, p_mcb->bd_addr, sizeof(BD_ADDR)); + evt_param.chan_cb.bd_addr = p_mcb->bd_addr; evt_param.chan_cb.channel_id = p_dcb->channel_id; evt_param.chan_cb.fd = p_scb->socket_id[0]; evt_param.chan_cb.mdep_cfg_index = (int)p_dcb->local_mdep_cfg_idx; @@ -4327,7 +4267,7 @@ void btif_hl_close_socket(fd_set* p_org_set) { btif_hl_evt_cb_t evt_param; evt_param.chan_cb.app_id = (int)btif_hl_get_app_id(p_scb->channel_id); - memcpy(evt_param.chan_cb.bd_addr, p_scb->bd_addr, sizeof(BD_ADDR)); + evt_param.chan_cb.bd_addr = p_scb->bd_addr; evt_param.chan_cb.channel_id = p_scb->channel_id; evt_param.chan_cb.fd = p_scb->socket_id[0]; evt_param.chan_cb.mdep_cfg_index = (int)p_scb->mdep_cfg_idx; -- 2.11.0