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

Commit 1e67b92c authored by Chris Manton's avatar Chris Manton
Browse files

Remove never-set vars tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB:: 

tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_min
tBTM_CB::tBTM_BLE_CB::tBTM_BLE_INQ_CB::adv_interval_max

Towards readable code

Bug: 163134718
Tag: #refactor
Test: acts -tc BleCocTest
Test: ble paired 2 phones

Change-Id: I263e4cfd19a17affd9838cbaad52abb3fbe4185b
parent 42f75af3

system/stack/btm/btm_ble_gap.cc

+17 −24
Original line number Diff line number Diff line
@@ -836,11 +836,6 @@ uint16_t BTM_BleReadConnectability() { 
static void btm_ble_select_adv_interval(uint8_t evt_type,

                                        uint16_t* p_adv_int_min,

                                        uint16_t* p_adv_int_max) {

  tBTM_BLE_INQ_CB* p_cb = &btm_cb.ble_ctr_cb.inq_var;

  if (p_cb->adv_interval_min && p_cb->adv_interval_max) {

    *p_adv_int_min = p_cb->adv_interval_min;

    *p_adv_int_max = p_cb->adv_interval_max;

  } else {

  switch (evt_type) {

    case BTM_BLE_CONNECT_EVT:

    case BTM_BLE_CONNECT_LO_DUTY_DIR_EVT:
@@ -863,8 +858,6 @@ static void btm_ble_select_adv_interval(uint8_t evt_type, 
      break;

  }

}

  return;

}



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

 *

system/stack/btm/btm_ble_int_types.h

+1 −2
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ typedef struct { 
  uint32_t scan_interval;

  uint8_t scan_type;             /* current scan type: active or passive */

  uint8_t scan_duplicate_filter; /* duplicate filter enabled for scan */

  uint16_t adv_interval_min;

  uint16_t adv_interval_max;



  tBTM_BLE_AFP afp; /* advertising filter policy */

  tBTM_BLE_SFP sfp; /* scanning filter policy */