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

Commit d40f5dbb authored by Myles Watson's avatar Myles Watson
Browse files

Remove unused connection parameter code 

Bug: 296434089
Test: mma -j32
Flag: EXEMPT, remove unused code
Change-Id: Ic2795edf01ddcb3ef0e50650cfbcd084eaa5b28b
parent d87b4611

system/stack/hcic/hciblecmds.cc

+0 −42
Original line number Original line Diff line number Diff line
@@ -349,48 +349,6 @@ void btsnd_hcic_ble_test_end(void) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}

}





void btsnd_hcic_ble_rc_param_req_reply(uint16_t handle, 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);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_REPLY;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_BLE_RC_PARAM_REQ_REPLY);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_REPLY);



  UINT16_TO_STREAM(pp, handle);

  UINT16_TO_STREAM(pp, conn_int_min);

  UINT16_TO_STREAM(pp, conn_int_max);

  UINT16_TO_STREAM(pp, conn_latency);

  UINT16_TO_STREAM(pp, conn_timeout);

  UINT16_TO_STREAM(pp, min_ce_len);

  UINT16_TO_STREAM(pp, max_ce_len);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle, uint8_t reason) {

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

  uint8_t* pp = (uint8_t*)(p + 1);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_NEG_REPLY;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_BLE_RC_PARAM_REQ_NEG_REPLY);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_BLE_RC_PARAM_REQ_NEG_REPLY);



  UINT16_TO_STREAM(pp, handle);

  UINT8_TO_STREAM(pp, reason);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_ble_read_resolvable_addr_peer(uint8_t addr_type_peer,

void btsnd_hcic_ble_read_resolvable_addr_peer(uint8_t addr_type_peer,

                                              const RawAddress& bda_peer) {

                                              const RawAddress& bda_peer) {

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

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

system/stack/include/hcimsgs.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -347,15 +347,6 @@ void btsnd_hcic_ble_transmitter_test(uint8_t tx_freq, uint8_t test_data_len, 
                                     uint8_t payload);

                                     uint8_t payload);

void btsnd_hcic_ble_test_end(void);

void btsnd_hcic_ble_test_end(void);





void btsnd_hcic_ble_rc_param_req_reply(uint16_t handle, 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_rc_param_req_neg_reply(uint16_t handle, uint8_t reason);



void btsnd_hcic_ble_set_data_length(uint16_t conn_handle, uint16_t tx_octets,

void btsnd_hcic_ble_set_data_length(uint16_t conn_handle, uint16_t tx_octets,

                                    uint16_t tx_time);

                                    uint16_t tx_time);

system/stack/include/l2cap_hci_link_interface.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -47,10 +47,6 @@ void l2cble_notify_le_connection(const RawAddress& bda); 




void l2cble_use_preferred_conn_params(const RawAddress& bda);

void l2cble_use_preferred_conn_params(const RawAddress& bda);





void l2cble_process_rc_param_request_evt(uint16_t handle, uint16_t int_min,

                                         uint16_t int_max, uint16_t latency,

                                         uint16_t timeout);



// Invoked when HCI mode is changed to HCI_MODE_ACTIVE or HCI_MODE_SNIFF

// Invoked when HCI mode is changed to HCI_MODE_ACTIVE or HCI_MODE_SNIFF

void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote);

void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote);

system/stack/l2cap/l2c_ble_conn_params.cc

+0 −36
Original line number Original line Diff line number Diff line
@@ -316,42 +316,6 @@ void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status, 
               p_lcb->conn_update_mask, p_lcb->subrate_req_mask);

               p_lcb->conn_update_mask, p_lcb->subrate_req_mask);

}

}





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

 *

 * Function         l2cble_process_rc_param_request_evt

 *

 * Description      process LE Remote Connection Parameter Request Event.

 *

 * Returns          void

 *

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

void l2cble_process_rc_param_request_evt(uint16_t handle, uint16_t int_min,

                                         uint16_t int_max, uint16_t latency,

                                         uint16_t timeout) {

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_handle(handle);



  if (p_lcb != NULL) {

    p_lcb->min_interval = int_min;

    p_lcb->max_interval = int_max;

    p_lcb->latency = latency;

    p_lcb->timeout = timeout;



    /* if update is enabled, always accept connection parameter update */

    if ((p_lcb->conn_update_mask & L2C_BLE_CONN_UPDATE_DISABLE) == 0) {

      btsnd_hcic_ble_rc_param_req_reply(handle, int_min, int_max, latency,

                                        timeout, 0, 0);

    } else {

      log::verbose("L2CAP - LE - update currently disabled");

      p_lcb->conn_update_mask |= L2C_BLE_NEW_CONN_PARAM;

      btsnd_hcic_ble_rc_param_req_neg_reply(handle,

                                            HCI_ERR_UNACCEPT_CONN_INTERVAL);

    }



  } else {

    log::warn("No link to update connection parameter");

  }

}



void l2cble_use_preferred_conn_params(const RawAddress& bda) {

void l2cble_use_preferred_conn_params(const RawAddress& bda) {

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(bda, BT_TRANSPORT_LE);

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(bda, BT_TRANSPORT_LE);

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);

system/test/mock/mock_stack_hcic_hciblecmds.cc

+0 −19
Original line number Original line Diff line number Diff line
@@ -55,9 +55,6 @@ struct btsnd_hcic_ble_periodic_advertising_sync_transfer 
struct btsnd_hcic_ble_periodic_advertising_terminate_sync

struct btsnd_hcic_ble_periodic_advertising_terminate_sync

    btsnd_hcic_ble_periodic_advertising_terminate_sync;

    btsnd_hcic_ble_periodic_advertising_terminate_sync;

struct btsnd_hcic_ble_rand btsnd_hcic_ble_rand;

struct btsnd_hcic_ble_rand btsnd_hcic_ble_rand;

struct btsnd_hcic_ble_rc_param_req_neg_reply

    btsnd_hcic_ble_rc_param_req_neg_reply;

struct btsnd_hcic_ble_rc_param_req_reply btsnd_hcic_ble_rc_param_req_reply;

struct btsnd_hcic_ble_read_adv_chnl_tx_power

struct btsnd_hcic_ble_read_adv_chnl_tx_power

    btsnd_hcic_ble_read_adv_chnl_tx_power;

    btsnd_hcic_ble_read_adv_chnl_tx_power;

struct btsnd_hcic_ble_read_remote_feat btsnd_hcic_ble_read_remote_feat;

struct btsnd_hcic_ble_read_remote_feat btsnd_hcic_ble_read_remote_feat;
@@ -198,22 +195,6 @@ void btsnd_hcic_ble_rand(base::Callback<void(BT_OCTET8)> cb) { 
  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_rand(std::move(cb));

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_rand(std::move(cb));

}

}

void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle, uint8_t reason) {

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_rc_param_req_neg_reply(

      handle, reason);

}

void btsnd_hcic_ble_rc_param_req_reply(uint16_t handle, 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) {

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_rc_param_req_reply(

      handle, conn_int_min, conn_int_max, conn_latency, conn_timeout,

      min_ce_len, max_ce_len);

}

void btsnd_hcic_ble_read_adv_chnl_tx_power(void) {

void btsnd_hcic_ble_read_adv_chnl_tx_power(void) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_read_adv_chnl_tx_power();

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_read_adv_chnl_tx_power();