HFP: Remove AG RFCOMM data pass through mode (537f1b9a) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+0 −21

Original line number	Diff line number	Diff line
		@@ -796,27 +796,6 @@ void bta_ag_ci_rx_data(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {
		}
		}

		/*******************************************************************************
		*
		* Function bta_ag_rcvd_slc_ready
		*
		* Description Handles SLC ready call-in in case of pass-through mode.
		*
		* Returns void
		*
		******************************************************************************/
		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));

		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, nullptr);
		}
		}

		/*******************************************************************************
		*
		* Function bta_ag_setcodec

system/bta/ag/bta_ag_api.cc

+1 −3

Original line number	Diff line number	Diff line
		@@ -50,8 +50,7 @@ static const tBTA_SYS_REG bta_ag_reg = {bta_ag_hdl_event, BTA_AgDisable};
		* Returns BTA_SUCCESS if OK, BTA_FAILURE otherwise.
		*
		******************************************************************************/
		tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode,
		tBTA_AG_CBACK* p_cback) {
		tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) {
		/* Error if AG is already enabled, or AG is in the middle of disabling. */
		for (const tBTA_AG_SCB& scb : bta_ag_cb.scb) {
		if (scb.in_use) {
		@@ -66,7 +65,6 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode,
		tBTA_AG_API_ENABLE* p_buf =
		(tBTA_AG_API_ENABLE*)osi_malloc(sizeof(tBTA_AG_API_ENABLE));
		p_buf->hdr.event = BTA_AG_API_ENABLE_EVT;
		p_buf->parse_mode = parse_mode;
		p_buf->p_cback = p_cback;

		bta_sys_sendmsg(p_buf);

system/bta/ag/bta_ag_int.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ enum {
		BTA_AG_RING_TIMEOUT_EVT,
		BTA_AG_SVC_TIMEOUT_EVT,
		BTA_AG_CI_SCO_DATA_EVT,
		BTA_AG_CI_SLC_READY_EVT,
		BTA_AG_MAX_EVT,

		/* these events are handled outside of the state machine */
		@@ -130,7 +129,6 @@ enum {
		/* data type for BTA_AG_API_ENABLE_EVT */
		typedef struct {
		BT_HDR hdr;
		tBTA_AG_PARSE_MODE parse_mode;
		tBTA_AG_CBACK* p_cback;
		} tBTA_AG_API_ENABLE;

		@@ -295,7 +293,6 @@ typedef struct {
		tBTA_AG_PROFILE profile[BTA_AG_NUM_IDX]; /* profile-specific data */
		tBTA_AG_SCO_CB sco; /* SCO data */
		tBTA_AG_CBACK* p_cback; /* application callback */
		tBTA_AG_PARSE_MODE parse_mode; /* parse/pass-through mode */
		} tBTA_AG_CB;

		/*****************************************************************************
		@@ -400,7 +397,6 @@ extern void bta_ag_send_bcs(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_send_ring(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_ci_sco_data(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_ci_rx_data(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_rcvd_slc_ready(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_set_sco_allowed(tBTA_AG_DATA* p_data);
		extern const RawAddress& bta_ag_get_active_device();
		extern void bta_clear_active_device();

system/bta/ag/bta_ag_main.cc

+21 −30

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ enum {
		BTA_AG_SEND_RING,
		BTA_AG_CI_SCO_DATA,
		BTA_AG_CI_RX_DATA,
		BTA_AG_RCVD_SLC_READY,
		BTA_AG_NUM_ACTIONS
		};

		@@ -99,7 +98,7 @@ const tBTA_AG_ACTION bta_ag_action[] = {
		bta_ag_sco_close, bta_ag_sco_shutdown, bta_ag_post_sco_open,
		bta_ag_post_sco_close, bta_ag_svc_conn_open, bta_ag_result,
		bta_ag_setcodec, bta_ag_send_ring, bta_ag_ci_sco_data,
		bta_ag_ci_rx_data, bta_ag_rcvd_slc_ready};
		bta_ag_ci_rx_data};

		/* state table information */
		#define BTA_AG_ACTIONS 2 /* number of actions */
		@@ -130,15 +129,14 @@ const uint8_t bta_ag_st_init[][BTA_AG_NUM_COLS] = {
		/* CI_RX_WRITE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* RING_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* SVC_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* CI_SLC_READY_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST}};
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST}};

		/* state table for opening state */
		const uint8_t bta_ag_st_opening[][BTA_AG_NUM_COLS] = {
		/* Event Action 1 Action 2 Next state */
		/* API_REGISTER_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* API_DEREGISTER_EVT */ {BTA_AG_RFC_DO_CLOSE, BTA_AG_START_DEREG,
		BTA_AG_CLOSING_ST},
		/* API_DEREGISTER_EVT */
		{BTA_AG_RFC_DO_CLOSE, BTA_AG_START_DEREG, BTA_AG_CLOSING_ST},
		/* API_OPEN_EVT */ {BTA_AG_OPEN_FAIL, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* API_CLOSE_EVT */ {BTA_AG_RFC_DO_CLOSE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_AUDIO_OPEN_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		@@ -150,25 +148,24 @@ const uint8_t bta_ag_st_opening[][BTA_AG_NUM_COLS] = {
		/* RFC_SRV_CLOSE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* RFC_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* SCO_OPEN_EVT */ {BTA_AG_SCO_CONN_OPEN, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* SCO_CLOSE_EVT */ {BTA_AG_SCO_CONN_CLOSE, BTA_AG_IGNORE,
		BTA_AG_OPENING_ST},
		/* SCO_CLOSE_EVT */
		{BTA_AG_SCO_CONN_CLOSE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* DISC_ACP_RES_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* DISC_INT_RES_EVT */ {BTA_AG_DISC_INT_RES, BTA_AG_IGNORE,
		BTA_AG_OPENING_ST},
		/* DISC_INT_RES_EVT */
		{BTA_AG_DISC_INT_RES, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* DISC_OK_EVT */ {BTA_AG_RFC_DO_OPEN, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* DISC_FAIL_EVT */ {BTA_AG_DISC_FAIL, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* CI_RX_WRITE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* RING_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* SVC_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST},
		/* CI_SLC_READY_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST}};
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPENING_ST}};

		/* state table for open state */
		const uint8_t bta_ag_st_open[][BTA_AG_NUM_COLS] = {
		/* Event Action 1 Action 2 Next state */
		/* API_REGISTER_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* API_DEREGISTER_EVT */ {BTA_AG_START_CLOSE, BTA_AG_START_DEREG,
		BTA_AG_CLOSING_ST},
		/* API_DEREGISTER_EVT */
		{BTA_AG_START_CLOSE, BTA_AG_START_DEREG, BTA_AG_CLOSING_ST},
		/* API_OPEN_EVT */ {BTA_AG_OPEN_FAIL, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* API_CLOSE_EVT */ {BTA_AG_START_CLOSE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_AUDIO_OPEN_EVT */ {BTA_AG_SCO_OPEN, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		@@ -179,10 +176,10 @@ const uint8_t bta_ag_st_open[][BTA_AG_NUM_COLS] = {
		/* RFC_CLOSE_EVT */ {BTA_AG_RFC_CLOSE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* RFC_SRV_CLOSE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* RFC_DATA_EVT */ {BTA_AG_RFC_DATA, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* SCO_OPEN_EVT */ {BTA_AG_SCO_CONN_OPEN, BTA_AG_POST_SCO_OPEN,
		BTA_AG_OPEN_ST},
		/* SCO_CLOSE_EVT */ {BTA_AG_SCO_CONN_CLOSE, BTA_AG_POST_SCO_CLOSE,
		BTA_AG_OPEN_ST},
		/* SCO_OPEN_EVT */
		{BTA_AG_SCO_CONN_OPEN, BTA_AG_POST_SCO_OPEN, BTA_AG_OPEN_ST},
		/* SCO_CLOSE_EVT */
		{BTA_AG_SCO_CONN_CLOSE, BTA_AG_POST_SCO_CLOSE, BTA_AG_OPEN_ST},
		/* DISC_ACP_RES_EVT */ {BTA_AG_DISC_ACP_RES, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* DISC_INT_RES_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* DISC_OK_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		@@ -190,16 +187,14 @@ const uint8_t bta_ag_st_open[][BTA_AG_NUM_COLS] = {
		/* CI_RX_WRITE_EVT */ {BTA_AG_CI_RX_DATA, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* RING_TOUT_EVT */ {BTA_AG_SEND_RING, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* SVC_TOUT_EVT */ {BTA_AG_START_CLOSE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* CI_SCO_DATA_EVT */ {BTA_AG_CI_SCO_DATA, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* CI_SLC_READY_EVT */
		{BTA_AG_RCVD_SLC_READY, BTA_AG_IGNORE, BTA_AG_OPEN_ST}};
		/* CI_SCO_DATA_EVT */ {BTA_AG_CI_SCO_DATA, BTA_AG_IGNORE, BTA_AG_OPEN_ST}};

		/* state table for closing state */
		const uint8_t bta_ag_st_closing[][BTA_AG_NUM_COLS] = {
		/* Event Action 1 Action 2 Next state */
		/* API_REGISTER_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_DEREGISTER_EVT */ {BTA_AG_START_DEREG, BTA_AG_IGNORE,
		BTA_AG_CLOSING_ST},
		/* API_DEREGISTER_EVT */
		{BTA_AG_START_DEREG, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_OPEN_EVT */ {BTA_AG_OPEN_FAIL, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_CLOSE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* API_AUDIO_OPEN_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		@@ -211,8 +206,8 @@ const uint8_t bta_ag_st_closing[][BTA_AG_NUM_COLS] = {
		/* RFC_SRV_CLOSE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* RFC_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* SCO_OPEN_EVT */ {BTA_AG_SCO_CONN_OPEN, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* SCO_CLOSE_EVT */ {BTA_AG_SCO_CONN_CLOSE, BTA_AG_POST_SCO_CLOSE,
		BTA_AG_CLOSING_ST},
		/* SCO_CLOSE_EVT */
		{BTA_AG_SCO_CONN_CLOSE, BTA_AG_POST_SCO_CLOSE, BTA_AG_CLOSING_ST},
		/* DISC_ACP_RES_EVT */ {BTA_AG_FREE_DB, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* DISC_INT_RES_EVT */ {BTA_AG_FREE_DB, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* DISC_OK_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		@@ -220,8 +215,7 @@ const uint8_t bta_ag_st_closing[][BTA_AG_NUM_COLS] = {
		/* CI_RX_WRITE_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* RING_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* SVC_TOUT_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* CI_SLC_READY_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST}};
		/* CI_SCO_DATA_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST}};

		/* type for state table */
		typedef const uint8_t (*tBTA_AG_ST_TBL)[BTA_AG_NUM_COLS];
		@@ -585,7 +579,6 @@ static void bta_ag_api_enable(tBTA_AG_DATA* p_data) {

		/* store callback function */
		bta_ag_cb.p_cback = p_data->api_enable.p_cback;
		bta_ag_cb.parse_mode = p_data->api_enable.parse_mode;

		/* call init call-out */
		BTM_WriteVoiceSettings(AG_VOICE_SETTINGS);
		@@ -902,8 +895,6 @@ static char* bta_ag_evt_str(uint16_t event, tBTA_AG_RES result) {
		return "Disable AG";
		case BTA_AG_CI_SCO_DATA_EVT:
		return "SCO data Callin";
		case BTA_AG_CI_SLC_READY_EVT:
		return "SLC Ready Callin";
		default:
		return "Unknown AG Event";
		}

system/bta/ag/bta_ag_rfc.cc

+0 −50

Original line number	Diff line number	Diff line
		@@ -48,10 +48,6 @@ void bta_ag_mgmt_cback_1(uint32_t code, uint16_t port_handle);
		void bta_ag_mgmt_cback_2(uint32_t code, uint16_t port_handle);
		void bta_ag_mgmt_cback_3(uint32_t code, uint16_t port_handle);

		int bta_ag_data_cback_1(uint16_t port_handle, void* p_data, uint16_t len);
		int bta_ag_data_cback_2(uint16_t port_handle, void* p_data, uint16_t len);
		int bta_ag_data_cback_3(uint16_t port_handle, void* p_data, uint16_t len);

		/* rfcomm callback function tables */
		typedef tPORT_CALLBACK* tBTA_AG_PORT_CBACK;
		const tBTA_AG_PORT_CBACK bta_ag_port_cback_tbl[] = {
		@@ -60,10 +56,6 @@ const tBTA_AG_PORT_CBACK bta_ag_port_cback_tbl[] = {
		const tBTA_AG_PORT_CBACK bta_ag_mgmt_cback_tbl[] = {
		bta_ag_mgmt_cback_1, bta_ag_mgmt_cback_2, bta_ag_mgmt_cback_3};

		typedef tPORT_DATA_CALLBACK* tBTA_AG_DATA_CBACK;
		const tBTA_AG_DATA_CBACK bta_ag_data_cback_tbl[] = {
		bta_ag_data_cback_1, bta_ag_data_cback_2, bta_ag_data_cback_3};

		/*******************************************************************************
		*
		* Function bta_ag_port_cback
		@@ -158,21 +150,6 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle,
		}
		}

		/*******************************************************************************
		*
		* Function bta_ag_data_cback
		*
		* Description RFCOMM data callback
		*
		*
		* Returns void
		*
		******************************************************************************/
		static int bta_ag_data_cback(UNUSED_ATTR uint16_t port_handle, void* p_data,
		uint16_t len, uint16_t handle) {
		return 0;
		}

		/*******************************************************************************
		*
		* Function bta_ag_port_cback_1 to 3
		@@ -204,27 +181,6 @@ void bta_ag_port_cback_3(uint32_t code, uint16_t handle) {
		bta_ag_port_cback(code, handle, 3);
		}

		/*******************************************************************************
		*
		* Function bta_ag_data_cback_1 to 3
		*
		* Description RFCOMM data callback functions. This is an easy way to
		* distinguish scb from the callback.
		*
		*
		* Returns void
		*
		******************************************************************************/
		int bta_ag_data_cback_1(uint16_t port_handle, void* p_data, uint16_t len) {
		return bta_ag_data_cback(port_handle, p_data, len, 1);
		}
		int bta_ag_data_cback_2(uint16_t port_handle, void* p_data, uint16_t len) {
		return bta_ag_data_cback(port_handle, p_data, len, 2);
		}
		int bta_ag_data_cback_3(uint16_t port_handle, void* p_data, uint16_t len) {
		return bta_ag_data_cback(port_handle, p_data, len, 3);
		}

		/*******************************************************************************
		*
		* Function bta_ag_setup_port
		@@ -237,12 +193,6 @@ int bta_ag_data_cback_3(uint16_t port_handle, void* p_data, uint16_t len) {
		******************************************************************************/
		void bta_ag_setup_port(tBTA_AG_SCB* p_scb, uint16_t handle) {
		uint16_t i = bta_ag_scb_to_idx(p_scb) - 1;

		/* set up data callback if using pass through mode */
		if (bta_ag_cb.parse_mode == BTA_AG_PASS_THROUGH) {
		PORT_SetDataCallback(handle, bta_ag_data_cback_tbl[i]);
		}

		PORT_SetEventMask(handle, BTA_AG_PORT_EV_MASK);
		PORT_SetEventCallback(handle, bta_ag_port_cback_tbl[i]);
		}