Remove BTM_OOB_INCLUDED (b4d904de) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -1085,7 +1085,6 @@ void bta_dm_confirm(tBTA_DM_MSG *p_data)
		** Returns void
		**
		*******************************************************************************/
		#if (BTM_OOB_INCLUDED == TRUE)
		void bta_dm_loc_oob(tBTA_DM_MSG *p_data)
		{
		UNUSED(p_data);
		@@ -1129,7 +1128,6 @@ void bta_dm_ci_rmt_oob_act(tBTA_DM_MSG *p_data)
		BTM_RemoteOobDataReply(res, p_data->ci_rmt_oob.bd_addr,
		p_data->ci_rmt_oob.c, p_data->ci_rmt_oob.r );
		}
		#endif /* BTM_OOB_INCLUDED */

		/*******************************************************************************
		**
		@@ -2929,10 +2927,6 @@ static UINT8 bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data)
		bta_dm_co_io_req(p_data->io_req.bd_addr, &p_data->io_req.io_cap,
		&p_data->io_req.oob_data, &p_data->io_req.auth_req, p_data->io_req.is_orig);
		#endif
		#if BTM_OOB_INCLUDED == FALSE
		status = BTM_SUCCESS;
		#endif

		APPL_TRACE_EVENT("io mitm: %d oob_data:%d", p_data->io_req.auth_req, p_data->io_req.oob_data);
		break;
		case BTM_SP_IO_RSP_EVT:
		@@ -3012,7 +3006,6 @@ static UINT8 bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data)

		break;

		#if BTM_OOB_INCLUDED == TRUE
		case BTM_SP_LOC_OOB_EVT:
		bta_dm_co_loc_oob((BOOLEAN)(p_data->loc_oob.status == BTM_SUCCESS),
		p_data->loc_oob.c, p_data->loc_oob.r);
		@@ -3040,7 +3033,7 @@ static UINT8 bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data)

		bta_dm_co_rmt_oob(p_data->rmt_oob.bd_addr);
		break;
		#endif

		case BTM_SP_COMPLT_EVT:
		/* do not report this event - handled by link_key_callback or auth_complete_callback */
		break;
		@@ -4442,9 +4435,6 @@ static UINT8 bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_D
		&p_data->io_req.max_key_size,
		&p_data->io_req.init_keys,
		&p_data->io_req.resp_keys);
		#endif
		#if BTM_OOB_INCLUDED == FALSE
		status = BTM_SUCCESS;
		#endif
		APPL_TRACE_EVENT("io mitm: %d oob_data:%d", p_data->io_req.auth_req, p_data->io_req.oob_data);

system/bta/dm/bta_dm_api.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -447,7 +447,6 @@ void BTA_DmPinReply(BD_ADDR bd_addr, BOOLEAN accept, UINT8 pin_len, UINT8 *p_pin

		}

		#if (BTM_OOB_INCLUDED == TRUE)
		/*******************************************************************************
		**
		** Function BTA_DmLocalOob
		@@ -471,7 +470,7 @@ void BTA_DmLocalOob(void)
		bta_sys_sendmsg(p_msg);
		}
		}
		#endif /* BTM_OOB_INCLUDED */

		/*******************************************************************************
		**
		** Function BTA_DmConfirm

system/bta/dm/bta_dm_ci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		#include "bta_dm_ci.h"


		#if (BTM_OOB_INCLUDED == TRUE)
		/*******************************************************************************
		**
		** Function bta_dm_ci_io_req
		@@ -84,7 +83,6 @@ void bta_dm_ci_rmt_oob(BOOLEAN accept, BD_ADDR bd_addr, BT_OCTET16 c, BT_OCTET16
		bta_sys_sendmsg(p_msg);
		}
		}
		#endif /* BTM_OOB_INCLUDED */

		#if (BTM_SCO_HCI_INCLUDED == TRUE)
		/*******************************************************************************

system/bta/dm/bta_dm_int.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -73,11 +73,9 @@ enum

		BTA_DM_API_SET_ENCRYPTION_EVT,

		#if (BTM_OOB_INCLUDED == TRUE)
		BTA_DM_API_LOC_OOB_EVT,
		BTA_DM_CI_IO_REQ_EVT,
		BTA_DM_CI_RMT_OOB_EVT,
		#endif /* BTM_OOB_INCLUDED */


		#if BLE_INCLUDED == TRUE
		@@ -1142,11 +1140,9 @@ extern void bta_dm_ble_get_energy_info(tBTA_DM_MSG *p_data);
		#endif
		extern void bta_dm_set_encryption(tBTA_DM_MSG *p_data);
		extern void bta_dm_confirm(tBTA_DM_MSG *p_data);
		#if (BTM_OOB_INCLUDED == TRUE)
		extern void bta_dm_loc_oob(tBTA_DM_MSG *p_data);
		extern void bta_dm_ci_io_req_act(tBTA_DM_MSG *p_data);
		extern void bta_dm_ci_rmt_oob_act(tBTA_DM_MSG *p_data);
		#endif /* BTM_OOB_INCLUDED */

		extern void bta_dm_init_pm(void);
		extern void bta_dm_disable_pm(void);

system/bta/dm/bta_dm_main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -70,11 +70,10 @@ const tBTA_DM_ACTION bta_dm_action[] =

		bta_dm_set_encryption, /* BTA_DM_API_SET_ENCRYPTION_EVT */

		#if (BTM_OOB_INCLUDED == TRUE)
		/* out of band pairing events */
		bta_dm_loc_oob, /* 20 BTA_DM_API_LOC_OOB_EVT */
		bta_dm_ci_io_req_act, /* 21 BTA_DM_CI_IO_REQ_EVT */
		bta_dm_ci_rmt_oob_act, /* 22 BTA_DM_CI_RMT_OOB_EVT */
		#endif /* BTM_OOB_INCLUDED */


		#if BLE_INCLUDED == TRUE