Get rid of bdcpy, bdcmp and other BD_ADDR helpers (0325299f) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_rfc.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) {

		bta_ag_port_status = RFCOMM_CreateConnection(
		bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,
		from_BD_ADDR(bd_addr_any), &(p_scb->serv_handle[i]),
		bd_addr_any, &(p_scb->serv_handle[i]),
		bta_ag_mgmt_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1]);

		if (bta_ag_port_status == PORT_SUCCESS) {

system/bta/ar/bta_ar.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -153,17 +153,17 @@ void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) {
		* Returns void
		*
		******************************************************************************/
		void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr) {
		void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const bt_bdaddr_t& bd_addr) {
		uint8_t event = BTA_AR_AVDT_CONN_EVT;
		tAVDT_CTRL data;

		if (sys_id == BTA_ID_AV) {
		if (bta_ar_cb.p_avk_conn_cback) {
		(*bta_ar_cb.p_avk_conn_cback)(0, &from_BD_ADDR(bd_addr), event, &data);
		(*bta_ar_cb.p_avk_conn_cback)(0, &bd_addr, event, &data);
		}
		} else if (sys_id == BTA_ID_AVK) {
		if (bta_ar_cb.p_av_conn_cback) {
		(*bta_ar_cb.p_av_conn_cback)(0, &from_BD_ADDR(bd_addr), event, &data);
		(*bta_ar_cb.p_av_conn_cback)(0, &bd_addr, event, &data);
		}
		}
		}

system/bta/av/bta_av_aact.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1363,7 +1363,7 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) open.edr \|= BTA_AV_EDR_3MBPS;
		}
		#if (BTA_AR_INCLUDED == TRUE)
		bta_ar_avdt_conn(BTA_ID_AV, to_BD_ADDR(open.bd_addr));
		bta_ar_avdt_conn(BTA_ID_AV, open.bd_addr);
		#endif
		if (p_scb->seps[p_scb->sep_idx].tsep == AVDT_TSEP_SRC)
		open.sep = AVDT_TSEP_SNK;

system/bta/av/bta_av_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode,
		uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,
		uint8_t lidx) {
		tAVRC_CONN_CB ccb;
		bt_bdaddr_t bda = from_BD_ADDR(const_cast<uint8_t*>(bd_addr_any));
		bt_bdaddr_t bda = bd_addr_any;
		uint8_t status = BTA_AV_RC_ROLE_ACP;
		tBTA_AV_SCB* p_scb = p_cb->p_scb[shdl - 1];
		int i;

system/bta/dm/bta_dm_act.cc

+8 −8

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static bool bta_dm_check_av(uint16_t event);
		static void bta_dm_bl_change_cback(tBTM_BL_EVENT_DATA* p_data);

		static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		uint8_t app_id, BD_ADDR peer_addr);
		uint8_t app_id, const bt_bdaddr_t* peer_addr);

		/* Extended Inquiry Response */
		#if (BTM_LOCAL_IO_CAPS != BTM_IO_CAP_NONE)
		@@ -95,7 +95,7 @@ static void bta_dm_eir_search_services(tBTM_INQ_RESULTS* p_result,
		static void bta_dm_search_timer_cback(void* data);
		static void bta_dm_disable_conn_down_timer_cback(void* data);
		static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		uint8_t app_id, BD_ADDR peer_addr);
		uint8_t app_id, const bt_bdaddr_t* peer_addr);
		static void bta_dm_adjust_roles(bool delay_role_switch);
		static char* bta_dm_get_remname(void);
		static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result);
		@@ -990,12 +990,12 @@ void bta_dm_pin_reply(tBTA_DM_MSG* p_data) {
		*
		******************************************************************************/
		static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		uint8_t app_id, BD_ADDR peer_addr) {
		uint8_t app_id, const bt_bdaddr_t* peer_addr) {
		tBTA_DM_PEER_DEVICE* p_dev = NULL;
		uint16_t policy = app_id;
		uint32_t mask = (uint32_t)(1 << id);

		if (peer_addr) p_dev = bta_dm_find_peer_device(from_BD_ADDR(peer_addr));
		if (peer_addr) p_dev = bta_dm_find_peer_device(*peer_addr);

		APPL_TRACE_DEBUG(" bta_dm_policy_cback cmd:%d, policy:0x%x", status, policy);
		switch (status) {
		@@ -2887,7 +2887,7 @@ static bool bta_dm_check_av(uint16_t event) {
		}
		/* else either already master or can not switch for some reasons */
		bta_dm_policy_cback(BTA_SYS_PLCY_CLR, 0, HCI_ENABLE_MASTER_SLAVE_SWITCH,
		to_BD_ADDR(p_dev->peer_bdaddr));
		&p_dev->peer_bdaddr);
		break;
		}
		}
		@@ -2953,7 +2953,7 @@ void bta_dm_acl_change(tBTA_DM_MSG* p_data) {
		if (need_policy_change) {
		bta_dm_policy_cback(BTA_SYS_PLCY_CLR, 0,
		HCI_ENABLE_MASTER_SLAVE_SWITCH,
		to_BD_ADDR(p_dev->peer_bdaddr));
		&p_dev->peer_bdaddr);
		}
		} else {
		/* there's AV no activity on this link and role switch happened
		@@ -3144,12 +3144,12 @@ static void bta_dm_disable_conn_down_timer_cback(UNUSED_ATTR void* data) {
		*
		******************************************************************************/
		static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		uint8_t app_id, BD_ADDR peer_addr) {
		uint8_t app_id, const bt_bdaddr_t* peer_addr) {
		uint8_t j;
		tBTA_PREF_ROLES role;
		tBTA_DM_PEER_DEVICE* p_dev;

		p_dev = bta_dm_find_peer_device(from_BD_ADDR(peer_addr));
		p_dev = bta_dm_find_peer_device(*peer_addr);
		if (status == BTA_SYS_CONN_OPEN) {
		if (p_dev) {
		/* Do not set to connected if we are in the middle of unpairing. When AV