Add header declarations

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Test: acts -tc BleCocTest
Change-Id: Ic0897e2cbfe1a61697d3837fceb40138b60783c2

diff --git a/stack/btm/btm_ble_gap.cc b/stack/btm/btm_ble_gap.cc
index 04c7c8a..a3daf5c 100644 (file)
--- a/stack/btm/btm_ble_gap.cc
+++ b/stack/btm/btm_ble_gap.cc
@@ -47,10 +47,15 @@
 #include "stack/include/btm_api_types.h"
 #include "stack/include/gap_api.h"
 #include "stack/include/hcimsgs.h"
+#include "stack/include/inq_hci_link_interface.h"
 #include "types/raw_address.h"
 
 extern tBTM_CB btm_cb;
 
+extern void btm_inq_remote_name_timer_timeout(void* data);
+extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,
+                                     const RawAddress& new_pseudo_addr);
+
 #define BTM_EXT_BLE_RMT_NAME_TIMEOUT_MS (30 * 1000)
 #define MIN_ADV_LENGTH 2
 #define BTM_VSC_CHIP_CAPABILITY_RSP_LEN 9

diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 100d176..3b748f3 100644 (file)
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -46,6 +46,9 @@
 #include "main/shim/btm_api.h"
 #include "main/shim/shim.h"
 #include "stack/include/acl_api.h"
+#include "stack/include/inq_hci_link_interface.h"
+
+extern void btm_inq_remote_name_timer_timeout(void* data);
 
 using bluetooth::Uuid;
 

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 7ea8f9a..fb70e55 100644 (file)
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -39,6 +39,7 @@
 #include "osi/include/osi.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/acl_api.h"
+#include "stack/include/acl_hci_link_interface.h"
 #include "stack/include/l2cap_security_interface.h"
 
 #include "bt_types.h"
@@ -52,8 +53,11 @@
 void btm_inq_stop_on_ssp(void);
 extern void btm_ble_advertiser_notify_terminated_legacy(
     uint8_t status, uint16_t connection_handle);
+extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,
+                                     const RawAddress& new_pseudo_addr);
 extern void bta_dm_remove_device(const RawAddress& bd_addr);
 extern void bta_dm_process_remove_device(const RawAddress& bd_addr);
+extern void btm_inq_clear_ssp(void);
 
 /*******************************************************************************
  *             L O C A L    F U N C T I O N     P R O T O T Y P E S            *

diff --git a/stack/hcic/hcicmds.cc b/stack/hcic/hcicmds.cc
index f9bdffa..36a4b66 100644 (file)
--- a/stack/hcic/hcicmds.cc
+++ b/stack/hcic/hcicmds.cc
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "btm_int.h" /* Included for UIPC_* macro definitions */
+#include "stack/include/acl_hci_link_interface.h"
 
 void btsnd_hcic_inquiry(const LAP inq_lap, uint8_t duration,
                         uint8_t response_cnt) {

diff --git a/stack/include/acl_hci_link_interface.h b/stack/include/acl_hci_link_interface.h
index 0bd4786..9ca674e 100644 (file)
--- a/stack/include/acl_hci_link_interface.h
+++ b/stack/include/acl_hci_link_interface.h
@@ -26,6 +26,8 @@ void btm_acl_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
                        uint8_t enc_mode);
 void btm_acl_encrypt_change(uint16_t handle, uint8_t status,
                             uint8_t encr_enable);
+void btm_acl_paging(BT_HDR* p, const RawAddress& dest);
+void btm_acl_resubmit_page(void);
 void btm_acl_role_changed(uint8_t hci_status, const RawAddress& bd_addr,
                           uint8_t new_role);
 void btm_blacklist_role_change_device(const RawAddress& bd_addr,

diff --git a/stack/include/inq_hci_link_interface.h b/stack/include/inq_hci_link_interface.h
index 7514737..2d7fd08 100644 (file)
--- a/stack/include/inq_hci_link_interface.h
+++ b/stack/include/inq_hci_link_interface.h
@@ -33,3 +33,4 @@ extern void btm_process_inq_complete(uint8_t status, uint8_t mode);
 extern void btm_process_cancel_complete(uint8_t status, uint8_t mode);
 
 extern void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data);
+extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda);