Merge "HFP: Remove used BTA call-in events and methods" (c68a553c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+0 −27

Original line number	Diff line number	Diff line
		@@ -769,33 +769,6 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb,
		}
		}

		/*******************************************************************************
		*
		* Function bta_ag_ci_rx_data
		*
		* Description Send result code
		*
		* Returns void
		*
		******************************************************************************/
		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 = &p_data->ci_rx_write;
		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)) {
		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 {
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		}
		}

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

system/bta/ag/bta_ag_int.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -82,10 +82,8 @@ enum {
		BTA_AG_DISC_INT_RES_EVT,
		BTA_AG_DISC_OK_EVT,
		BTA_AG_DISC_FAIL_EVT,
		BTA_AG_CI_RX_WRITE_EVT,
		BTA_AG_RING_TIMEOUT_EVT,
		BTA_AG_SVC_TIMEOUT_EVT,
		BTA_AG_CI_SCO_DATA_EVT,
		BTA_AG_MAX_EVT,

		/* these events are handled outside of the state machine */
		@@ -186,12 +184,6 @@ typedef struct {
		uint16_t port_handle;
		} tBTA_AG_RFC;

		/* data type for BTA_AG_CI_RX_WRITE_EVT */
		typedef struct {
		BT_HDR hdr;
		// char p_data[BTA_AG_MTU+1];
		} tBTA_AG_CI_RX_WRITE;

		/* union of all event datatypes */
		typedef union {
		BT_HDR hdr;
		@@ -204,7 +196,6 @@ typedef union {
		tBTA_AG_API_SET_ACTIVE_DEVICE api_set_active_device;
		tBTA_AG_DISC_RESULT disc_result;
		tBTA_AG_RFC rfc;
		tBTA_AG_CI_RX_WRITE ci_rx_write;
		} tBTA_AG_DATA;

		/* type for each profile */
		@@ -395,8 +386,6 @@ extern void bta_ag_result(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		extern void bta_ag_setcodec(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data);
		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_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

+9 −27

Original line number	Diff line number	Diff line
		@@ -76,8 +76,6 @@ enum {
		BTA_AG_RESULT,
		BTA_AG_SETCODEC,
		BTA_AG_SEND_RING,
		BTA_AG_CI_SCO_DATA,
		BTA_AG_CI_RX_DATA,
		BTA_AG_NUM_ACTIONS
		};

		@@ -97,8 +95,7 @@ const tBTA_AG_ACTION bta_ag_action[] = {
		bta_ag_sco_conn_close, bta_ag_sco_listen, bta_ag_sco_open,
		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_setcodec, bta_ag_send_ring};

		/* state table information */
		#define BTA_AG_ACTIONS 2 /* number of actions */
		@@ -126,10 +123,8 @@ const uint8_t bta_ag_st_init[][BTA_AG_NUM_COLS] = {
		/* DISC_INT_RES_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* DISC_OK_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* DISC_FAIL_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_INIT_ST},
		/* 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}};
		/* SVC_TOUT_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] = {
		@@ -155,10 +150,8 @@ const uint8_t bta_ag_st_opening[][BTA_AG_NUM_COLS] = {
		{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}};
		/* SVC_TOUT_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] = {
		@@ -184,10 +177,8 @@ const uint8_t bta_ag_st_open[][BTA_AG_NUM_COLS] = {
		/* 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},
		/* DISC_FAIL_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_OPEN_ST},
		/* 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}};
		/* SVC_TOUT_EVT */ {BTA_AG_START_CLOSE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST}};

		/* state table for closing state */
		const uint8_t bta_ag_st_closing[][BTA_AG_NUM_COLS] = {
		@@ -212,10 +203,8 @@ const uint8_t bta_ag_st_closing[][BTA_AG_NUM_COLS] = {
		/* 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},
		/* DISC_FAIL_EVT */ {BTA_AG_IGNORE, BTA_AG_IGNORE, BTA_AG_CLOSING_ST},
		/* 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}};
		/* SVC_TOUT_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];
		@@ -704,19 +693,16 @@ void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event,

		/* Ignore displaying of AT results when not connected (Ignored in state
		* machine) */
		if ((previous_event != BTA_AG_API_RESULT_EVT \|\|
		p_scb->state == BTA_AG_OPEN_ST) &&
		event != BTA_AG_CI_SCO_DATA_EVT) {
		if (previous_event != BTA_AG_API_RESULT_EVT \|\|
		p_scb->state == BTA_AG_OPEN_ST) {
		APPL_TRACE_EVENT("%s: Handle 0x%04x, State %d (%s), Event 0x%04x (%s)",
		__func__, bta_ag_scb_to_idx(p_scb), p_scb->state,
		bta_ag_state_str(p_scb->state), event,
		bta_ag_evt_str(event, p_data->api_result.result));
		}
		#else
		if (event != BTA_AG_CI_SCO_DATA_EVT) {
		APPL_TRACE_EVENT("%s: Handle 0x%04x, State %d, Event 0x%04x", __func__,
		bta_ag_scb_to_idx(p_scb), p_scb->state, event);
		}
		#endif

		event &= 0x00FF;
		@@ -883,8 +869,6 @@ static char* bta_ag_evt_str(uint16_t event, tBTA_AG_RES result) {
		return "Discovery OK";
		case BTA_AG_DISC_FAIL_EVT:
		return "Discovery Failed";
		case BTA_AG_CI_RX_WRITE_EVT:
		return "CI RX Write";
		case BTA_AG_RING_TIMEOUT_EVT:
		return "Ring Timeout";
		case BTA_AG_SVC_TIMEOUT_EVT:
		@@ -893,8 +877,6 @@ static char* bta_ag_evt_str(uint16_t event, tBTA_AG_RES result) {
		return "Enable AG";
		case BTA_AG_API_DISABLE_EVT:
		return "Disable AG";
		case BTA_AG_CI_SCO_DATA_EVT:
		return "SCO data Callin";
		default:
		return "Unknown AG Event";
		}

system/bta/ag/bta_ag_sco.cc

+6 −27

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ enum {
		BTA_AG_SCO_SHUTDOWN_E, /* shutdown request */
		BTA_AG_SCO_CONN_OPEN_E, /* sco open */
		BTA_AG_SCO_CONN_CLOSE_E, /* sco closed */
		BTA_AG_SCO_CI_DATA_E /* SCO data ready */
		};

		static void bta_ag_create_pending_sco(tBTA_AG_SCB* p_scb, bool is_local);
		@@ -540,17 +539,13 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) {
		#if (BTA_AG_SCO_DEBUG == TRUE)
		uint8_t in_state = p_sco->state;

		if (event != BTA_AG_SCO_CI_DATA_E) {
		APPL_TRACE_EVENT("%s: SCO Index 0x%04x, State %d (%s), Event %d (%s)",
		__func__, p_scb->sco_idx, p_sco->state,
		bta_ag_sco_state_str(p_sco->state), event,
		bta_ag_sco_evt_str(event));
		}
		#else
		if (event != BTA_AG_SCO_CI_DATA_E) {
		APPL_TRACE_EVENT("%s: SCO Index 0x%04x, State %d, Event %d", __func__,
		p_scb->sco_idx, p_sco->state, event);
		}
		#endif

		switch (p_sco->state) {
		@@ -1271,20 +1266,6 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB* p_scb,
		bta_ag_create_pending_sco(p_scb, bta_ag_cb.sco.is_local);
		}

		/*******************************************************************************
		*
		* Function bta_ag_ci_sco_data
		*
		* Description Process the SCO data ready callin event
		*
		*
		* Returns void
		*
		******************************************************************************/
		void bta_ag_ci_sco_data(UNUSED_ATTR tBTA_AG_SCB* p_scb,
		UNUSED_ATTR tBTA_AG_DATA* p_data) {
		}

		void bta_ag_set_sco_allowed(tBTA_AG_DATA* p_data) {
		sco_allowed = p_data->api_set_sco_allowed.value;
		APPL_TRACE_DEBUG(sco_allowed ? "sco now allowed" : "sco now not allowed");
		@@ -1327,8 +1308,6 @@ static char* bta_ag_sco_evt_str(uint8_t event) {
		return "Opened";
		case BTA_AG_SCO_CONN_CLOSE_E:
		return "Closed";
		case BTA_AG_SCO_CI_DATA_E:
		return "Sco Data";
		default:
		return "Unknown SCO Event";
		}