Merge "Remove unused btm_process_inq_results" into main (5f12268f) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_inq.cc

+5 −35

Original line number	Diff line number	Diff line
		@@ -25,11 +25,6 @@
		*
		******************************************************************************/

		#include "hci_error_code.h"
		#include "hcidefs.h"
		#include "main/shim/helpers.h"
		#include "neighbor_inquiry.h"
		#include "packet/bit_inserter.h"
		#define LOG_TAG "bluetooth"

		#include <base/logging.h>
		@@ -52,12 +47,15 @@
		#include "include/check.h"
		#include "internal_include/bt_target.h"
		#include "main/shim/entry.h"
		#include "main/shim/helpers.h"
		#include "main/shim/shim.h"
		#include "neighbor_inquiry.h"
		#include "os/log.h"
		#include "osi/include/allocator.h"
		#include "osi/include/osi.h"
		#include "osi/include/properties.h"
		#include "osi/include/stack_power_telemetry.h"
		#include "packet/bit_inserter.h"
		#include "stack/btm/btm_int_types.h"
		#include "stack/btm/btm_sec.h"
		#include "stack/include/acl_api_types.h"
		@@ -68,6 +66,8 @@
		#include "stack/include/btm_api.h"
		#include "stack/include/btm_ble_api.h"
		#include "stack/include/btm_log_history.h"
		#include "stack/include/hci_error_code.h"
		#include "stack/include/hcidefs.h"
		#include "stack/include/hcimsgs.h"
		#include "stack/include/inq_hci_link_interface.h"
		#include "stack/include/main_thread.h"
		@@ -1759,36 +1759,6 @@ static void btm_process_inq_results_extended(bluetooth::hci::EventView event) {
		}
		}

		/*******************************************************************************
		*
		* Function btm_process_inq_results
		*
		* Description This function is called when inquiry results are received
		* from the device. It updates the inquiry database. If the
		* inquiry database is full, the oldest entry is discarded.
		*
		* Parameters inq_res_mode - BTM_INQ_RESULT_STANDARD
		* BTM_INQ_RESULT_WITH_RSSI
		* BTM_INQ_RESULT_EXTENDED
		*
		* Returns void
		*
		******************************************************************************/
		void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode) {
		switch (inq_res_mode) {
		case BTM_INQ_RESULT_STANDARD:
		LOG_ALWAYS_FATAL("Please use PDL for STANDARD results");
		break;
		case BTM_INQ_RESULT_WITH_RSSI:
		LOG_ALWAYS_FATAL("Please use PDL for RSSI results");
		break;
		case BTM_INQ_RESULT_EXTENDED:
		LOG_ALWAYS_FATAL("Please use PDL for EXTENDED results");
		break;
		}
		}

		/*******************************************************************************
		*
		* Function btm_sort_inq_result

system/stack/btu/btu_hcif.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include "main/shim/hci_layer.h"
		#include "os/log.h"
		#include "osi/include/allocator.h"
		#include "stack/btm/neighbor_inquiry.h"
		#include "stack/include/acl_hci_link_interface.h"
		#include "stack/include/ble_acl_interface.h"
		#include "stack/include/ble_hci_link_interface.h"
		@@ -232,9 +231,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
		btu_hcif_log_event_metrics(hci_evt_code, p);

		switch (hci_evt_code) {
		case HCI_EXTENDED_INQUIRY_RESULT_EVT:
		btm_process_inq_results(p, hci_evt_len, BTM_INQ_RESULT_EXTENDED);
		break;
		case HCI_AUTHENTICATION_COMP_EVT:
		btu_hcif_authentication_comp_evt(p);
		break;

system/stack/include/inq_hci_link_interface.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -26,9 +26,6 @@
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME name,
		uint16_t evt_len, tHCI_STATUS hci_status);

		void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode);

		void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode);

		void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data);

system/test/mock/mock_stack_btm_inq.cc

+0 −7

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ struct btm_inq_remote_name_timer_timeout btm_inq_remote_name_timer_timeout;
		struct btm_inq_rmt_name_failed_cancelled btm_inq_rmt_name_failed_cancelled;
		struct btm_inq_stop_on_ssp btm_inq_stop_on_ssp;
		struct btm_process_inq_complete btm_process_inq_complete;
		struct btm_process_inq_results btm_process_inq_results;
		struct btm_process_remote_name btm_process_remote_name;
		struct btm_set_eir_uuid btm_set_eir_uuid;
		struct btm_sort_inq_result btm_sort_inq_result;
		@@ -259,12 +258,6 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) {
		inc_func_call_count(__func__);
		test::mock::stack_btm_inq::btm_process_inq_complete(status, mode);
		}
		void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode) {
		inc_func_call_count(__func__);
		test::mock::stack_btm_inq::btm_process_inq_results(p, hci_evt_len,
		inq_res_mode);
		}
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
		uint16_t evt_len, tHCI_STATUS hci_status) {
		inc_func_call_count(__func__);

system/test/mock/mock_stack_btm_inq.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -439,20 +439,6 @@ struct btm_process_inq_complete {
		};
		extern struct btm_process_inq_complete btm_process_inq_complete;

		// Name: btm_process_inq_results
		// Params: const uint8_t* p, uint8_t hci_evt_len, uint8_t inq_res_mode
		// Return: void
		struct btm_process_inq_results {
		std::function<void(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode)>
		body{[](const uint8_t* /* p /, uint8_t / hci_evt_len */,
		uint8_t /* inq_res_mode */) {}};
		void operator()(const uint8_t* p, uint8_t hci_evt_len, uint8_t inq_res_mode) {
		body(p, hci_evt_len, inq_res_mode);
		};
		};
		extern struct btm_process_inq_results btm_process_inq_results;

		// Name: btm_process_remote_name
		// Params: const RawAddress* bda, const BD_NAME bdn, uint16_t evt_len,
		// tHCI_STATUS hci_status Return: void