aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Manton <cmanton@google.com>2021-08-28 22:59:13 -0700
committerChris Manton <cmanton@google.com>2021-09-05 20:08:17 +0000
commit4be194904e31a034dbf22b0017d0e9b5811aff88 (patch)
treec0d5d24c84b0cdbc5b66c3bbe2a2bcf9dfc9b5cc
parent57d49901abf917d2b696aa587a6e3aee05012283 (diff)
downloadbt-4be194904e31a034dbf22b0017d0e9b5811aff88.tar.gz
legacy: Uninclude unused stack/include/hcimsgs
Bug: 197478351 Tag: #refactor Test: gd/cert/run Change-Id: Ib075e6d524841908e3fb732cc2f3c53b78340c88
-rw-r--r--device/src/controller.cc1
-rw-r--r--hci/src/hci_layer.cc1
-rw-r--r--hci/src/hci_packet_factory.cc1
-rw-r--r--hci/src/hci_packet_parser.cc1
-rw-r--r--stack/acl/btm_acl.cc1
-rw-r--r--stack/acl/btm_ble_connection_establishment.cc1
-rw-r--r--stack/btm/ble_scanner_hci_interface.cc1
-rw-r--r--stack/btm/btm_ble_addr.cc1
-rw-r--r--stack/btm/btm_ble_adv_filter.cc1
-rw-r--r--stack/btm/btm_ble_batchscan.cc1
-rw-r--r--stack/btm/btm_ble_bgconn.cc1
-rw-r--r--stack/btm/btm_ble_cont_energy.cc1
-rw-r--r--stack/btm/btm_ble_gap.cc1
-rw-r--r--stack/btm/btm_ble_privacy.cc1
-rw-r--r--stack/btm/btm_dev.cc1
-rw-r--r--stack/btm/btm_dev.h1
-rw-r--r--stack/btm/btm_devctl.cc1
-rw-r--r--stack/btm/btm_inq.cc1
-rw-r--r--stack/btm/btm_sco.cc2
-rw-r--r--stack/btm/btm_sec.cc1
-rw-r--r--stack/l2cap/l2c_ble.cc1
-rw-r--r--stack/l2cap/l2c_fcr.cc1
-rw-r--r--stack/l2cap/l2c_link.cc1
-rw-r--r--stack/smp/smp_api.cc1
-rw-r--r--stack/smp/smp_keys.cc1
-rw-r--r--stack/test/common/mock_controller.h1
-rw-r--r--stack/test/common/mock_hcic_layer.h1
-rw-r--r--test/mock/mock_device_controller.h1
-rw-r--r--test/mock/mock_stack_btm_ble_adv_filter.cc1
-rw-r--r--test/mock/mock_stack_btm_ble_batchscan.cc1
-rw-r--r--test/mock/mock_stack_btm_ble_bgconn.h1
-rw-r--r--test/mock/mock_stack_btm_ble_gap.cc1
-rw-r--r--test/mock/mock_stack_btm_dev.cc1
-rw-r--r--test/mock/mock_stack_btm_devctl.cc1
-rw-r--r--test/mock/mock_stack_btm_inq.cc1
-rw-r--r--test/mock/mock_stack_btm_sec.cc1
-rw-r--r--test/mock/mock_stack_l2cap_main.cc1
-rw-r--r--test/mock/mock_stack_smp_api.cc1
38 files changed, 0 insertions, 39 deletions
diff --git a/device/src/controller.cc b/device/src/controller.cc
index 3fc3d9f2e..e724b6b76 100644
--- a/device/src/controller.cc
+++ b/device/src/controller.cc
@@ -26,7 +26,6 @@
#include "btcore/include/module.h"
#include "btcore/include/version.h"
#include "check.h"
-#include "hcimsgs.h"
#include "main/shim/controller.h"
#include "main/shim/hci_layer.h"
#include "main/shim/shim.h"
diff --git a/hci/src/hci_layer.cc b/hci/src/hci_layer.cc
index 5fe1a60a7..9d7a7d821 100644
--- a/hci/src/hci_layer.cc
+++ b/hci/src/hci_layer.cc
@@ -46,7 +46,6 @@
#include "hci/include/buffer_allocator.h"
#include "hci_inject.h"
#include "hci_internals.h"
-#include "hcimsgs.h"
#include "main/shim/shim.h"
#include "osi/include/alarm.h"
#include "osi/include/list.h"
diff --git a/hci/src/hci_packet_factory.cc b/hci/src/hci_packet_factory.cc
index 904fe3607..71b71af82 100644
--- a/hci/src/hci_packet_factory.cc
+++ b/hci/src/hci_packet_factory.cc
@@ -24,7 +24,6 @@
#include "hci_layer.h"
#include "hci_packet_factory.h"
#include "hcidefs.h"
-#include "hcimsgs.h"
#include "osi/include/allocator.h"
#include "stack/include/bt_hdr.h"
diff --git a/hci/src/hci_packet_parser.cc b/hci/src/hci_packet_parser.cc
index b1ddc0f7f..5f03e293e 100644
--- a/hci/src/hci_packet_parser.cc
+++ b/hci/src/hci_packet_parser.cc
@@ -25,7 +25,6 @@
#include "check.h"
#include "hci/include/buffer_allocator.h"
#include "hci_layer.h"
-#include "hcimsgs.h"
#include "osi/include/log.h"
#include "stack/include/hcidefs.h"
diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc
index 90f70ad79..cfb579c76 100644
--- a/stack/acl/btm_acl.cc
+++ b/stack/acl/btm_acl.cc
@@ -62,7 +62,6 @@
#include "stack/include/btm_iso_api.h"
#include "stack/include/btu.h"
#include "stack/include/hci_error_code.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/l2cap_acl_interface.h"
#include "stack/include/sco_hci_link_interface.h"
#include "types/hci_role.h"
diff --git a/stack/acl/btm_ble_connection_establishment.cc b/stack/acl/btm_ble_connection_establishment.cc
index 5df2f551f..9df73f93e 100644
--- a/stack/acl/btm_ble_connection_establishment.cc
+++ b/stack/acl/btm_ble_connection_establishment.cc
@@ -31,7 +31,6 @@
#include "stack/include/acl_api.h"
#include "stack/include/ble_acl_interface.h"
#include "stack/include/ble_hci_link_interface.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/l2cap_hci_link_interface.h"
#include "stack/include/stack_metrics_logging.h"
diff --git a/stack/btm/ble_scanner_hci_interface.cc b/stack/btm/ble_scanner_hci_interface.cc
index b7ef8e944..d3fcde7a4 100644
--- a/stack/btm/ble_scanner_hci_interface.cc
+++ b/stack/btm/ble_scanner_hci_interface.cc
@@ -22,7 +22,6 @@
#include "acl_api.h"
#include "btm_api.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "osi/include/log.h"
diff --git a/stack/btm/btm_ble_addr.cc b/stack/btm/btm_ble_addr.cc
index a8dcbf5f8..faa97274c 100644
--- a/stack/btm/btm_ble_addr.cc
+++ b/stack/btm/btm_ble_addr.cc
@@ -28,7 +28,6 @@
#include "btu.h"
#include "device/include/controller.h"
#include "gap_api.h"
-#include "hcimsgs.h"
#include "btm_ble_int.h"
#include "main/shim/shim.h"
diff --git a/stack/btm/btm_ble_adv_filter.cc b/stack/btm/btm_ble_adv_filter.cc
index 5a1783f00..f0f384e3a 100644
--- a/stack/btm/btm_ble_adv_filter.cc
+++ b/stack/btm/btm_ble_adv_filter.cc
@@ -25,7 +25,6 @@
#include "btm_int.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/btm_int_types.h"
#include "utils/include/bt_utils.h"
diff --git a/stack/btm/btm_ble_batchscan.cc b/stack/btm/btm_ble_batchscan.cc
index 70f785510..65732a5f9 100644
--- a/stack/btm/btm_ble_batchscan.cc
+++ b/stack/btm/btm_ble_batchscan.cc
@@ -26,7 +26,6 @@
#include "btm_int.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_int_types.h"
#include "utils/include/bt_utils.h"
diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc
index 93b680241..fa9b10b38 100644
--- a/stack/btm/btm_ble_bgconn.cc
+++ b/stack/btm/btm_ble_bgconn.cc
@@ -33,7 +33,6 @@
#include "stack/btm/btm_int_types.h"
#include "stack/btm/security_device_record.h"
#include "stack/include/bt_types.h"
-#include "stack/include/hcimsgs.h"
#include "types/raw_address.h"
extern tBTM_CB btm_cb;
diff --git a/stack/btm/btm_ble_cont_energy.cc b/stack/btm/btm_ble_cont_energy.cc
index 018089086..056667cc6 100644
--- a/stack/btm/btm_ble_cont_energy.cc
+++ b/stack/btm/btm_ble_cont_energy.cc
@@ -22,7 +22,6 @@
#include "btm_ble_api.h"
#include "btm_int.h"
#include "btu.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_int_types.h"
#include "utils/include/bt_utils.h"
diff --git a/stack/btm/btm_ble_gap.cc b/stack/btm/btm_ble_gap.cc
index e7814b131..7d675c824 100644
--- a/stack/btm/btm_ble_gap.cc
+++ b/stack/btm/btm_ble_gap.cc
@@ -50,7 +50,6 @@
#include "stack/include/btm_api_types.h"
#include "stack/include/gap_api.h"
#include "stack/include/hci_error_code.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/inq_hci_link_interface.h"
#include "types/raw_address.h"
diff --git a/stack/btm/btm_ble_privacy.cc b/stack/btm/btm_ble_privacy.cc
index d820396e5..999d9d361 100644
--- a/stack/btm/btm_ble_privacy.cc
+++ b/stack/btm/btm_ble_privacy.cc
@@ -28,7 +28,6 @@
#include "btm_int.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_dev.h"
#include "vendor_hcidefs.h"
diff --git a/stack/btm/btm_dev.cc b/stack/btm/btm_dev.cc
index 593876058..684ab4956 100644
--- a/stack/btm/btm_dev.cc
+++ b/stack/btm/btm_dev.cc
@@ -31,7 +31,6 @@
#include "btm_api.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "main/shim/btm_api.h"
#include "main/shim/shim.h"
diff --git a/stack/btm/btm_dev.h b/stack/btm/btm_dev.h
index 985d0343f..9e6d2b02e 100644
--- a/stack/btm/btm_dev.h
+++ b/stack/btm/btm_dev.h
@@ -18,7 +18,6 @@
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/security_device_record.h"
#include "stack/include/acl_api.h"
-#include "stack/include/hcimsgs.h"
#include "types/raw_address.h"
/*******************************************************************************
diff --git a/stack/btm/btm_devctl.cc b/stack/btm/btm_devctl.cc
index 4be71eb18..41f67410c 100644
--- a/stack/btm/btm_devctl.cc
+++ b/stack/btm/btm_devctl.cc
@@ -37,7 +37,6 @@
#include "common/message_loop_thread.h"
#include "device/include/controller.h"
#include "hci/include/hci_layer.h"
-#include "hcimsgs.h"
#include "main/shim/btm_api.h"
#include "main/shim/controller.h"
#include "main/shim/hci_layer.h"
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 7ccf3a8e3..16125d413 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -48,7 +48,6 @@
#include "stack/include/btm_api.h"
#include "stack/include/btm_ble_api.h"
#include "stack/include/btu.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/inq_hci_link_interface.h"
extern tBTM_CB btm_cb;
diff --git a/stack/btm/btm_sco.cc b/stack/btm/btm_sco.cc
index 2a1017a78..be786b242 100644
--- a/stack/btm/btm_sco.cc
+++ b/stack/btm/btm_sco.cc
@@ -37,8 +37,6 @@
#include "stack/include/btm_api.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/hci_error_code.h"
-#include "stack/include/hcidefs.h"
-#include "stack/include/hcimsgs.h"
#include "types/class_of_device.h"
#include "types/raw_address.h"
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index cd2c30f12..7571d2d37 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -35,7 +35,6 @@
#include "common/metrics.h"
#include "common/time_util.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "main/shim/btm_api.h"
#include "main/shim/dumpsys.h"
diff --git a/stack/l2cap/l2c_ble.cc b/stack/l2cap/l2c_ble.cc
index b826dc19c..aa20d392b 100644
--- a/stack/l2cap/l2c_ble.cc
+++ b/stack/l2cap/l2c_ble.cc
@@ -30,7 +30,6 @@
#include "bt_target.h"
#include "bta_hearing_aid_api.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "l2c_int.h"
#include "l2cdefs.h"
diff --git a/stack/l2cap/l2c_fcr.cc b/stack/l2cap/l2c_fcr.cc
index 9e9cd059c..061f102d4 100644
--- a/stack/l2cap/l2c_fcr.cc
+++ b/stack/l2cap/l2c_fcr.cc
@@ -31,7 +31,6 @@
#include "bt_common.h"
#include "btu.h"
#include "common/time_util.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "l2c_int.h"
#include "l2cdefs.h"
diff --git a/stack/l2cap/l2c_link.cc b/stack/l2cap/l2c_link.cc
index 75e7e2592..c690b09e8 100644
--- a/stack/l2cap/l2c_link.cc
+++ b/stack/l2cap/l2c_link.cc
@@ -36,7 +36,6 @@
#include "stack/include/acl_api.h"
#include "stack/include/bt_types.h"
#include "stack/include/hci_error_code.h"
-#include "stack/include/hcimsgs.h"
#include "stack/l2cap/l2c_int.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
diff --git a/stack/smp/smp_api.cc b/stack/smp/smp_api.cc
index 164971dfc..567ec245e 100644
--- a/stack/smp/smp_api.cc
+++ b/stack/smp/smp_api.cc
@@ -31,7 +31,6 @@
#include "gd/os/log.h"
#include "gd/os/rand.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "l2cdefs.h"
#include "main/shim/shim.h"
diff --git a/stack/smp/smp_keys.cc b/stack/smp/smp_keys.cc
index e6dd693df..a49890d83 100644
--- a/stack/smp/smp_keys.cc
+++ b/stack/smp/smp_keys.cc
@@ -29,7 +29,6 @@
#include "btm_ble_api.h"
#include "btm_ble_int.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "osi/include/osi.h"
#include "p_256_ecc_pp.h"
#include "smp_int.h"
diff --git a/stack/test/common/mock_controller.h b/stack/test/common/mock_controller.h
index 137ca2bcb..74ee5fc94 100644
--- a/stack/test/common/mock_controller.h
+++ b/stack/test/common/mock_controller.h
@@ -19,7 +19,6 @@
#include <base/callback.h>
#include <gmock/gmock.h>
-#include "hcimsgs.h"
namespace controller {
class ControllerInterface {
diff --git a/stack/test/common/mock_hcic_layer.h b/stack/test/common/mock_hcic_layer.h
index c7ad5eca6..680dad8be 100644
--- a/stack/test/common/mock_hcic_layer.h
+++ b/stack/test/common/mock_hcic_layer.h
@@ -22,7 +22,6 @@
#include <array>
#include "btm_iso_api_types.h"
-#include "hcimsgs.h"
namespace hcic {
class HcicInterface {
diff --git a/test/mock/mock_device_controller.h b/test/mock/mock_device_controller.h
index 8d8a9d999..2acccde01 100644
--- a/test/mock/mock_device_controller.h
+++ b/test/mock/mock_device_controller.h
@@ -37,7 +37,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "btcore/include/module.h"
#include "btcore/include/version.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "main/shim/controller.h"
#include "main/shim/shim.h"
#include "osi/include/future.h"
diff --git a/test/mock/mock_stack_btm_ble_adv_filter.cc b/test/mock/mock_stack_btm_ble_adv_filter.cc
index 9b8a20ef6..8d28852f9 100644
--- a/test/mock/mock_stack_btm_ble_adv_filter.cc
+++ b/test/mock/mock_stack_btm_ble_adv_filter.cc
@@ -33,7 +33,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "btm_ble_api.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/btm_int_types.h"
#include "utils/include/bt_utils.h"
diff --git a/test/mock/mock_stack_btm_ble_batchscan.cc b/test/mock/mock_stack_btm_ble_batchscan.cc
index 3a2209fe6..b1c4fd298 100644
--- a/test/mock/mock_stack_btm_ble_batchscan.cc
+++ b/test/mock/mock_stack_btm_ble_batchscan.cc
@@ -33,7 +33,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "btm_ble_api.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "stack/btm/btm_int_types.h"
#include "utils/include/bt_utils.h"
diff --git a/test/mock/mock_stack_btm_ble_bgconn.h b/test/mock/mock_stack_btm_ble_bgconn.h
index 8e1ed0c51..68e308df3 100644
--- a/test/mock/mock_stack_btm_ble_bgconn.h
+++ b/test/mock/mock_stack_btm_ble_bgconn.h
@@ -43,7 +43,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "stack/btm/btm_dev.h"
#include "stack/btm/btm_int_types.h"
#include "stack/btm/security_device_record.h"
-#include "stack/include/hcimsgs.h"
#include "types/raw_address.h"
// Mocked compile conditionals, if any
diff --git a/test/mock/mock_stack_btm_ble_gap.cc b/test/mock/mock_stack_btm_ble_gap.cc
index 8701547cc..19386a741 100644
--- a/test/mock/mock_stack_btm_ble_gap.cc
+++ b/test/mock/mock_stack_btm_ble_gap.cc
@@ -46,7 +46,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "stack/include/btm_api_types.h"
#include "stack/include/gap_api.h"
#include "stack/include/hci_error_code.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/inq_hci_link_interface.h"
#include "types/raw_address.h"
diff --git a/test/mock/mock_stack_btm_dev.cc b/test/mock/mock_stack_btm_dev.cc
index 565bac99f..047ab6a7b 100644
--- a/test/mock/mock_stack_btm_dev.cc
+++ b/test/mock/mock_stack_btm_dev.cc
@@ -32,7 +32,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "btm_api.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "main/shim/btm_api.h"
#include "main/shim/shim.h"
diff --git a/test/mock/mock_stack_btm_devctl.cc b/test/mock/mock_stack_btm_devctl.cc
index 986520234..53016b6d9 100644
--- a/test/mock/mock_stack_btm_devctl.cc
+++ b/test/mock/mock_stack_btm_devctl.cc
@@ -36,7 +36,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "common/message_loop_thread.h"
#include "device/include/controller.h"
#include "hci/include/hci_layer.h"
-#include "hcimsgs.h"
#include "main/shim/btm_api.h"
#include "main/shim/controller.h"
#include "main/shim/shim.h"
diff --git a/test/mock/mock_stack_btm_inq.cc b/test/mock/mock_stack_btm_inq.cc
index 9121ef86c..d44282ece 100644
--- a/test/mock/mock_stack_btm_inq.cc
+++ b/test/mock/mock_stack_btm_inq.cc
@@ -43,7 +43,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "stack/btm/btm_int_types.h"
#include "stack/include/acl_api.h"
#include "stack/include/btm_ble_api.h"
-#include "stack/include/hcimsgs.h"
#include "stack/include/inq_hci_link_interface.h"
#ifndef UNUSED_ATTR
diff --git a/test/mock/mock_stack_btm_sec.cc b/test/mock/mock_stack_btm_sec.cc
index 8b0cbe824..210e3566f 100644
--- a/test/mock/mock_stack_btm_sec.cc
+++ b/test/mock/mock_stack_btm_sec.cc
@@ -32,7 +32,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include "common/metrics.h"
#include "common/time_util.h"
#include "device/include/controller.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "main/shim/btm_api.h"
#include "main/shim/dumpsys.h"
diff --git a/test/mock/mock_stack_l2cap_main.cc b/test/mock/mock_stack_l2cap_main.cc
index 586c59e6d..fb14fa6cd 100644
--- a/test/mock/mock_stack_l2cap_main.cc
+++ b/test/mock/mock_stack_l2cap_main.cc
@@ -27,7 +27,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include <string.h>
#include "bt_common.h"
#include "bt_target.h"
-#include "hcimsgs.h"
#include "l2c_api.h"
#include "l2cdefs.h"
#include "main/shim/shim.h"
diff --git a/test/mock/mock_stack_smp_api.cc b/test/mock/mock_stack_smp_api.cc
index 6d6335a47..5193c9aaa 100644
--- a/test/mock/mock_stack_smp_api.cc
+++ b/test/mock/mock_stack_smp_api.cc
@@ -26,7 +26,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include <string.h>
#include "bt_target.h"
-#include "hcimsgs.h"
#include "main/shim/shim.h"
#include "stack/btm/btm_dev.h"
#include "stack/include/l2c_api.h"