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

Commit 29928987 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use proper types BLE_ADDR_TYPE am: afd604fb 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1736368

Change-Id: I360f87e47844e67af949b9fb07304802b5df292f
parents f2ac18e2 afd604fb

system/stack/acl/ble_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void acl_ble_enhanced_connection_complete( 
    const tBLE_BD_ADDR& address_with_type, uint16_t handle, tHCI_ROLE role,

    bool match, uint16_t conn_interval, uint16_t conn_latency,

    uint16_t conn_timeout, const RawAddress& local_rpa,

    const RawAddress& peer_rpa, uint8_t peer_addr_type) {

    const RawAddress& peer_rpa, tBLE_ADDR_TYPE peer_addr_type) {

  if (!acl_ble_common_connection(address_with_type, handle, role, match,

                                 conn_interval, conn_latency, conn_timeout)) {

    LOG_WARN("Unable to create enhanced ble acl connection");
@@ -125,7 +125,7 @@ void acl_ble_enhanced_connection_complete_from_shim( 
    const tBLE_BD_ADDR& address_with_type, uint16_t handle, tHCI_ROLE role,

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout,

    const RawAddress& local_rpa, const RawAddress& peer_rpa,

    uint8_t peer_addr_type) {

    tBLE_ADDR_TYPE peer_addr_type) {

  if (!connection_manager::remove_unconditional_from_shim(

          address_with_type.bda)) {

    LOG_WARN(

system/stack/acl/btm_ble_connection_establishment.cc

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, 
                                     const RawAddress& new_pseudo_addr);

void btm_send_hci_create_connection(

    uint16_t scan_int, uint16_t scan_win, uint8_t init_filter_policy,

    uint8_t addr_type_peer, const RawAddress& bda_peer, uint8_t addr_type_own,

    uint16_t conn_int_min, uint16_t conn_int_max, uint16_t conn_latency,

    uint16_t conn_timeout, uint16_t min_ce_len, uint16_t max_ce_len,

    uint8_t initiating_phys) {

    tBLE_ADDR_TYPE addr_type_peer, const RawAddress& bda_peer,

    tBLE_ADDR_TYPE addr_type_own, uint16_t conn_int_min, uint16_t conn_int_max,

    uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_ce_len,

    uint16_t max_ce_len, uint8_t initiating_phys) {

  ASSERT_LOG(!bluetooth::shim::is_gd_acl_enabled(),

             "When gd_acl enabled this code path should not be exercised");

system/stack/btm/btm_ble_bgconn.cc

+3 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static bool btm_ble_stop_auto_conn() { 
  return true;

}



static void background_connection_add(uint8_t addr_type,

static void background_connection_add(tBLE_ADDR_TYPE addr_type,

                                      const RawAddress& address) {

  auto map_iter = background_connections.find(address);

  if (map_iter == background_connections.end()) {
@@ -335,8 +335,8 @@ static bool btm_ble_start_auto_conn() { 
  const uint16_t scan_win = (p_cb->scan_win == BTM_BLE_SCAN_PARAM_UNDEF)

                                ? BTM_BLE_SCAN_SLOW_WIN_1

                                : p_cb->scan_win;

  uint8_t own_addr_type = p_cb->addr_mgnt_cb.own_addr_type;

  uint8_t peer_addr_type = BLE_ADDR_PUBLIC;

  tBLE_ADDR_TYPE own_addr_type = p_cb->addr_mgnt_cb.own_addr_type;

  tBLE_ADDR_TYPE peer_addr_type = BLE_ADDR_PUBLIC;



  uint8_t phy = PHY_LE_1M;

  if (controller_get_interface()->supports_ble_2m_phy()) phy |= PHY_LE_2M;

system/stack/btm/btm_ble_int.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ extern void btm_ble_process_periodic_adv_pkt(uint8_t len, uint8_t* p); 
extern void btm_ble_process_periodic_adv_sync_lost_evt(uint8_t len, uint8_t* p);

extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int,

                                         uint16_t scan_win,

                                         uint8_t addr_type_own,

                                         tBLE_ADDR_TYPE addr_type_own,

                                         uint8_t scan_filter_policy);

extern void btm_ble_stop_scan(void);

extern void btm_clear_all_pending_le_entry(void);

system/stack/hcic/hciblecmds.cc

+14 −10
Original line number Diff line number Diff line
@@ -135,8 +135,9 @@ void btsnd_hcic_ble_set_random_addr(const RawAddress& random_bda) { 
}



void btsnd_hcic_ble_write_adv_params(uint16_t adv_int_min, uint16_t adv_int_max,

                                     uint8_t adv_type, uint8_t addr_type_own,

                                     uint8_t addr_type_dir,

                                     uint8_t adv_type,

                                     tBLE_ADDR_TYPE addr_type_own,

                                     tBLE_ADDR_TYPE addr_type_dir,

                                     const RawAddress& direct_bda,

                                     uint8_t channel_map,

                                     uint8_t adv_filter_policy) {
@@ -271,11 +272,14 @@ void btsnd_hcic_ble_set_scan_enable(uint8_t scan_enable, uint8_t duplicate) { 
}



/* link layer connection management commands */

void btsnd_hcic_ble_create_ll_conn(

    uint16_t scan_int, uint16_t scan_win, uint8_t init_filter_policy,

    uint8_t addr_type_peer, const RawAddress& bda_peer, uint8_t addr_type_own,

    uint16_t conn_int_min, uint16_t conn_int_max, uint16_t conn_latency,

    uint16_t conn_timeout, uint16_t min_ce_len, uint16_t max_ce_len) {

void btsnd_hcic_ble_create_ll_conn(uint16_t scan_int, uint16_t scan_win,

                                   uint8_t init_filter_policy,

                                   tBLE_ADDR_TYPE addr_type_peer,

                                   const RawAddress& bda_peer,

                                   tBLE_ADDR_TYPE addr_type_own,

                                   uint16_t conn_int_min, uint16_t conn_int_max,

                                   uint16_t conn_latency, uint16_t conn_timeout,

                                   uint16_t min_ce_len, uint16_t max_ce_len) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);
@@ -337,7 +341,7 @@ void btsnd_hcic_ble_add_acceptlist( 
}



void btsnd_hcic_ble_remove_from_acceptlist(

    uint8_t addr_type, const RawAddress& bda,

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  uint8_t param[HCIC_PARAM_SIZE_REMOVE_ACCEPTLIST];

  uint8_t* pp = param;
@@ -848,8 +852,8 @@ void btsnd_hcic_ble_set_extended_scan_enable(uint8_t enable, 
}



void btsnd_hcic_ble_ext_create_conn(uint8_t init_filter_policy,

                                    uint8_t addr_type_own,

                                    uint8_t addr_type_peer,

                                    tBLE_ADDR_TYPE addr_type_own,

                                    tBLE_ADDR_TYPE addr_type_peer,

                                    const RawAddress& bda_peer,

                                    uint8_t initiating_phys,

                                    EXT_CONN_PHY_CFG* phy_cfg) {