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

Commit 56b55ec2 authored by Chris Manton's avatar Chris Manton
Browse files

[11/24] Canonical form tBTM_STATUS::BTM_ERR_PROCESSING 

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I9c2bf7e2232106d9b6eb88937998946cd42be37c
parent 4cd6d89a

system/bta/hh/bta_hh_le.cc

+2 −2
Original line number Diff line number Diff line
@@ -1019,8 +1019,8 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) 
    log::error("Encryption failed status:{} btm_status:{}", bta_hh_status_text(p_cb->status),

               btm_status_text(p_cb->btm_status));

    if (!(p_cb->status == BTA_HH_ERR_SEC &&

          (p_cb->btm_status == BTM_ERR_PROCESSING || p_cb->btm_status == BTM_FAILED_ON_SECURITY ||

           p_cb->btm_status == BTM_WRONG_MODE))) {

          (p_cb->btm_status == tBTM_STATUS::BTM_ERR_PROCESSING ||

           p_cb->btm_status == BTM_FAILED_ON_SECURITY || p_cb->btm_status == BTM_WRONG_MODE))) {

      bta_hh_le_api_disc_act(p_cb);

    }

  }

system/stack/acl/btm_acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ void btm_read_tx_power_complete(uint8_t* p, uint16_t evt_len, bool is_ble) { 
      log::debug("Transmit power complete: tx_power:{} hci status:{}", result.tx_power,

                 hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status)));

    } else {

      result.status = BTM_ERR_PROCESSING;

      result.status = tBTM_STATUS::BTM_ERR_PROCESSING;

    }



    (*p_cb)(&result);
@@ -1813,7 +1813,7 @@ void btm_read_rssi_complete(uint8_t* p, uint16_t evt_len) { 
    }



    STREAM_TO_UINT8(result.hci_status, p);

    result.status = BTM_ERR_PROCESSING;

    result.status = tBTM_STATUS::BTM_ERR_PROCESSING;



    if (result.hci_status == HCI_SUCCESS) {

      uint16_t handle;
@@ -1899,7 +1899,7 @@ void btm_read_failed_contact_counter_complete(uint8_t* p) { 
        result.rem_bda = p_acl_cb->remote_addr;

      }

    } else {

      result.status = BTM_ERR_PROCESSING;

      result.status = tBTM_STATUS::BTM_ERR_PROCESSING;

    }



    (*p_cb)(&result);
@@ -1928,7 +1928,7 @@ void btm_read_automatic_flush_timeout_complete(uint8_t* p) { 
  if (p_cb) {

    uint16_t handle;

    STREAM_TO_UINT8(result.hci_status, p);

    result.status = BTM_ERR_PROCESSING;

    result.status = tBTM_STATUS::BTM_ERR_PROCESSING;



    if (result.hci_status == HCI_SUCCESS) {

      result.status = tBTM_STATUS::BTM_SUCCESS;

system/stack/btm/btm_ble_adv_filter.cc

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static void btm_flt_update_cb(uint8_t expected_ocf, tBTM_BLE_PF_CFG_CBACK cb, ui 
    return;

  }



  tBTM_STATUS btm_status = (status == 0) ? tBTM_STATUS::BTM_SUCCESS : BTM_ERR_PROCESSING;

  tBTM_STATUS btm_status =

          (status == 0) ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_ERR_PROCESSING;



  if (op_subcode == BTM_BLE_META_PF_FEAT_SEL) {

    cb.Run(num_avail, static_cast<tBTM_BLE_SCAN_COND_OP>(action), btm_status);

system/stack/btm/btm_ble_cont_energy.cc

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ tBTM_STATUS BTM_BleGetEnergyInfo(tBTM_BLE_ENERGY_INFO_CBACK* p_ener_cback) { 


  if (0 == cmn_ble_vsc_cb.energy_support) {

    log::error("Controller does not support get energy info");

    return BTM_ERR_PROCESSING;

    return tBTM_STATUS::BTM_ERR_PROCESSING;

  }



  ble_energy_info_cb.p_ener_cback = p_ener_cback;

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -1622,13 +1622,13 @@ void btm_ble_read_remote_name_cmpl(bool status, const RawAddress& bda, uint16_t 
 ******************************************************************************/

tBTM_STATUS btm_ble_read_remote_name(const RawAddress& remote_bda, tBTM_NAME_CMPL_CB* p_cb) {

  if (!bluetooth::shim::GetController()->SupportsBle()) {

    return BTM_ERR_PROCESSING;

    return tBTM_STATUS::BTM_ERR_PROCESSING;

  }



  tINQ_DB_ENT* p_i = btm_inq_db_find(remote_bda);

  if (p_i && !ble_evt_type_is_connectable(p_i->inq_info.results.ble_evt_type)) {

    log::verbose("name request to non-connectable device failed.");

    return BTM_ERR_PROCESSING;

    return tBTM_STATUS::BTM_ERR_PROCESSING;

  }



  /* read remote device name using GATT procedure */