Get rid of BTA_JV_API_PM_STATE_CHANGE_EVT (01e5a45c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/jv/bta_jv_act.cc

+0 −49

Original line number	Diff line number	Diff line
		@@ -91,8 +91,6 @@ static void bta_jv_pm_conn_busy(tBTA_JV_PM_CB* p_cb);
		static void bta_jv_pm_conn_idle(tBTA_JV_PM_CB* p_cb);
		static void bta_jv_pm_state_change(tBTA_JV_PM_CB* p_cb,
		const tBTA_JV_CONN_STATE state);
		tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB* p_cb,
		const tBTA_JV_CONN_STATE new_st);

		/*******************************************************************************
		*
		@@ -1808,53 +1806,6 @@ void bta_jv_set_pm_profile(uint32_t handle, tBTA_JV_PM_ID app_id,
		}
		}

		/*******************************************************************************
		*
		* Function bta_jv_change_pm_state
		*
		* Description change jv pm connect state, used internally
		*
		* Returns void
		*
		******************************************************************************/
		void bta_jv_change_pm_state(tBTA_JV_MSG* p_data) {
		tBTA_JV_API_PM_STATE_CHANGE* p_msg = (tBTA_JV_API_PM_STATE_CHANGE*)p_data;

		if (p_msg->p_cb) bta_jv_pm_state_change(p_msg->p_cb, p_msg->state);
		}

		/*******************************************************************************
		*
		* Function bta_jv_set_pm_conn_state
		*
		* Description Send pm event state change to jv state machine to serialize jv pm
		* changes in relation to other jv messages. internal API use
		* mainly.
		*
		* Params: p_cb: jv pm control block, NULL pointer returns failure
		* new_state: new PM connections state, setting is forced by action
		* function
		*
		* Returns BTA_JV_SUCCESS, BTA_JV_FAILURE (buffer allocation, or NULL ptr!)
		*
		******************************************************************************/
		tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB* p_cb,
		const tBTA_JV_CONN_STATE new_st) {
		if (p_cb == NULL) return BTA_JV_FAILURE;

		APPL_TRACE_API("%s: handle:0x%x, state: %d", __func__, p_cb->handle, new_st);

		tBTA_JV_API_PM_STATE_CHANGE* p_msg = (tBTA_JV_API_PM_STATE_CHANGE*)osi_malloc(
		sizeof(tBTA_JV_API_PM_STATE_CHANGE));
		p_msg->hdr.event = BTA_JV_API_PM_STATE_CHANGE_EVT;
		p_msg->p_cb = p_cb;
		p_msg->state = new_st;

		bta_sys_sendmsg(p_msg);

		return BTA_JV_SUCCESS;
		}

		/*******************************************************************************
		*
		* Function bta_jv_pm_conn_busy

system/bta/jv/bta_jv_int.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		enum {
		/* these events are handled by the state machine */
		BTA_JV_API_START_DISCOVERY_EVT = BTA_SYS_EVT_START(BTA_ID_JV),
		BTA_JV_API_PM_STATE_CHANGE_EVT,
		BTA_JV_MAX_INT_EVT
		};

		@@ -135,20 +134,12 @@ typedef struct {
		uint32_t l2cap_socket_id;
		} tBTA_JV_API_L2CAP_READ;

		/* data type for BTA_JV_API_PM_STATE_CHANGE_EVT */
		typedef struct {
		BT_HDR hdr;
		tBTA_JV_PM_CB* p_cb;
		tBTA_JV_CONN_STATE state;
		} tBTA_JV_API_PM_STATE_CHANGE;

		/* union of all data types */
		typedef union {
		/* GKI event buffer header */
		BT_HDR hdr;
		tBTA_JV_API_START_DISCOVERY start_discovery;
		tBTA_JV_API_L2CAP_READ l2cap_read;
		tBTA_JV_API_PM_STATE_CHANGE change_pm_state;
		} tBTA_JV_MSG;

		/* JV control block */

system/bta/jv/bta_jv_main.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ typedef void (tBTA_JV_ACTION)(tBTA_JV_MSG p_data);
		/* action function list */
		const tBTA_JV_ACTION bta_jv_action[] = {
		bta_jv_start_discovery, /* BTA_JV_API_START_DISCOVERY_EVT */
		bta_jv_change_pm_state, /* BTA_JV_API_PM_STATE_CHANGE_EVT */
		};

		/*******************************************************************************