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

Commit 84ef39b1 authored by Chris Manton's avatar Chris Manton
Browse files

[18/24] Canonical form tBTM_STATUS::BTM_NO_RESOURCES 

Prepare for class enum-ify tBTM_STATUS

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

Change-Id: I11a9939b86daa409f78401290c7cea19e81e6858
parent 2639470b

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ void bta_dm_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport, void* /* 
    case BTM_WRONG_MODE:

      bta_status = BTA_WRONG_MODE;

      break;

    case BTM_NO_RESOURCES:

    case tBTM_STATUS::BTM_NO_RESOURCES:

      bta_status = BTA_NO_RESOURCES;

      break;

    case tBTM_STATUS::BTM_BUSY:

system/bta/test/bta_dm_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ TEST_F(BtaDmTest, bta_dm_encrypt_cback) { 
  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_WRONG_MODE);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_NO_RESOURCES);

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, tBTM_STATUS::BTM_NO_RESOURCES);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, tBTM_STATUS::BTM_BUSY);

  device->p_encrypt_cback = BTA_DM_ENCRYPT_CBACK;

system/stack/acl/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) { 
 *

 * Returns          tBTM_STATUS::BTM_SUCCESS if already in specified role.

 *                  tBTM_STATUS::BTM_CMD_STARTED if command issued to controller.

 *                  BTM_NO_RESOURCES if couldn't allocate memory to issue

 *                  tBTM_STATUS::BTM_NO_RESOURCES if couldn't allocate memory to issue

 *                                   command

 *                  BTM_UNKNOWN_ADDR if no active link with bd addr specified

 *                  tBTM_STATUS::BTM_MODE_UNSUPPORTED if local device does not support role
@@ -560,7 +560,7 @@ tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) { 


  if (get_btm_client_interface().sco.BTM_IsScoActiveByBdaddr(remote_bd_addr)) {

    log::info("An active SCO to device prevents role switch at this time");

    return BTM_NO_RESOURCES;

    return tBTM_STATUS::BTM_NO_RESOURCES;

  }



  if (!p_acl->is_switch_role_idle()) {

system/stack/acl/btm_pm.cc

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, int link_in 
 * Description      register or deregister with power manager

 *

 * Returns          tBTM_STATUS::BTM_SUCCESS if successful,

 *                  BTM_NO_RESOURCES if no room to hold registration

 *                  tBTM_STATUS::BTM_NO_RESOURCES if no room to hold registration

 *                  tBTM_STATUS::BTM_ILLEGAL_VALUE

 *

 ******************************************************************************/
@@ -146,7 +146,7 @@ tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id, tBTM_PM_STATUS_CBACK* 
    return tBTM_STATUS::BTM_SUCCESS;

  }



  return BTM_NO_RESOURCES;

  return tBTM_STATUS::BTM_NO_RESOURCES;

}



void BTM_PM_OnConnected(uint16_t handle, const RawAddress& remote_bda) {
@@ -597,7 +597,7 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, int link_in 
  if (pm_pend_link == 0) {

    /* the command was not sent */

    log::error("pm_pending_link maxed out");

    return BTM_NO_RESOURCES;

    return tBTM_STATUS::BTM_NO_RESOURCES;

  }



  return tBTM_STATUS::BTM_CMD_STARTED;

system/stack/btm/btm_ble_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ void btm_ble_link_sec_check(const RawAddress& bd_addr, tBTM_LE_AUTH_REQ auth_req 
 ******************************************************************************/

tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr, tBTM_BLE_SEC_ACT sec_act,

                                   uint8_t link_role) {

  tBTM_STATUS cmd = BTM_NO_RESOURCES;

  tBTM_STATUS cmd = tBTM_STATUS::BTM_NO_RESOURCES;

  tBTM_SEC_DEV_REC* p_rec = btm_find_dev(bd_addr);

  tBTM_BLE_SEC_REQ_ACT sec_req_act;

  tBTM_LE_AUTH_REQ auth_req;