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

Commit c6ae2a90 authored by Chris Manton's avatar Chris Manton
Browse files

[8/24] Canonical form tBTM_STATUS::BTM_DEV_RESET 

Prepare for class enum-ify tBTM_STATUS

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

Change-Id: Iaf1f72e8e4c05f620817c16ff683fabe03ea615d
parent 0879b5ae

system/stack/btm/btm_devctl.cc

+5 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void BTM_db_reset(void) { 


    if (p_cb) {

      tBTM_RSSI_RESULT btm_rssi_result;

      btm_rssi_result.status = BTM_DEV_RESET;

      btm_rssi_result.status = tBTM_STATUS::BTM_DEV_RESET;

      (*p_cb)(&btm_rssi_result);

    }

  }
@@ -145,7 +145,7 @@ void BTM_db_reset(void) { 


    if (p_cb) {

      tBTM_FAILED_CONTACT_COUNTER_RESULT btm_failed_contact_counter_result;

      btm_failed_contact_counter_result.status = BTM_DEV_RESET;

      btm_failed_contact_counter_result.status = tBTM_STATUS::BTM_DEV_RESET;

      (*p_cb)(&btm_failed_contact_counter_result);

    }

  }
@@ -156,7 +156,7 @@ void BTM_db_reset(void) { 


    if (p_cb) {

      tBTM_AUTOMATIC_FLUSH_TIMEOUT_RESULT btm_automatic_flush_timeout_result;

      btm_automatic_flush_timeout_result.status = BTM_DEV_RESET;

      btm_automatic_flush_timeout_result.status = tBTM_STATUS::BTM_DEV_RESET;

      (*p_cb)(&btm_automatic_flush_timeout_result);

    }

  }
@@ -333,7 +333,7 @@ tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name) { 
  }



  if (bluetooth::shim::GetController() == nullptr) {

    return BTM_DEV_RESET;

    return tBTM_STATUS::BTM_DEV_RESET;

  }

  /* Save the device name if local storage is enabled */
@@ -434,7 +434,7 @@ tBTM_STATUS BTM_SetDeviceClass(DEV_CLASS dev_class) { 
  btm_cb.devcb.dev_class = dev_class;



  if (bluetooth::shim::GetController() == nullptr) {

    return BTM_DEV_RESET;

    return tBTM_STATUS::BTM_DEV_RESET;

  }



  btsnd_hcic_write_dev_class(dev_class);

system/stack/btm/btm_inq.cc

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ void btm_inq_db_reset(void) { 
    btm_cb.rnr.remname_dev_type = BT_DEVICE_TYPE_UNKNOWN;



    if (btm_cb.rnr.p_remname_cmpl_cb) {

      rem_name.btm_status = BTM_DEV_RESET;

      rem_name.btm_status = tBTM_STATUS::BTM_DEV_RESET;

      rem_name.hci_status = HCI_SUCCESS;



      (*btm_cb.rnr.p_remname_cmpl_cb)(&rem_name);

system/stack/l2cap/l2c_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void l2cu_release_lcb(tL2C_LCB* p_lcb) { 
      tL2CAP_SEC_DATA* p_buf = (tL2CAP_SEC_DATA*)fixed_queue_try_dequeue(p_lcb->le_sec_pending_q);

      if (p_buf->p_callback) {

        p_buf->p_callback(p_lcb->remote_bd_addr, p_lcb->transport, p_buf->p_ref_data,

                          BTM_DEV_RESET);

                          tBTM_STATUS::BTM_DEV_RESET);

      }

      osi_free(p_buf);

    }