Replace BD_ADDR with bt_bdaddr_t in RFCOMM related code (b49882c7) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		*
		******************************************************************************/
		void bta_ag_start_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		BD_ADDR pending_bd_addr;
		bt_bdaddr_t pending_bd_addr;

		/* store parameters */
		if (p_data) {
		@@ -511,9 +511,8 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		p_scb->serv_handle[0], p_scb->serv_handle[1]);

		/* get bd addr of peer */
		if (PORT_SUCCESS !=
		(status = PORT_CheckConnection(p_data->rfc.port_handle,
		to_BD_ADDR(dev_addr), &lcid))) {
		if (PORT_SUCCESS != (status = PORT_CheckConnection(p_data->rfc.port_handle,
		dev_addr, &lcid))) {
		APPL_TRACE_DEBUG(
		"bta_ag_rfc_acp_open error PORT_CheckConnection returned status %d",
		status);

system/bta/ag/bta_ag_rfc.cc

+2 −2

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,
		(uint8_t*)bd_addr_any, &(p_scb->serv_handle[i]),
		from_BD_ADDR(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) {
		@@ -350,7 +350,7 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

		if (RFCOMM_CreateConnection(
		bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,
		to_BD_ADDR(p_scb->peer_addr), &(p_scb->conn_handle),
		p_scb->peer_addr, &(p_scb->conn_handle),
		bta_ag_mgmt_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1]) ==
		PORT_SUCCESS) {
		bta_ag_setup_port(p_scb, p_scb->conn_handle);

system/bta/hf_client/bta_hf_client_act.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ void bta_hf_client_start_open(tBTA_HF_CLIENT_DATA* p_data) {

		/* Check if RFCOMM has any incoming connection to avoid collision. */
		bt_bdaddr_t pending_bd_addr;
		if (PORT_IsOpening(to_BD_ADDR(pending_bd_addr))) {
		if (PORT_IsOpening(pending_bd_addr)) {
		/* Let the incoming connection goes through. */
		/* Issue collision for now. */
		/* We will decide what to do when we find incoming connection later.*/
		@@ -176,9 +176,8 @@ void bta_hf_client_rfc_acp_open(tBTA_HF_CLIENT_DATA* p_data) {
		APPL_TRACE_DEBUG("%s: conn_handle %d", __func__, client_cb->conn_handle);

		/* get bd addr of peer */
		if (PORT_SUCCESS !=
		(status = PORT_CheckConnection(client_cb->conn_handle,
		to_BD_ADDR(dev_addr), &lcid))) {
		if (PORT_SUCCESS != (status = PORT_CheckConnection(client_cb->conn_handle,
		dev_addr, &lcid))) {
		APPL_TRACE_DEBUG("%s: error PORT_CheckConnection returned status %d",
		__func__, status);
		}

system/bta/hf_client/bta_hf_client_rfc.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle) {
		// Find the BDADDR of the peer device
		bt_bdaddr_t peer_addr;
		uint16_t lcid;
		PORT_CheckConnection(port_handle, to_BD_ADDR(peer_addr), &lcid);
		PORT_CheckConnection(port_handle, peer_addr, &lcid);

		// Since we accepted a remote request we should allocate a handle first.
		uint16_t tmp_handle = -1;
		@@ -179,7 +179,7 @@ void bta_hf_client_start_server() {

		port_status = RFCOMM_CreateConnection(
		UUID_SERVCLASS_HF_HANDSFREE, bta_hf_client_cb_arr.scn, true,
		BTA_HF_CLIENT_MTU, (uint8_t*)bd_addr_any,
		BTA_HF_CLIENT_MTU, from_BD_ADDR(bd_addr_any),
		&(bta_hf_client_cb_arr.serv_handle), bta_hf_client_mgmt_cback);

		APPL_TRACE_DEBUG("%s: started rfcomm server with handle %d", __func__,
		@@ -238,8 +238,7 @@ void bta_hf_client_rfc_do_open(tBTA_HF_CLIENT_DATA* p_data) {
		client_cb->cli_sec_mask, BT_PSM_RFCOMM,
		BTM_SEC_PROTO_RFCOMM, client_cb->peer_scn);
		if (RFCOMM_CreateConnection(UUID_SERVCLASS_HF_HANDSFREE, client_cb->peer_scn,
		false, BTA_HF_CLIENT_MTU,
		to_BD_ADDR(client_cb->peer_addr),
		false, BTA_HF_CLIENT_MTU, client_cb->peer_addr,
		&(client_cb->conn_handle),
		bta_hf_client_mgmt_cback) == PORT_SUCCESS) {
		bta_hf_client_setup_port(client_cb->conn_handle);

system/bta/jv/bta_jv_act.cc

+6 −7

Original line number	Diff line number	Diff line
		@@ -515,7 +515,7 @@ static tBTA_JV_PM_CB* bta_jv_alloc_set_pm_profile_cb(uint32_t jv_handle,
		pp_cb = &bta_jv_cb.port_cb[j].p_pm_cb;
		if (PORT_SUCCESS !=
		PORT_CheckConnection(bta_jv_cb.port_cb[j].port_handle,
		to_BD_ADDR(peer_bd_addr), NULL))
		peer_bd_addr, NULL))
		i = BTA_JV_PM_MAX_NUM;
		break;
		}
		@@ -1440,7 +1440,7 @@ static void bta_jv_port_mgmt_cl_cback(uint32_t code, uint16_t port_handle) {
		APPL_TRACE_DEBUG("bta_jv_port_mgmt_cl_cback code=%d port_handle:%d handle:%d",
		code, port_handle, p_cb->handle);

		PORT_CheckConnection(port_handle, to_BD_ADDR(rem_bda), &lcid);
		PORT_CheckConnection(port_handle, rem_bda, &lcid);

		if (code == PORT_SUCCESS) {
		evt_data.rfc_open.handle = p_cb->handle;
		@@ -1540,8 +1540,7 @@ void bta_jv_rfcomm_connect(tBTA_JV_MSG* p_data) {

		if (evt_data.status == BTA_JV_SUCCESS &&
		RFCOMM_CreateConnection(UUID_SERVCLASS_SERIAL_PORT, cc->remote_scn, false,
		BTA_JV_DEF_RFC_MTU, to_BD_ADDR(cc->peer_bd_addr),
		&handle,
		BTA_JV_DEF_RFC_MTU, cc->peer_bd_addr, &handle,
		bta_jv_port_mgmt_cl_cback) != PORT_SUCCESS) {
		APPL_TRACE_ERROR("bta_jv_rfcomm_connect, RFCOMM_CreateConnection failed");
		evt_data.status = BTA_JV_FAILURE;
		@@ -1657,7 +1656,7 @@ static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle) {
		"p_pcb:%p, user:%d",
		code, port_handle, p_cb->handle, p_pcb, p_pcb->rfcomm_slot_id);

		PORT_CheckConnection(port_handle, to_BD_ADDR(rem_bda), &lcid);
		PORT_CheckConnection(port_handle, rem_bda, &lcid);
		int failed = true;
		if (code == PORT_SUCCESS) {
		evt_data.rfc_srv_open.handle = p_pcb->handle;
		@@ -1787,7 +1786,7 @@ static tBTA_JV_PCB* bta_jv_add_rfc_port(tBTA_JV_RFC_CB* p_cb,
		if (used < p_cb->max_sess && listen == 1 && si) {
		si--;
		if (RFCOMM_CreateConnection(p_cb->sec_id, p_cb->scn, true,
		BTA_JV_DEF_RFC_MTU, (uint8_t*)bd_addr_any,
		BTA_JV_DEF_RFC_MTU, from_BD_ADDR(bd_addr_any),
		&(p_cb->rfc_hdl[si]),
		bta_jv_port_mgmt_sr_cback) == PORT_SUCCESS) {
		p_cb->curr_sess++;
		@@ -1860,7 +1859,7 @@ void bta_jv_rfcomm_start_server(tBTA_JV_MSG* p_data) {
		}

		if (RFCOMM_CreateConnection(sec_id, rs->local_scn, true, BTA_JV_DEF_RFC_MTU,
		(uint8_t*)bd_addr_any, &handle,
		from_BD_ADDR(bd_addr_any), &handle,
		bta_jv_port_mgmt_sr_cback) != PORT_SUCCESS) {
		APPL_TRACE_ERROR(
		"bta_jv_rfcomm_start_server, RFCOMM_CreateConnection failed");