Replace BT_ADDR with bd_addr_t in bta_sys related code (4efb075c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+11 −11

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ void bta_ag_start_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* Let the incoming connection goes through. */
		/* Issue collision for this scb for now. */
		/* We will decide what to do when we find incoming connetion later. */
		bta_ag_collision_cback(0, BTA_ID_AG, 0, to_BD_ADDR(p_scb->peer_addr));
		bta_ag_collision_cback(0, BTA_ID_AG, 0, &p_scb->peer_addr);
		return;
		}

		@@ -397,7 +397,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		close.hdr.app_id = p_scb->app_id;
		close.bd_addr = p_scb->peer_addr;

		bta_sys_conn_close(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_conn_close(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* call close call-out */
		bta_ag_co_data_close(close.hdr.handle);
		@@ -430,7 +430,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		}

		if (!num_active_conn) {
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}

		}
		@@ -473,7 +473,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		bta_ag_co_data_open(bta_ag_scb_to_idx(p_scb),
		bta_ag_svc_id[p_scb->conn_service]);

		bta_sys_conn_open(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_conn_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		bta_ag_cback_open(p_scb, NULL, BTA_AG_SUCCESS);

		@@ -604,14 +604,14 @@ void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		}

		/* run AT command interpreter on data */
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		bta_ag_at_parse(&p_scb->at_cb, buf, len);
		if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) &&
		bta_ag_sco_is_open(p_scb)) {
		APPL_TRACE_DEBUG("%s change link policy for SCO", __func__);
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		} else {
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}

		/* no more data to read, we're done */
		@@ -760,7 +760,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb,

		if ((p_scb->call_ind != BTA_AG_CALL_INACTIVE) \|\|
		(p_scb->callsetup_ind != BTA_AG_CALLSETUP_NONE)) {
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}

		(bta_ag_cb.p_cback)(BTA_AG_CONN_EVT, (tBTA_AG)&evt);
		@@ -784,13 +784,13 @@ void bta_ag_ci_rx_data(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

		APPL_TRACE_DEBUG("bta_ag_ci_rx_data:");
		/* send to RFCOMM */
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		PORT_WriteData(p_scb->conn_handle, p_data_area, strlen(p_data_area), &len);
		if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) && bta_ag_sco_is_open(p_scb)) {
		APPL_TRACE_DEBUG("bta_ag_rfc_data, change link policy for SCO");
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		} else {
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}
		}

system/bta/ag/bta_ag_cmd.cc

+4 −6

Original line number	Diff line number	Diff line
		@@ -1304,7 +1304,7 @@ void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, tBTA_AG_API_RESULT* p_result) {

		case BTA_AG_IN_CALL_RES:
		/* tell sys to stop av if any */
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* if sco already opened or no inband ring send ring now */
		if (bta_ag_sco_is_open(p_scb) \|\| !bta_ag_inband_enabled(p_scb) \|\|
		@@ -1352,8 +1352,7 @@ void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, tBTA_AG_API_RESULT* p_result) {
		bta_ag_sco_close(p_scb, (tBTA_AG_DATA*)p_result);
		} else {
		/* if av got suspended by this call, let it resume. */
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id,
		to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}
		break;

		@@ -1401,7 +1400,7 @@ void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, tBTA_AG_API_RESULT* p_result) {

		case BTA_AG_IN_CALL_RES:
		/* tell sys to stop av if any */
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* store caller id string.
		* append type info at the end.
		@@ -1528,8 +1527,7 @@ void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, tBTA_AG_API_RESULT* p_result) {
		bta_ag_send_call_inds(p_scb, p_result->result);

		/* if av got suspended by this call, let it resume. */
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id,
		to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}
		break;

system/bta/ag/bta_ag_int.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -331,7 +331,8 @@ extern void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event,
		tBTA_AG_DATA* p_data);
		extern bool bta_ag_hdl_event(BT_HDR* p_msg);
		extern void bta_ag_collision_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);
		extern void bta_ag_resume_open(tBTA_AG_SCB* p_scb);

		/* SDP functions */

system/bta/ag/bta_ag_main.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -511,12 +511,13 @@ static void bta_ag_collision_timer_cback(void* data) {
		*
		******************************************************************************/
		void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,
		UNUSED_ATTR uint8_t app_id, BD_ADDR peer_addr) {
		UNUSED_ATTR uint8_t app_id,
		const bt_bdaddr_t* peer_addr) {
		uint16_t handle;
		tBTA_AG_SCB* p_scb;

		/* Check if we have opening scb for the peer device. */
		handle = bta_ag_idx_by_bdaddr(&from_BD_ADDR(peer_addr));
		handle = bta_ag_idx_by_bdaddr(peer_addr);
		p_scb = bta_ag_scb_by_idx(handle);

		if (p_scb && (p_scb->state == BTA_AG_OPENING_ST)) {

system/bta/ag/bta_ag_sco.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
		p_scb->inuse_codec = esco_codec;

		/* tell sys to stop av if any */
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* Send pending commands to create SCO connection to peer */
		bta_ag_create_pending_sco(p_scb, bta_ag_cb.sco.is_local);
		@@ -552,7 +552,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) {
		if ((p_scb->codec_updated \|\| p_scb->codec_fallback) &&
		(p_scb->peer_features & BTA_AG_PEER_FEAT_CODEC)) {
		/* Change the power mode to Active until SCO open is completed. */
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_busy(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* Send +BCS to the peer */
		bta_ag_send_bcs(p_scb, NULL);
		@@ -1252,7 +1252,7 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb,
		UNUSED_ATTR tBTA_AG_DATA* p_data) {
		bta_ag_sco_event(p_scb, BTA_AG_SCO_CONN_OPEN_E);

		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		#if (BTM_SCO_HCI_INCLUDED == TRUE)
		/* open SCO codec if SCO is routed through transport */
		@@ -1294,14 +1294,14 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb,
		/* Indicate if the closing of audio is because of transfer */
		bta_ag_sco_event(p_scb, BTA_AG_SCO_CONN_CLOSE_E);

		bta_sys_sco_close(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_close(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);

		/* if av got suspended by this call, let it resume. */
		/* In case call stays alive regardless of sco, av should not be affected. */
		if (((p_scb->call_ind == BTA_AG_CALL_INACTIVE) &&
		(p_scb->callsetup_ind == BTA_AG_CALLSETUP_NONE)) \|\|
		(p_scb->post_sco == BTA_AG_POST_SCO_CALL_END)) {
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_unuse(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}

		/* call app callback */
		@@ -1333,7 +1333,7 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB* p_scb,
		bta_ag_cb.sco.state == BTA_AG_SCO_CLOSE_XFER_ST \|\|
		bta_ag_cb.sco.state == BTA_AG_SCO_OPEN_XFER_ST) {
		/* tell sys to stop av if any */
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, to_BD_ADDR(p_scb->peer_addr));
		bta_sys_sco_use(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		/* When HS initiated SCO, it cannot be WBS. */
		#if (BTM_SCO_HCI_INCLUDED == TRUE)
		/* Configure the transport being used */