bta: Apply clang-format (8dfd1ea0) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+524 −601

Original line number	Diff line number	Diff line
		@@ -24,16 +24,16 @@

		#include <string.h>

		#include "bta_api.h"
		#include "bta_sys.h"
		#include "bta_ag_api.h"
		#include "bta_ag_co.h"
		#include "bta_ag_int.h"
		#include "bta_api.h"
		#include "bta_dm_api.h"
		#include "bta_sys.h"
		#include "l2c_api.h"
		#include "osi/include/osi.h"
		#include "port_api.h"
		#include "utl.h"
		#include "l2c_api.h"

		/*****************************************************************************
		* Constants
		@@ -45,38 +45,24 @@
		/* maximum AT command length */
		#define BTA_AG_CMD_MAX 512

		const uint16_t bta_ag_uuid[BTA_AG_NUM_IDX] =
		{
		UUID_SERVCLASS_HEADSET_AUDIO_GATEWAY,
		UUID_SERVCLASS_AG_HANDSFREE
		};

		const uint8_t bta_ag_sec_id[BTA_AG_NUM_IDX] =
		{
		BTM_SEC_SERVICE_HEADSET_AG,
		BTM_SEC_SERVICE_AG_HANDSFREE
		};

		const tBTA_SERVICE_ID bta_ag_svc_id[BTA_AG_NUM_IDX] =
		{
		BTA_HSP_SERVICE_ID,
		BTA_HFP_SERVICE_ID
		};

		const tBTA_SERVICE_MASK bta_ag_svc_mask[BTA_AG_NUM_IDX] =
		{
		BTA_HSP_SERVICE_MASK,
		BTA_HFP_SERVICE_MASK
		};

		typedef void (tBTA_AG_ATCMD_CBACK)(tBTA_AG_SCB p_scb, uint16_t cmd, uint8_t arg_type,
		char *p_arg, int16_t int_arg);

		const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] =
		{
		bta_ag_at_hsp_cback,
		bta_ag_at_hfp_cback
		};
		const uint16_t bta_ag_uuid[BTA_AG_NUM_IDX] = {
		UUID_SERVCLASS_HEADSET_AUDIO_GATEWAY, UUID_SERVCLASS_AG_HANDSFREE};

		const uint8_t bta_ag_sec_id[BTA_AG_NUM_IDX] = {BTM_SEC_SERVICE_HEADSET_AG,
		BTM_SEC_SERVICE_AG_HANDSFREE};

		const tBTA_SERVICE_ID bta_ag_svc_id[BTA_AG_NUM_IDX] = {BTA_HSP_SERVICE_ID,
		BTA_HFP_SERVICE_ID};

		const tBTA_SERVICE_MASK bta_ag_svc_mask[BTA_AG_NUM_IDX] = {
		BTA_HSP_SERVICE_MASK, BTA_HFP_SERVICE_MASK};

		typedef void (tBTA_AG_ATCMD_CBACK)(tBTA_AG_SCB p_scb, uint16_t cmd,
		uint8_t arg_type, char* p_arg,
		int16_t int_arg);

		const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] = {
		bta_ag_at_hsp_cback, bta_ag_at_hfp_cback};

		/*******************************************************************************
		*
		@@ -88,8 +74,8 @@ const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] =
		* Returns void
		*
		******************************************************************************/
		static void bta_ag_cback_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data, tBTA_AG_STATUS status)
		{
		static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data,
		tBTA_AG_STATUS status) {
		tBTA_AG_OPEN open;

		/* call app callback with open event */
		@@ -97,13 +83,11 @@ static void bta_ag_cback_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data, tBTA_AG_
		open.hdr.app_id = p_scb->app_id;
		open.status = status;
		open.service_id = bta_ag_svc_id[p_scb->conn_service];
		if(p_data)
		{
		/* if p_data is provided then we need to pick the bd address from the open api structure */
		if (p_data) {
		/* if p_data is provided then we need to pick the bd address from the open
		* api structure */
		bdcpy(open.bd_addr, p_data->api_open.bd_addr);
		}
		else
		{
		} else {
		bdcpy(open.bd_addr, p_scb->peer_addr);
		}

		@@ -121,8 +105,7 @@ static void bta_ag_cback_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data, tBTA_AG_
		* Returns void
		*
		******************************************************************************/
		void bta_ag_register(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_register(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		tBTA_AG_REGISTER reg;

		/* initialize control block */
		@@ -155,8 +138,7 @@ void bta_ag_register(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_deregister(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_deregister(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* set dealloc */
		p_scb->dealloc = true;

		@@ -180,8 +162,7 @@ void bta_ag_deregister(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_start_dereg(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* set dealloc */
		p_scb->dealloc = true;

		@@ -199,21 +180,18 @@ void bta_ag_start_dereg(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_start_open(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;

		/* store parameters */
		if (p_data)
		{
		if (p_data) {
		bdcpy(p_scb->peer_addr, p_data->api_open.bd_addr);
		p_scb->open_services = p_data->api_open.services;
		p_scb->cli_sec_mask = p_data->api_open.sec_mask;
		}

		/* Check if RFCOMM has any incoming connection to avoid collision. */
		if (PORT_IsOpening (pending_bd_addr))
		{
		if (PORT_IsOpening(pending_bd_addr)) {
		/* 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. */
		@@ -241,19 +219,17 @@ void bta_ag_start_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_disc_int_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		uint16_t event = BTA_AG_DISC_FAIL_EVT;

		APPL_TRACE_DEBUG ("bta_ag_disc_int_res: Status: %d", p_data->disc_result.status);
		APPL_TRACE_DEBUG("bta_ag_disc_int_res: Status: %d",
		p_data->disc_result.status);

		/* if found service */
		if (p_data->disc_result.status == SDP_SUCCESS \|\|
		p_data->disc_result.status == SDP_DB_FULL)
		{
		p_data->disc_result.status == SDP_DB_FULL) {
		/* get attributes */
		if (bta_ag_sdp_find_attr(p_scb, p_scb->open_services))
		{
		if (bta_ag_sdp_find_attr(p_scb, p_scb->open_services)) {
		/* set connected service */
		p_scb->conn_service = bta_ag_service_to_idx(p_scb->open_services);

		@@ -269,34 +245,25 @@ void bta_ag_disc_int_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		if ((event == BTA_AG_DISC_FAIL_EVT) &&
		(p_data->disc_result.status == SDP_SUCCESS \|\|
		p_data->disc_result.status == SDP_DB_FULL \|\|
		p_data->disc_result.status == SDP_NO_RECS_MATCH))
		{
		p_data->disc_result.status == SDP_NO_RECS_MATCH)) {
		if ((p_scb->open_services & BTA_HFP_SERVICE_MASK) &&
		(p_scb->open_services & BTA_HSP_SERVICE_MASK))
		{
		(p_scb->open_services & BTA_HSP_SERVICE_MASK)) {
		/* search for HSP */
		p_scb->open_services &= ~BTA_HFP_SERVICE_MASK;
		bta_ag_do_disc(p_scb, p_scb->open_services);
		}
		else if ((p_scb->open_services & BTA_HSP_SERVICE_MASK) &&
		(p_scb->hsp_version == HSP_VERSION_1_2))
		{
		} else if ((p_scb->open_services & BTA_HSP_SERVICE_MASK) &&
		(p_scb->hsp_version == HSP_VERSION_1_2)) {
		/* search for UUID_SERVCLASS_HEADSET for HSP 1.0 device */
		p_scb->hsp_version = HSP_VERSION_1_0;
		bta_ag_do_disc(p_scb, p_scb->open_services);
		}
		else
		{
		} else {
		/* send ourselves sdp ok/fail event */
		bta_ag_sm_execute(p_scb, event, p_data);
		}
		}
		else
		{
		} else {
		/* send ourselves sdp ok/fail event */
		bta_ag_sm_execute(p_scb, event, p_data);
		}

		}

		/*******************************************************************************
		@@ -309,12 +276,10 @@ void bta_ag_disc_int_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_disc_acp_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_disc_acp_res(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* if found service */
		if (p_data->disc_result.status == SDP_SUCCESS \|\|
		p_data->disc_result.status == SDP_DB_FULL)
		{
		p_data->disc_result.status == SDP_DB_FULL) {
		/* get attributes */
		bta_ag_sdp_find_attr(p_scb, bta_ag_svc_mask[p_scb->conn_service]);
		}
		@@ -333,9 +298,7 @@ void bta_ag_disc_acp_res(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_disc_fail(tBTA_AG_SCB *p_scb,
		UNUSED_ATTR tBTA_AG_DATA *p_data)
		{
		void bta_ag_disc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		/* reopen registered servers */
		bta_ag_start_servers(p_scb, p_scb->reg_services);

		@@ -358,8 +321,7 @@ void bta_ag_disc_fail(tBTA_AG_SCB *p_scb,
		* Returns void
		*
		******************************************************************************/
		void bta_ag_open_fail(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_open_fail(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* call open cback w. failure */
		bta_ag_cback_open(p_scb, p_data, BTA_AG_FAIL_RESOURCES);
		}
		@@ -374,8 +336,7 @@ void bta_ag_open_fail(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_rfc_fail(tBTA_AG_SCB p_scb, UNUSED_ATTR tBTA_AG_DATA p_data)
		{
		void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		/* reinitialize stuff */
		p_scb->conn_handle = 0;
		p_scb->conn_service = 0;
		@@ -407,9 +368,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB p_scb, UNUSED_ATTR tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
		UNUSED_ATTR tBTA_AG_DATA *p_data)
		{
		void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		tBTA_AG_CLOSE close;
		tBTA_SERVICE_MASK services;
		int i, num_active_conn = 0;
		@@ -453,15 +412,13 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
		(bta_ag_cb.p_cback)(BTA_AG_CLOSE_EVT, (tBTA_AG)&close);

		/* if not deregistering (deallocating) reopen registered servers */
		if (p_scb->dealloc == false)
		{
		if (p_scb->dealloc == false) {
		/* Clear peer bd_addr so instance can be reused */
		bdcpy(p_scb->peer_addr, bd_addr_null);

		/* start only unopened server */
		services = p_scb->reg_services;
		for (i = 0; i < BTA_AG_NUM_IDX && services != 0; i++)
		{
		for (i = 0; i < BTA_AG_NUM_IDX && services != 0; i++) {
		if (p_scb->serv_handle[i])
		services &= ~((tBTA_SERVICE_MASK)1 << (BTA_HSP_SERVICE_ID + i));
		}
		@@ -473,21 +430,18 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
		bta_ag_sco_shutdown(p_scb, NULL);

		/* Check if all the SLCs are down */
		for (i = 0; i < BTA_AG_NUM_SCB; i++)
		{
		for (i = 0; i < BTA_AG_NUM_SCB; i++) {
		if (bta_ag_cb.scb[i].in_use && bta_ag_cb.scb[i].svc_conn)
		num_active_conn++;
		}

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

		}
		/* else close port and deallocate scb */
		else
		{
		else {
		RFCOMM_RemoveServer(p_scb->conn_handle);
		bta_ag_scb_dealloc(p_scb);
		}
		@@ -503,25 +457,27 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
		* Returns void
		*
		******************************************************************************/
		void bta_ag_rfc_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* initialize AT feature variables */
		p_scb->clip_enabled = false;
		p_scb->ccwa_enabled = false;
		p_scb->cmer_enabled = false;
		p_scb->cmee_enabled = false;
		p_scb->inband_enabled = ((p_scb->features & BTA_AG_FEAT_INBAND) == BTA_AG_FEAT_INBAND);
		p_scb->inband_enabled =
		((p_scb->features & BTA_AG_FEAT_INBAND) == BTA_AG_FEAT_INBAND);

		/* set up AT command interpreter */
		p_scb->at_cb.p_at_tbl = (tBTA_AG_AT_CMD*)bta_ag_at_tbl[p_scb->conn_service];
		p_scb->at_cb.p_cmd_cback = (tBTA_AG_AT_CMD_CBACK *) bta_ag_at_cback_tbl[p_scb->conn_service];
		p_scb->at_cb.p_cmd_cback =
		(tBTA_AG_AT_CMD_CBACK*)bta_ag_at_cback_tbl[p_scb->conn_service];
		p_scb->at_cb.p_err_cback = (tBTA_AG_AT_ERR_CBACK*)bta_ag_at_err_cback;
		p_scb->at_cb.p_user = p_scb;
		p_scb->at_cb.cmd_max_len = BTA_AG_CMD_MAX;
		bta_ag_at_init(&p_scb->at_cb);

		/* call app open call-out */
		bta_ag_co_data_open(bta_ag_scb_to_idx(p_scb), bta_ag_svc_id[p_scb->conn_service]);
		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, p_scb->peer_addr);

		@@ -547,8 +503,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		uint16_t lcid;
		int i;
		tBTA_AG_SCB ag_scb, other_scb;
		@@ -562,29 +517,26 @@ 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, dev_addr, &lcid)))
		{
		APPL_TRACE_DEBUG ("bta_ag_rfc_acp_open error PORT_CheckConnection returned status %d", status);
		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);
		}

		/* Collision Handling */
		for (i = 0, ag_scb = &bta_ag_cb.scb[0]; i < BTA_AG_NUM_SCB; i++, ag_scb++)
		{
		if (ag_scb->in_use && alarm_is_scheduled(ag_scb->collision_timer))
		{
		for (i = 0, ag_scb = &bta_ag_cb.scb[0]; i < BTA_AG_NUM_SCB; i++, ag_scb++) {
		if (ag_scb->in_use && alarm_is_scheduled(ag_scb->collision_timer)) {
		alarm_cancel(ag_scb->collision_timer);

		if (bdcmp (dev_addr, ag_scb->peer_addr) == 0)
		{
		if (bdcmp(dev_addr, ag_scb->peer_addr) == 0) {
		/* If incoming and outgoing device are same, nothing more to do. */
		/* Outgoing conn will be aborted because we have successful incoming conn. */
		}
		else
		{
		/* Outgoing conn will be aborted because we have successful incoming
		* conn. */
		} else {
		/* Resume outgoing connection. */
		other_scb = bta_ag_get_other_idle_scb(p_scb);
		if (other_scb)
		{
		if (other_scb) {
		bdcpy(other_scb->peer_addr, ag_scb->peer_addr);
		other_scb->open_services = ag_scb->open_services;
		other_scb->cli_sec_mask = ag_scb->cli_sec_mask;
		@@ -600,13 +552,12 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		bdcpy(p_scb->peer_addr, dev_addr);

		/* determine connected service from port handle */
		for (i = 0; i < BTA_AG_NUM_IDX; i++)
		{
		APPL_TRACE_DEBUG ("bta_ag_rfc_acp_open: i = %d serv_handle = %d port_handle = %d",
		i, p_scb->serv_handle[i], p_data->rfc.port_handle);
		for (i = 0; i < BTA_AG_NUM_IDX; i++) {
		APPL_TRACE_DEBUG(
		"bta_ag_rfc_acp_open: i = %d serv_handle = %d port_handle = %d", i,
		p_scb->serv_handle[i], p_data->rfc.port_handle);

		if (p_scb->serv_handle[i] == p_data->rfc.port_handle)
		{
		if (p_scb->serv_handle[i] == p_data->rfc.port_handle) {
		p_scb->conn_service = i;
		p_scb->conn_handle = p_data->rfc.port_handle;
		break;
		@@ -617,16 +568,14 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		p_scb->conn_service, p_scb->conn_handle);

		/* close any unopened server */
		bta_ag_close_servers(p_scb, (p_scb->reg_services & ~bta_ag_svc_mask[p_scb->conn_service]));
		bta_ag_close_servers(
		p_scb, (p_scb->reg_services & ~bta_ag_svc_mask[p_scb->conn_service]));

		/* do service discovery to get features */
		bta_ag_do_disc(p_scb, bta_ag_svc_mask[p_scb->conn_service]);

		/* continue with common open processing */
		bta_ag_rfc_open(p_scb, p_data);



		}

		/*******************************************************************************
		@@ -639,9 +588,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
		UNUSED_ATTR tBTA_AG_DATA *p_data)
		{
		void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) {
		uint16_t len;
		char buf[BTA_AG_RFC_READ_MAX];

		@@ -650,25 +597,23 @@ void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
		APPL_TRACE_DEBUG("%s", __func__);

		/* do the following */
		for(;;)
		{
		for (;;) {
		/* read data from rfcomm; if bad status, we're done */
		if (PORT_ReadData(p_scb->conn_handle, buf, BTA_AG_RFC_READ_MAX, &len) != PORT_SUCCESS)
		{
		if (PORT_ReadData(p_scb->conn_handle, buf, BTA_AG_RFC_READ_MAX, &len) !=
		PORT_SUCCESS) {
		break;
		}

		/* if no data, we're done */
		if (len == 0)
		{
		if (len == 0) {
		break;
		}

		/* run AT command interpreter on data */
		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))
		{
		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, p_scb->peer_addr);
		} else {
		@@ -676,8 +621,7 @@ void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
		}

		/* no more data to read, we're done */
		if (len < BTA_AG_RFC_READ_MAX)
		{
		if (len < BTA_AG_RFC_READ_MAX) {
		break;
		}
		}
		@@ -693,19 +637,15 @@ void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
		* Returns void
		*
		******************************************************************************/
		void bta_ag_start_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_start_close(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		/* Take the link out of sniff and set L2C idle time to 0 */
		bta_dm_pm_active(p_scb->peer_addr);
		L2CA_SetIdleTimeoutByBdAddr(p_scb->peer_addr, 0, BT_TRANSPORT_BR_EDR);

		/* if SCO is open close SCO and wait on RFCOMM close */
		if (bta_ag_sco_is_open(p_scb))
		{
		if (bta_ag_sco_is_open(p_scb)) {
		p_scb->post_sco = BTA_AG_POST_SCO_CLOSE_RFC;
		}
		else
		{
		} else {
		p_scb->post_sco = BTA_AG_POST_SCO_NONE;
		bta_ag_rfc_do_close(p_scb, p_data);
		}
		@@ -724,10 +664,8 @@ void bta_ag_start_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_post_sco_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		switch (p_scb->post_sco)
		{
		void bta_ag_post_sco_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		switch (p_scb->post_sco) {
		case BTA_AG_POST_SCO_RING:
		bta_ag_send_ring(p_scb, p_data);
		p_scb->post_sco = BTA_AG_POST_SCO_NONE;
		@@ -753,10 +691,8 @@ void bta_ag_post_sco_open(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		* Returns void
		*
		******************************************************************************/
		void bta_ag_post_sco_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		switch (p_scb->post_sco)
		{
		void bta_ag_post_sco_close(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		switch (p_scb->post_sco) {
		case BTA_AG_POST_SCO_CLOSE_RFC:
		bta_ag_rfc_do_close(p_scb, p_data);
		p_scb->post_sco = BTA_AG_POST_SCO_NONE;
		@@ -783,13 +719,11 @@ void bta_ag_post_sco_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		/* Sending callsetup IND and Ring were defered to after SCO close. */
		bta_ag_send_call_inds(p_scb, BTA_AG_IN_CALL_RES);

		if (bta_ag_inband_enabled(p_scb) && !(p_scb->features & BTA_AG_FEAT_NOSCO))
		{
		if (bta_ag_inband_enabled(p_scb) &&
		!(p_scb->features & BTA_AG_FEAT_NOSCO)) {
		p_scb->post_sco = BTA_AG_POST_SCO_RING;
		bta_ag_sco_open(p_scb, p_data);
		}
		else
		{
		} else {
		p_scb->post_sco = BTA_AG_POST_SCO_NONE;
		bta_ag_send_ring(p_scb, p_data);
		}
		@@ -811,12 +745,10 @@ void bta_ag_post_sco_close(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		*
		******************************************************************************/
		void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb,
		UNUSED_ATTR tBTA_AG_DATA *p_data)
		{
		UNUSED_ATTR tBTA_AG_DATA* p_data) {
		tBTA_AG_CONN evt;

		if (!p_scb->svc_conn)
		{
		if (!p_scb->svc_conn) {
		/* set state variable */
		p_scb->svc_conn = true;

		@@ -835,8 +767,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb,
		#endif

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

		@@ -853,23 +784,20 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb,
		* Returns void
		*
		******************************************************************************/
		void bta_ag_ci_rx_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_ci_rx_data(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		uint16_t len;
		tBTA_AG_CI_RX_WRITE* p_rx_write_msg = (tBTA_AG_CI_RX_WRITE*)p_data;
		char p_data_area = (char )(p_rx_write_msg+1); /* Point to data area after header */
		char* p_data_area =
		(char)(p_rx_write_msg + 1); / Point to data area after header */

		APPL_TRACE_DEBUG("bta_ag_ci_rx_data:");
		/* send to RFCOMM */
		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))
		{
		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, p_scb->peer_addr);
		}
		else
		{
		} else {
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}
		}
		@@ -884,13 +812,13 @@ void bta_ag_ci_rx_data(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		*
		******************************************************************************/
		void bta_ag_rcvd_slc_ready(tBTA_AG_SCB* p_scb,
		UNUSED_ATTR tBTA_AG_DATA *p_data)
		{
		APPL_TRACE_DEBUG("bta_ag_rcvd_slc_ready: handle = %d", bta_ag_scb_to_idx(p_scb));
		UNUSED_ATTR tBTA_AG_DATA* p_data) {
		APPL_TRACE_DEBUG("bta_ag_rcvd_slc_ready: handle = %d",
		bta_ag_scb_to_idx(p_scb));

		if (bta_ag_cb.parse_mode == BTA_AG_PASS_THROUGH)
		{
		/* In pass-through mode, BTA knows that SLC is ready only through call-in. */
		if (bta_ag_cb.parse_mode == BTA_AG_PASS_THROUGH) {
		/* In pass-through mode, BTA knows that SLC is ready only through call-in.
		*/
		bta_ag_svc_conn_open(p_scb, NULL);
		}
		}
		@@ -905,41 +833,36 @@ void bta_ag_rcvd_slc_ready(tBTA_AG_SCB *p_scb,
		* Returns void
		*
		******************************************************************************/
		void bta_ag_setcodec(tBTA_AG_SCB p_scb, tBTA_AG_DATA p_data)
		{
		void bta_ag_setcodec(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		#if (BTM_WBS_INCLUDED == TRUE)
		tBTA_AG_PEER_CODEC codec_type = p_data->api_setcodec.codec;
		tBTA_AG_VAL val;

		/* Check if the requested codec type is valid */
		if((codec_type != BTA_AG_CODEC_NONE) &&
		(codec_type != BTA_AG_CODEC_CVSD) &&
		(codec_type != BTA_AG_CODEC_MSBC))
		{
		if ((codec_type != BTA_AG_CODEC_NONE) && (codec_type != BTA_AG_CODEC_CVSD) &&
		(codec_type != BTA_AG_CODEC_MSBC)) {
		val.num = codec_type;
		val.hdr.status = BTA_AG_FAIL_RESOURCES;
		APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d", codec_type);
		APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d",
		codec_type);
		(bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG)&val);
		return;
		}

		if ((p_scb->peer_codecs & codec_type) \|\| (codec_type == BTA_AG_CODEC_NONE) \|\|
		(codec_type == BTA_AG_CODEC_CVSD))
		{
		(codec_type == BTA_AG_CODEC_CVSD)) {
		p_scb->sco_codec = codec_type;
		p_scb->codec_updated = true;
		val.num = codec_type;
		val.hdr.status = BTA_AG_SUCCESS;
		APPL_TRACE_DEBUG("bta_ag_setcodec: Updated codec type %d", codec_type);
		}
		else
		{
		} else {
		val.num = codec_type;
		val.hdr.status = BTA_AG_FAIL_RESOURCES;
		APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d", codec_type);
		APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d",
		codec_type);
		}

		(bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG)&val);
		#endif
		}

system/bta/ag/bta_ag_api.cc

+95 −106

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/ag/bta_ag_at.cc

+111 −147

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/ag/bta_ag_at.h

+30 −31

Original line number	Diff line number	Diff line
		@@ -48,8 +48,7 @@ extern "C" {
		****************************************************************************/

		/* AT command table element */
		typedef struct
		{
		typedef struct {
		const char* p_cmd; /* AT command string */
		size_t command_id; /* passed to the callback on p_cmd match */
		uint8_t arg_type; /* allowable argument type syntax */
		@@ -59,15 +58,15 @@ typedef struct
		} tBTA_AG_AT_CMD;

		/* callback function executed when command is parsed */
		typedef void (tBTA_AG_AT_CMD_CBACK)(void *p_user, uint16_t command_id, uint8_t arg_type,
		char *p_arg, int16_t int_arg);
		typedef void(tBTA_AG_AT_CMD_CBACK)(void* p_user, uint16_t command_id,
		uint8_t arg_type, char* p_arg,
		int16_t int_arg);

		/* callback function executed to send "ERROR" result code */
		typedef void(tBTA_AG_AT_ERR_CBACK)(void* p_user, bool unknown, char* p_arg);

		/* AT command parsing control block */
		typedef struct
		{
		typedef struct {
		tBTA_AG_AT_CMD* p_at_tbl; /* AT command table */
		tBTA_AG_AT_CMD_CBACK* p_cmd_cback; /* command callback */
		tBTA_AG_AT_ERR_CBACK* p_err_cback; /* error callback */

system/bta/ag/bta_ag_cfg.cc

+25 −27

File changed.

Preview size limit exceeded, changes collapsed.