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

Commit adb6c60d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Remove btm_send_hci_create_connection" am: 95a94d6f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1986567

Change-Id: I11da2955b6dd18fd2a662bf0dd3074a44a6c3c69
parents b7591b9c 95a94d6f

system/stack/acl/btm_ble_connection_establishment.cc

+0 −44
Original line number Diff line number Diff line
@@ -43,50 +43,6 @@ extern void btm_ble_advertiser_notify_terminated_legacy( 


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,

    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(false,

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



  if (controller_get_interface()->supports_ble_extended_advertising()) {

    EXT_CONN_PHY_CFG phy_cfg[3];  // maximum three phys



    int phy_cnt =

        std::bitset<std::numeric_limits<uint8_t>::digits>(initiating_phys)

            .count();



    LOG_ASSERT(phy_cnt <= 3) << "More than three phys provided";

    // TODO(jpawlowski): tune parameters for different transports

    for (int i = 0; i < phy_cnt; i++) {

      phy_cfg[i].scan_int = scan_int;

      phy_cfg[i].scan_win = scan_win;

      phy_cfg[i].conn_int_min = conn_int_min;

      phy_cfg[i].conn_int_max = conn_int_max;

      phy_cfg[i].conn_latency = conn_latency;

      phy_cfg[i].sup_timeout = conn_timeout;

      phy_cfg[i].min_ce_len = min_ce_len;

      phy_cfg[i].max_ce_len = max_ce_len;

    }



    addr_type_peer &= ~BLE_ADDR_TYPE_ID_BIT;

    btsnd_hcic_ble_ext_create_conn(init_filter_policy, addr_type_own,

                                   addr_type_peer, bda_peer, initiating_phys,

                                   phy_cfg);

  } else {

    btsnd_hcic_ble_create_ll_conn(scan_int, scan_win, init_filter_policy,

                                  addr_type_peer, bda_peer, addr_type_own,

                                  conn_int_min, conn_int_max, conn_latency,

                                  conn_timeout, min_ce_len, max_ce_len);

  }



  btm_cb.ble_ctr_cb.set_connection_state_connecting();

  btm_ble_set_topology_mask(BTM_BLE_STATE_INIT_BIT);

}



/** LE connection complete. */

void btm_ble_create_ll_conn_complete(tHCI_STATUS status) {

  if (status == HCI_SUCCESS) return;

system/stack/btm/btm_ble_bgconn.cc

+0 −6
Original line number Diff line number Diff line
@@ -39,12 +39,6 @@ 


extern tBTM_CB btm_cb;



extern 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 phy);

extern void btm_ble_create_conn_cancel();



namespace {

system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc

+0 −15
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ namespace mock { 
namespace stack_acl_btm_ble_connection_establishment {



// Function state capture and return values, if needed

struct btm_send_hci_create_connection btm_send_hci_create_connection;

struct btm_ble_create_ll_conn_complete btm_ble_create_ll_conn_complete;

struct maybe_resolve_address maybe_resolve_address;

struct btm_ble_conn_complete btm_ble_conn_complete;
@@ -61,20 +60,6 @@ struct btm_ble_create_conn_cancel_complete btm_ble_create_conn_cancel_complete; 
}  // namespace mock

}  // namespace test



// Mocked functions, if any

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) {

  mock_function_count_map[__func__]++;

  test::mock::stack_acl_btm_ble_connection_establishment::

      btm_send_hci_create_connection(

          scan_int, scan_win, init_filter_policy, addr_type_peer, bda_peer,

          addr_type_own, conn_int_min, conn_int_max, conn_latency, conn_timeout,

          min_ce_len, max_ce_len, initiating_phys);

}

void btm_ble_create_ll_conn_complete(tHCI_STATUS status) {

  mock_function_count_map[__func__]++;

  test::mock::stack_acl_btm_ble_connection_establishment::

system/test/mock/mock_stack_acl_btm_ble_connection_establishment.h

+0 −32
Original line number Diff line number Diff line
@@ -48,38 +48,6 @@ namespace mock { 
namespace stack_acl_btm_ble_connection_establishment {



// Shared state between mocked functions and tests

// Name: btm_send_hci_create_connection

// Params: 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 Returns: void

struct btm_send_hci_create_connection {

  std::function<void(

      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)>

      body{[](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) {}};

  void operator()(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) {

    body(scan_int, scan_win, init_filter_policy, addr_type_peer, bda_peer,

         addr_type_own, conn_int_min, conn_int_max, conn_latency, conn_timeout,

         min_ce_len, max_ce_len, initiating_phys);

  };

};

extern struct btm_send_hci_create_connection btm_send_hci_create_connection;

// Name: btm_ble_create_ll_conn_complete

// Params: tHCI_STATUS status

// Returns: void