Use bt_bdaddr_t instead of BD_ADDR in HID related code (3f38645b) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_pm.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -779,7 +779,7 @@ static void bta_dm_pm_ssr(const bt_bdaddr_t& peer_addr) {
		* from BTA HH */
		if (p_bta_dm_pm_spec[p_bta_dm_pm_cfg[j].spec_idx].ssr ==
		BTA_DM_PM_SSR_HH) {
		if (bta_hh_read_ssr_param(to_BD_ADDR(peer_addr), &p_spec_cur->max_lat,
		if (bta_hh_read_ssr_param(peer_addr, &p_spec_cur->max_lat,
		&p_spec_cur->min_rmt_to) == BTA_HH_ERR)
		continue;
		}

system/bta/hd/bta_hd_act.cc

+22 −22

Original line number	Diff line number	Diff line
		@@ -38,8 +38,8 @@

		#include "osi/include/osi.h"

		static void bta_hd_cback(BD_ADDR bd_addr, uint8_t event, uint32_t data,
		BT_HDR* pdata);
		static void bta_hd_cback(const bt_bdaddr_t& bd_addr, uint8_t event,
		uint32_t data, BT_HDR* pdata);

		static bool check_descriptor(uint8_t* data, uint16_t length,
		bool* has_report_id) {
		@@ -285,7 +285,7 @@ extern void bta_hd_connect_act(tBTA_HD_DATA* p_data) {
		return;
		}

		bdcpy(cback_data.conn.bda, p_ctrl->addr);
		cback_data.conn.bda = p_ctrl->addr;
		cback_data.conn.status = BTHD_CONN_STATE_CONNECTING;

		bta_hd_cb.p_cback(BTA_HD_CONN_STATE_EVT, &cback_data);
		@@ -377,8 +377,8 @@ extern void bta_hd_send_report_act(tBTA_HD_DATA* p_data) {
		p_report->data);

		/* trigger PM */
		bta_sys_busy(BTA_ID_HD, 1, bta_hd_cb.bd_addr);
		bta_sys_idle(BTA_ID_HD, 1, bta_hd_cb.bd_addr);
		bta_sys_busy(BTA_ID_HD, 1, to_BD_ADDR(bta_hd_cb.bd_addr));
		bta_sys_idle(BTA_ID_HD, 1, to_BD_ADDR(bta_hd_cb.bd_addr));
		}

		/*******************************************************************************
		@@ -427,8 +427,8 @@ extern void bta_hd_vc_unplug_act(UNUSED_ATTR tBTA_HD_DATA* p_data) {
		}

		/* trigger PM */
		bta_sys_busy(BTA_ID_HD, 1, bta_hd_cb.bd_addr);
		bta_sys_idle(BTA_ID_HD, 1, bta_hd_cb.bd_addr);
		bta_sys_busy(BTA_ID_HD, 1, to_BD_ADDR(bta_hd_cb.bd_addr));
		bta_sys_idle(BTA_ID_HD, 1, to_BD_ADDR(bta_hd_cb.bd_addr));
		}

		/*******************************************************************************
		@@ -447,10 +447,10 @@ extern void bta_hd_open_act(tBTA_HD_DATA* p_data) {
		APPL_TRACE_API("%s", __func__);

		HID_DevPlugDevice(p_cback->addr);
		bta_sys_conn_open(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_conn_open(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));

		bdcpy(cback_data.conn.bda, p_cback->addr);
		bdcpy(bta_hd_cb.bd_addr, p_cback->addr);
		cback_data.conn.bda = p_cback->addr;
		bta_hd_cb.bd_addr = p_cback->addr;

		bta_hd_cb.p_cback(BTA_HD_OPEN_EVT, &cback_data);
		}
		@@ -471,7 +471,7 @@ extern void bta_hd_close_act(tBTA_HD_DATA* p_data) {

		APPL_TRACE_API("%s", __func__);

		bta_sys_conn_close(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_conn_close(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));

		if (bta_hd_cb.vc_unplug) {
		bta_hd_cb.vc_unplug = FALSE;
		@@ -479,8 +479,8 @@ extern void bta_hd_close_act(tBTA_HD_DATA* p_data) {
		cback_event = BTA_HD_VC_UNPLUG_EVT;
		}

		bdcpy(cback_data.conn.bda, p_cback->addr);
		memset(bta_hd_cb.bd_addr, 0, sizeof(BD_ADDR));
		cback_data.conn.bda = p_cback->addr;
		bta_hd_cb.bd_addr = {.address = {0}};

		bta_hd_cb.p_cback(cback_event, &cback_data);
		}
		@@ -624,12 +624,12 @@ extern void bta_hd_vc_unplug_done_act(tBTA_HD_DATA* p_data) {

		APPL_TRACE_API("%s", __func__);

		bta_sys_conn_close(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_conn_close(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));

		HID_DevUnplugDevice(p_cback->addr);

		bdcpy(cback_data.conn.bda, p_cback->addr);
		bdcpy(bta_hd_cb.bd_addr, p_cback->addr);
		cback_data.conn.bda = p_cback->addr;
		bta_hd_cb.bd_addr = p_cback->addr;

		(*bta_hd_cb.p_cback)(BTA_HD_VC_UNPLUG_EVT, &cback_data);
		}
		@@ -648,7 +648,7 @@ extern void bta_hd_suspend_act(tBTA_HD_DATA* p_data) {

		APPL_TRACE_API("%s", __func__);

		bta_sys_idle(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_idle(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));
		}

		/*******************************************************************************
		@@ -665,8 +665,8 @@ extern void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data) {

		APPL_TRACE_API("%s", __func__);

		bta_sys_busy(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_idle(BTA_ID_HD, 1, p_cback->addr);
		bta_sys_busy(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));
		bta_sys_idle(BTA_ID_HD, 1, to_BD_ADDR(p_cback->addr));
		}

		/*******************************************************************************
		@@ -678,8 +678,8 @@ extern void bta_hd_exit_suspend_act(tBTA_HD_DATA* p_data) {
		* Returns void
		*
		******************************************************************************/
		static void bta_hd_cback(BD_ADDR bd_addr, uint8_t event, uint32_t data,
		BT_HDR* pdata) {
		static void bta_hd_cback(const bt_bdaddr_t& bd_addr, uint8_t event,
		uint32_t data, BT_HDR* pdata) {
		tBTA_HD_CBACK_DATA* p_buf = NULL;
		uint16_t sm_event = BTA_HD_INVALID_EVT;

		@@ -727,7 +727,7 @@ static void bta_hd_cback(BD_ADDR bd_addr, uint8_t event, uint32_t data,
		(p_buf = (tBTA_HD_CBACK_DATA*)osi_malloc(sizeof(tBTA_HD_CBACK_DATA) +
		sizeof(BT_HDR))) != NULL) {
		p_buf->hdr.event = sm_event;
		bdcpy(p_buf->addr, bd_addr);
		p_buf->addr = bd_addr;
		p_buf->data = data;
		p_buf->p_data = pdata;

system/bta/hd/bta_hd_api.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -218,14 +218,14 @@ extern void BTA_HdVirtualCableUnplug(void) {
		* Returns void
		*
		******************************************************************************/
		extern void BTA_HdConnect(BD_ADDR addr) {
		extern void BTA_HdConnect(const bt_bdaddr_t& addr) {
		APPL_TRACE_API("%s", __func__);

		tBTA_HD_DEVICE_CTRL* p_buf =
		(tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));
		p_buf->hdr.event = BTA_HD_API_CONNECT_EVT;

		memcpy(p_buf->addr, addr, sizeof(BD_ADDR));
		p_buf->addr = addr;

		bta_sys_sendmsg(p_buf);
		}
		@@ -256,13 +256,13 @@ extern void BTA_HdDisconnect(void) {
		* Returns void
		*
		******************************************************************************/
		extern void BTA_HdAddDevice(BD_ADDR addr) {
		extern void BTA_HdAddDevice(const bt_bdaddr_t& addr) {
		APPL_TRACE_API("%s", __func__);
		tBTA_HD_DEVICE_CTRL* p_buf =
		(tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));
		p_buf->hdr.event = BTA_HD_API_ADD_DEVICE_EVT;

		memcpy(p_buf->addr, addr, sizeof(BD_ADDR));
		p_buf->addr = addr;

		bta_sys_sendmsg(p_buf);
		}
		@@ -276,13 +276,13 @@ extern void BTA_HdAddDevice(BD_ADDR addr) {
		* Returns void
		*
		******************************************************************************/
		extern void BTA_HdRemoveDevice(BD_ADDR addr) {
		extern void BTA_HdRemoveDevice(const bt_bdaddr_t& addr) {
		APPL_TRACE_API("%s", __func__);
		tBTA_HD_DEVICE_CTRL* p_buf =
		(tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));
		p_buf->hdr.event = BTA_HD_API_REMOVE_DEVICE_EVT;

		memcpy(p_buf->addr, addr, sizeof(BD_ADDR));
		p_buf->addr = addr;

		bta_sys_sendmsg(p_buf);
		}

system/bta/hd/bta_hd_int.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ typedef struct {

		typedef struct {
		BT_HDR hdr;
		BD_ADDR addr;
		bt_bdaddr_t addr;
		} tBTA_HD_DEVICE_CTRL;

		typedef struct {
		@@ -121,7 +121,7 @@ typedef union {

		typedef struct {
		BT_HDR hdr;
		BD_ADDR addr;
		bt_bdaddr_t addr;
		uint32_t data;
		BT_HDR* p_data;
		} tBTA_HD_CBACK_DATA;
		@@ -134,7 +134,7 @@ typedef struct {
		uint32_t sdp_handle;
		uint8_t trace_level;
		uint8_t state;
		BD_ADDR bd_addr;
		bt_bdaddr_t bd_addr;
		bool use_report_id;
		bool boot_mode;
		bool vc_unplug;

system/bta/hh/bta_hh_act.cc

+24 −24

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@
		/*****************************************************************************
		* Local Function prototypes
		****************************************************************************/
		static void bta_hh_cback(uint8_t dev_handle, BD_ADDR addr, uint8_t event,
		uint32_t data, BT_HDR* pdata);
		static void bta_hh_cback(uint8_t dev_handle, const bt_bdaddr_t& addr,
		uint8_t event, uint32_t data, BT_HDR* pdata);
		static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result);

		#if (BTA_HH_DEBUG == TRUE)
		@@ -342,8 +342,8 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		(tSDP_DISCOVERY_DB*)osi_malloc(p_bta_hh_cfg->sdp_db_size);
		bta_hh_cb.p_cur = p_cb;
		/* do DI discovery first */
		if (SDP_DiDiscover(p_data->api_conn.bd_addr, bta_hh_cb.p_disc_db,
		p_bta_hh_cfg->sdp_db_size,
		if (SDP_DiDiscover(to_BD_ADDR(p_data->api_conn.bd_addr),
		bta_hh_cb.p_disc_db, p_bta_hh_cfg->sdp_db_size,
		bta_hh_di_sdp_cback) != SDP_SUCCESS) {
		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("%s: SDP_DiDiscover failed: Status 0x%2X", __func__,
		@@ -393,7 +393,7 @@ void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		/* initialize call back data */
		memset((void*)&conn_dat, 0, sizeof(tBTA_HH_CONN));
		conn_dat.handle = p_cb->hid_handle;
		bdcpy(conn_dat.bda, p_cb->addr);
		conn_dat.bda = p_cb->addr;

		/* if SDP compl success */
		if (status == BTA_HH_OK) {
		@@ -508,7 +508,7 @@ void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

		memset((void*)&conn, 0, sizeof(tBTA_HH_CONN));
		conn.handle = dev_handle;
		bdcpy(conn.bda, p_cb->addr);
		conn.bda = p_cb->addr;

		/* increase connection number */
		bta_hh_cb.cnt_num++;
		@@ -526,7 +526,7 @@ void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		#endif
		{
		/* inform role manager */
		bta_sys_conn_open(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_conn_open(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		}
		/* set protocol mode when not default report mode */
		if (p_cb->mode != BTA_HH_PROTO_RPT_MODE
		@@ -583,7 +583,7 @@ void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		p_cb->incoming_hid_handle = dev_handle;

		memset(&conn_data, 0, sizeof(tBTA_HH_API_CONN));
		bdcpy(conn_data.bd_addr, p_cb->addr);
		conn_data.bd_addr = p_cb->addr;
		bta_hh_start_sdp(p_cb, (tBTA_HH_DATA*)&conn_data);
		}

		@@ -664,7 +664,7 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		case BTA_HH_OPEN_EVT:
		conn.status = p_data->hid_cback.data ? BTA_HH_ERR_PROTO : BTA_HH_OK;
		conn.handle = p_cb->hid_handle;
		bdcpy(conn.bda, p_cb->addr);
		conn.bda = p_cb->addr;
		(bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH)&conn);
		#if (BTA_HH_DEBUG == TRUE)
		bta_hh_trace_dev_db();
		@@ -679,7 +679,7 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		}

		/* transaction achknoledgement received, inform PM for mode change */
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		return;
		}
		/*******************************************************************************
		@@ -739,8 +739,8 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		}

		/* inform PM for mode change */
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));

		(bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH)&hs_data);

		@@ -767,7 +767,7 @@ void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		conn_dat.handle = p_cb->hid_handle;
		conn_dat.status =
		(reason == HID_ERR_AUTH_FAILED) ? BTA_HH_ERR_AUTH_FAILED : BTA_HH_ERR;
		bdcpy(conn_dat.bda, p_cb->addr);
		conn_dat.bda = p_cb->addr;
		HID_HostCloseDev(p_cb->hid_handle);

		/* Report OPEN fail event */
		@@ -823,7 +823,7 @@ void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		conn_dat.handle = p_cb->hid_handle;
		conn_dat.status =
		(reason == HID_ERR_AUTH_FAILED) ? BTA_HH_ERR_AUTH_FAILED : BTA_HH_ERR;
		bdcpy(conn_dat.bda, p_cb->addr);
		conn_dat.bda = p_cb->addr;
		HID_HostCloseDev(p_cb->hid_handle);

		/* Report OPEN fail event */
		@@ -839,7 +839,7 @@ void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		/* finaliza device driver */
		bta_hh_co_close(p_cb->hid_handle, p_cb->app_id);
		/* inform role manager */
		bta_sys_conn_close(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_conn_close(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		/* update total conn number */
		bta_hh_cb.cnt_num--;

		@@ -910,7 +910,7 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

		switch (p_dev_info->sub_event) {
		case BTA_HH_ADD_DEV_EVT: /* add a device */
		bdcpy(dev_info.bda, p_dev_info->bda);
		dev_info.bda = p_dev_info->bda;
		/* initialize callback data */
		if (p_cb->hid_handle == BTA_HH_INVALID_HANDLE) {
		#if (BTA_HH_LE_INCLUDED == TRUE)
		@@ -958,7 +958,7 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		break;
		case BTA_HH_RMV_DEV_EVT: /* remove device */
		dev_info.handle = (uint8_t)p_dev_info->hdr.layer_specific;
		bdcpy(dev_info.bda, p_cb->addr);
		dev_info.bda = p_cb->addr;

		#if (BTA_HH_LE_INCLUDED == TRUE)
		if (p_cb->is_le_device) {
		@@ -1063,12 +1063,12 @@ void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		/* if not control type transaction, notify PM for energy control */
		if (p_data->api_sndcmd.t_type != HID_TRANS_CONTROL) {
		/* inform PM for mode change */
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		bta_sys_idle(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		} else if (p_data->api_sndcmd.param == BTA_HH_CTRL_SUSPEND) {
		bta_sys_sco_close(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_sco_close(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		} else if (p_data->api_sndcmd.param == BTA_HH_CTRL_EXIT_SUSPEND) {
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, p_cb->addr);
		bta_sys_busy(BTA_ID_HH, p_cb->app_id, to_BD_ADDR(p_cb->addr));
		}
		}
		}
		@@ -1088,8 +1088,8 @@ void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
		* Returns void
		*
		******************************************************************************/
		static void bta_hh_cback(uint8_t dev_handle, BD_ADDR addr, uint8_t event,
		uint32_t data, BT_HDR* pdata) {
		static void bta_hh_cback(uint8_t dev_handle, const bt_bdaddr_t& addr,
		uint8_t event, uint32_t data, BT_HDR* pdata) {
		uint16_t sm_event = BTA_HH_INVALID_EVT;
		uint8_t xx = 0;

		@@ -1137,7 +1137,7 @@ static void bta_hh_cback(uint8_t dev_handle, BD_ADDR addr, uint8_t event,
		p_buf->hdr.event = sm_event;
		p_buf->hdr.layer_specific = (uint16_t)dev_handle;
		p_buf->data = data;
		bdcpy(p_buf->addr, addr);
		p_buf->addr = addr;
		p_buf->p_data = pdata;

		bta_sys_sendmsg(p_buf);