Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f87bffe3 authored by Chris Manton's avatar Chris Manton
Browse files

Use stack/include/acl_hci_link_interface 

Also shuffle inclusions from stack/include/btm_int

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Ib735d920f27652091d4494db9a5a80742103c347
parent 24e16c07

system/stack/btm/btm_int.h

+2 −32
Original line number Diff line number Diff line
@@ -89,48 +89,18 @@ extern void btm_acl_update_inquiry_status(uint8_t state); 


extern uint8_t btm_handle_to_acl_index(uint16_t hci_handle);



extern void btm_read_rssi_complete(uint8_t* p);



extern void btm_read_failed_contact_counter_complete(uint8_t* p);



extern void btm_read_automatic_flush_timeout_complete(uint8_t* p);



extern void btm_read_tx_power_complete(uint8_t* p, bool is_ble);



extern void btm_read_link_quality_complete(uint8_t* p);



extern void btm_process_clk_off_comp_evt(uint16_t hci_handle,

                                         uint16_t clock_offset);

extern void btm_blacklist_role_change_device(const RawAddress& bd_addr,

                                             uint8_t hci_status);

extern void btm_acl_encrypt_change(uint16_t handle, uint8_t status,

                                   uint8_t encr_enable);

extern uint16_t btm_get_acl_disc_reason_code(void);



extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr,

                                  tBT_TRANSPORT transport);

extern void btm_read_remote_features_complete(uint8_t* p);

extern void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len);

extern void btm_read_remote_ext_features_failed(uint8_t status,

                                                uint16_t handle);

extern void btm_read_remote_version_complete(uint8_t* p);



extern void btm_acl_notif_conn_collision(const RawAddress& bda);

extern void btm_acl_update_conn_addr(uint16_t conn_handle,

                                     const RawAddress& address);



extern void btm_pm_reset(void);

extern void btm_pm_proc_cmd_status(uint8_t status);

extern void btm_pm_proc_mode_change(uint8_t hci_status, uint16_t hci_handle,

                                    uint8_t mode, uint16_t interval);

extern void btm_pm_proc_ssr_evt(uint8_t* p, uint16_t evt_len);

extern tBTM_STATUS btm_read_power_mode_state(const RawAddress& remote_bda,

                                             tBTM_PM_STATE* pmState);

extern void btm_sco_chk_pend_unpark(uint8_t hci_status, uint16_t hci_handle);



/* Internal functions provided by btm_sco.cc

 *******************************************

*/

extern void btm_sco_init(void);

extern void btm_sco_chk_pend_unpark(uint8_t hci_status, uint16_t hci_handle);

extern void btm_sco_connected(uint8_t hci_status, const RawAddress* bda,

                              uint16_t hci_handle, tBTM_ESCO_DATA* p_esco_data);

extern void btm_esco_proc_conn_chg(uint8_t status, uint16_t handle,

system/stack/btu/btu_hcif.cc

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/l2cap_hci_link_interface.h"



using base::Location;

system/stack/include/acl_api.h

+7 −0
Original line number Diff line number Diff line
@@ -314,3 +314,10 @@ uint16_t acl_get_supported_packet_types(); 


bool acl_set_peer_le_features_from_handle(uint16_t hci_handle,

                                          const uint8_t* p);



tBTM_STATUS btm_read_power_mode_state(const RawAddress& remote_bda,

                                      tBTM_PM_STATE* pmState);



void btm_acl_notif_conn_collision(const RawAddress& bda);



void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address);

system/stack/l2cap/l2c_csm.cc

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "hcimsgs.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "stack/include/acl_api.h"



/******************************************************************************/

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */