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

Commit 0eeb7924 authored by Myles Watson's avatar Myles Watson
Browse files

bta_dm: Remove unused bta_dm_inq_cmpl parameter 

Bug: 330675788
Test: mma -j32
EXEMPT: Trivial refactor
Change-Id: I6a58705089b00a2e360964e552fcd98f2fc4ea01
parent 50584496

system/bta/dm/bta_dm_disc.cc

+7 −12
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ tBTA_DM_SEARCH_CB bta_dm_search_cb; 
static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status);

static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,

                                  uint16_t eir_len);

static void bta_dm_inq_cmpl(uint8_t num);

static void bta_dm_inq_cmpl();

static void bta_dm_inq_cmpl_cb(void* p_result);

static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                DEV_CLASS dc, BD_NAME bd_name);
@@ -288,7 +288,7 @@ static void bta_dm_search_start(tBTA_DM_MSG* p_data) { 
      log::warn("Unable to start device discovery search btm_status:{}",

                btm_status_text(btm_status));

      // Not started so completion callback is executed now

      bta_dm_inq_cmpl(0);

      bta_dm_inq_cmpl();

      break;

  }

}
@@ -321,7 +321,7 @@ static void bta_dm_search_cancel() { 
    }

#endif

  } else {

    bta_dm_inq_cmpl(0);

    bta_dm_inq_cmpl();

  }

}
@@ -437,7 +437,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, 
 * Returns          void

 *

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

static void bta_dm_inq_cmpl(uint8_t num) {

static void bta_dm_inq_cmpl() {

  if (bta_dm_search_get_state() == BTA_DM_SEARCH_CANCELLING) {

    bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

    bta_dm_execute_queued_request();
@@ -448,13 +448,8 @@ static void bta_dm_inq_cmpl(uint8_t num) { 
    return;

  }



  tBTA_DM_SEARCH data;



  log::verbose("bta_dm_inq_cmpl");



  data.inq_cmpl.num_resps = num;

  bta_dm_search_cb.p_search_cback(BTA_DM_INQ_CMPL_EVT, &data);



  bta_dm_search_cb.p_btm_inq_info =

      get_btm_client_interface().db.BTM_InqDbFirst();

  if (bta_dm_search_cb.p_btm_inq_info != NULL) {
@@ -1536,10 +1531,10 @@ static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir, 
 * Returns          void

 *

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

static void bta_dm_inq_cmpl_cb(void* p_result) {

static void bta_dm_inq_cmpl_cb(void* /* p_result */) {

  log::verbose("");



  bta_dm_inq_cmpl(((tBTM_INQUIRY_CMPL*)p_result)->num_resp);

  bta_dm_inq_cmpl();

}



/*******************************************************************************
@@ -2449,7 +2444,7 @@ void bta_dm_execute_queued_request() { ::bta_dm_execute_queued_request(); } 
void bta_dm_find_services(const RawAddress& bd_addr) {

  ::bta_dm_find_services(bd_addr);

}

void bta_dm_inq_cmpl(uint8_t num) { ::bta_dm_inq_cmpl(num); }

void bta_dm_inq_cmpl() { ::bta_dm_inq_cmpl(); }

void bta_dm_inq_cmpl_cb(void* p_result) { ::bta_dm_inq_cmpl_cb(p_result); }

void bta_dm_observe_cmpl_cb(void* p_result) {

  ::bta_dm_observe_cmpl_cb(p_result);

system/bta/include/bta_api.h

+0 −6
Original line number Diff line number Diff line
@@ -272,11 +272,6 @@ typedef struct { 
  uint16_t clock_offset;

} tBTA_DM_INQ_RES;



/* Structure associated with BTA_DM_INQ_CMPL_EVT */

typedef struct {

  uint8_t num_resps; /* Number of inquiry responses. */

} tBTA_DM_INQ_CMPL;



/* Structure associated with BTA_DM_OBSERVE_CMPL_EVT */

typedef struct {

  uint8_t num_resps; /* Number of responses. */
@@ -314,7 +309,6 @@ typedef struct { 
/* Union of all search callback structures */

typedef union {

  tBTA_DM_INQ_RES inq_res;   /* Inquiry result for a peer device. */

  tBTA_DM_INQ_CMPL inq_cmpl; /* Inquiry complete. */

  tBTA_DM_DISC_RES disc_res; /* Discovery result for a peer device. */

  tBTA_DM_DISC_BLE_RES

      disc_ble_res;             /* discovery result for GATT based service */

system/bta/test/bta_disc_test.cc

+3 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ void bta_dm_disc_search_cb(const tBTA_DM_SEARCH_CB& search_cb); 
void bta_dm_discover_next_device();

void bta_dm_execute_queued_request();

void bta_dm_find_services(const RawAddress& bd_addr);

void bta_dm_inq_cmpl(uint8_t num);

void bta_dm_inq_cmpl();

void bta_dm_inq_cmpl_cb(void* p_result);

void bta_dm_observe_cmpl_cb(void* p_result);

void bta_dm_observe_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,
@@ -136,10 +136,8 @@ TEST_F(BtaDiscTest, bta_dm_find_services) { 
}



TEST_F(BtaDiscTest, bta_dm_inq_cmpl) {

  bluetooth::legacy::testing::bta_dm_inq_cmpl(0);

  bluetooth::legacy::testing::bta_dm_inq_cmpl(1);

  bluetooth::legacy::testing::bta_dm_inq_cmpl(2);

  bluetooth::legacy::testing::bta_dm_inq_cmpl(255);

  bluetooth::legacy::testing::bta_dm_inq_cmpl();

  bluetooth::legacy::testing::bta_dm_inq_cmpl();

}



TEST_F(BtaDiscTest, bta_dm_inq_cmpl_cb) {