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

Commit 230480ad authored by Chris Manton's avatar Chris Manton
Browse files

[14/24] Canonical form tBTM_STATUS::BTM_ILLEGAL_VALUE 

Prepare for class enum-ify tBTM_STATUS

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

Change-Id: Ic4394c1cf38fe7be4a9707a5ca39d3f46ea993f1
parent 5f467b13

system/bta/test/bta_dm_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ TEST_F(BtaDmTest, bta_dm_encrypt_cback) { 
  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;

  bta_dm_encrypt_cback(kRawAddress, transport, nullptr, BTM_ILLEGAL_VALUE);

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



  ASSERT_EQ(5UL, BTA_DM_ENCRYPT_CBACK_queue.size());

system/stack/acl/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void btm_acl_device_down(void) { 


tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) {

  if (p_role == nullptr) {

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }

  *p_role = HCI_ROLE_UNKNOWN;

system/stack/acl/btm_pm.cc

+5 −5
Original line number Diff line number Diff line
@@ -122,14 +122,14 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, int link_in 
 *

 * Returns          tBTM_STATUS::BTM_SUCCESS if successful,

 *                  BTM_NO_RESOURCES if no room to hold registration

 *                  BTM_ILLEGAL_VALUE

 *                  tBTM_STATUS::BTM_ILLEGAL_VALUE

 *

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

tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id, tBTM_PM_STATUS_CBACK* p_cb) {

  /* de-register */

  if (mask & BTM_PM_DEREG) {

    if (*p_pm_id >= BTM_MAX_PM_RECORDS) {

      return BTM_ILLEGAL_VALUE;

      return tBTM_STATUS::BTM_ILLEGAL_VALUE;

    }

    pm_reg_db.mask = BTM_PM_REC_NOT_USED;

    return tBTM_STATUS::BTM_SUCCESS;
@@ -138,7 +138,7 @@ tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id, tBTM_PM_STATUS_CBACK* 
  if (pm_reg_db.mask == BTM_PM_REC_NOT_USED) {

    /* if register for notification, should provide callback routine */

    if (p_cb == NULL) {

      return BTM_ILLEGAL_VALUE;

      return tBTM_STATUS::BTM_ILLEGAL_VALUE;

    }

    pm_reg_db.cback = p_cb;

    pm_reg_db.mask = mask;
@@ -186,7 +186,7 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, 


  if (!p_mode) {

    log::error("pm_id: {}, p_mode is null for {}", unsigned(pm_id), remote_bda);

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  // per ACL link
@@ -200,7 +200,7 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, 
  tBTM_PM_MODE mode = p_mode->mode;

  if (!is_legal_power_mode(mode)) {

    log::error("Unable to set illegal power mode value:0x{:02x}", mode);

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  if (p_mode->mode & BTM_PM_MD_FORCE) {

system/stack/btm/btm_ble_gap.cc

+3 −3
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, tBTM_INQ_RESULTS_CB* p_ 
               ll_scan_window);



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

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  if (start) {
@@ -1321,7 +1321,7 @@ tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode) { 


  /*** Check mode parameter ***/

  if (mode > BTM_BLE_MAX_DISCOVERABLE) {

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  btm_cb.ble_ctr_cb.inq_var.discoverable_mode = mode;
@@ -1408,7 +1408,7 @@ tBTM_STATUS btm_ble_set_connectability(uint16_t combined_mode) { 


  /*** Check mode parameter ***/

  if (mode > BTM_BLE_MAX_CONNECTABLE) {

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  btm_cb.ble_ctr_cb.inq_var.connectable_mode = mode;

system/stack/btm/btm_ble_sec.cc

+3 −3
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, tBT_TRANSPORT tra 
tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, uint16_t tx_pdu_length) {

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

    log::info("Local controller does not support le packet extension");

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  log::info("bd_addr:{}, tx_pdu_length:{}", bd_addr, tx_pdu_length);
@@ -612,7 +612,7 @@ tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, uint16_t tx_pdu_leng 


  if (!acl_peer_supports_ble_packet_extension(hci_handle)) {

    log::info("Remote device unable to support le packet extension");

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  tx_pdu_length = std::min<uint16_t>(
@@ -731,7 +731,7 @@ tBTM_STATUS btm_ble_start_sec_check(const RawAddress& bd_addr, uint16_t psm, boo 
  if (!p_serv_rec) {

    log::warn("PSM: {} no application registered", psm);

    (*p_callback)(bd_addr, BT_TRANSPORT_LE, p_ref_data, BTM_MODE_UNSUPPORTED);

    return BTM_ILLEGAL_VALUE;

    return tBTM_STATUS::BTM_ILLEGAL_VALUE;

  }



  bool is_encrypted = BTM_IsEncrypted(bd_addr, BT_TRANSPORT_LE);