diff options
author | 2024-07-05 10:48:05 -0700 | |
---|---|---|
committer | 2024-08-16 16:49:53 -0700 | |
commit | 2639470bcda9e255d867826ad1c804b62dea365b (patch) | |
tree | 2f8da9e41a94e2c7cc5b9574b4cc9e061724f331 | |
parent | 02f7ac35055d47d09c512e996854c2cff479854c (diff) |
[17/24] Canonical form tBTM_STATUS::BTM_MODE_UNSUPPORTED
Prepare for class enum-ify tBTM_STATUS
Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor
Change-Id: I3876332cd6918d1c232ed26bd43dc64bdbfc3236
-rw-r--r-- | system/bta/test/bta_dm_test.cc | 2 | ||||
-rw-r--r-- | system/stack/acl/btm_acl.cc | 6 | ||||
-rw-r--r-- | system/stack/acl/btm_pm.cc | 2 | ||||
-rw-r--r-- | system/stack/btm/btm_ble_adv_filter.cc | 2 | ||||
-rw-r--r-- | system/stack/btm/btm_ble_sec.cc | 2 | ||||
-rw-r--r-- | system/stack/btm/btm_inq.cc | 8 | ||||
-rw-r--r-- | system/stack/btm/btm_sco.cc | 6 | ||||
-rw-r--r-- | system/stack/btm/btm_sec.cc | 4 | ||||
-rw-r--r-- | system/stack/btm/btm_sec.h | 2 | ||||
-rw-r--r-- | system/stack/include/acl_api.h | 2 | ||||
-rw-r--r-- | system/stack/include/btm_api.h | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/system/bta/test/bta_dm_test.cc b/system/bta/test/bta_dm_test.cc index 959295dcad..80d8312140 100644 --- a/system/bta/test/bta_dm_test.cc +++ b/system/bta/test/bta_dm_test.cc @@ -232,7 +232,7 @@ TEST_F(BtaDmTest, bta_dm_set_encryption) { [](const RawAddress& bd_addr, tBT_TRANSPORT transport, tBTM_SEC_CALLBACK* p_callback, void* p_ref_data, tBTM_BLE_SEC_ACT sec_act) -> tBTM_STATUS { inc_func_call_count("BTM_SetEncryption"); - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; }; bta_dm_set_encryption(kRawAddress, transport, BTA_DM_ENCRYPT_CBACK, sec_act); diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc index 69b0cc21ff..da269925f6 100644 --- a/system/stack/acl/btm_acl.cc +++ b/system/stack/acl/btm_acl.cc @@ -531,7 +531,7 @@ tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) { * BTM_NO_RESOURCES if couldn't allocate memory to issue * command * BTM_UNKNOWN_ADDR if no active link with bd addr specified - * BTM_MODE_UNSUPPORTED if local device does not support role + * tBTM_STATUS::BTM_MODE_UNSUPPORTED if local device does not support role * switching * tBTM_STATUS::BTM_BUSY if the previous command is not completed * @@ -539,7 +539,7 @@ tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) { tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) { if (!bluetooth::shim::GetController()->SupportsRoleSwitch()) { log::info("Local controller does not support role switching"); - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bd_addr, BT_TRANSPORT_BR_EDR); @@ -1063,7 +1063,7 @@ tBTM_STATUS BTM_SetLinkSuperTout(const RawAddress& remote_bda, uint16_t timeout) "UNSUPPORTED by controller write link supervision timeout:{:.2f}ms " "bd_addr:{}", supervision_timeout_to_seconds(timeout), remote_bda); - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } p_acl->link_super_tout = timeout; btsnd_hcic_write_link_super_tout(p_acl->hci_handle, timeout); diff --git a/system/stack/acl/btm_pm.cc b/system/stack/acl/btm_pm.cc index 86bedd6be8..72e910b270 100644 --- a/system/stack/acl/btm_pm.cc +++ b/system/stack/acl/btm_pm.cc @@ -216,7 +216,7 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, (mode == BTM_PM_MD_PARK && !controller->SupportsParkMode()) || interop_match_addr(INTEROP_DISABLE_SNIFF, &remote_bda)) { log::error("pm_id {} mode {} is not supported for {}", pm_id, mode, remote_bda); - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } } diff --git a/system/stack/btm/btm_ble_adv_filter.cc b/system/stack/btm/btm_ble_adv_filter.cc index 01aee74b94..44ad742387 100644 --- a/system/stack/btm/btm_ble_adv_filter.cc +++ b/system/stack/btm/btm_ble_adv_filter.cc @@ -327,7 +327,7 @@ void BTM_BleAdvFilterParamSetup(tBTM_BLE_SCAN_COND_OP action, tBTM_BLE_PF_FILT_I uint8_t param[len], *p; if (!is_filtering_supported()) { - cb.Run(0, BTM_BLE_PF_ENABLE, BTM_MODE_UNSUPPORTED); + cb.Run(0, BTM_BLE_PF_ENABLE, tBTM_STATUS::BTM_MODE_UNSUPPORTED); return; } diff --git a/system/stack/btm/btm_ble_sec.cc b/system/stack/btm/btm_ble_sec.cc index 9f6a0ad894..309572e06c 100644 --- a/system/stack/btm/btm_ble_sec.cc +++ b/system/stack/btm/btm_ble_sec.cc @@ -730,7 +730,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); + (*p_callback)(bd_addr, BT_TRANSPORT_LE, p_ref_data, tBTM_STATUS::BTM_MODE_UNSUPPORTED); return tBTM_STATUS::BTM_ILLEGAL_VALUE; } diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc index a173112e19..0aaf8ed566 100644 --- a/system/stack/btm/btm_inq.cc +++ b/system/stack/btm/btm_inq.cc @@ -413,11 +413,11 @@ tBTM_STATUS BTM_SetInquiryMode(uint8_t mode) { /* mandatory mode */ } else if (mode == BTM_INQ_RESULT_WITH_RSSI) { if (!bluetooth::shim::GetController()->SupportsRssiWithInquiryResults()) { - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } } else if (mode == BTM_INQ_RESULT_EXTENDED) { if (!bluetooth::shim::GetController()->SupportsExtendedInquiryResponse()) { - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } } else { return tBTM_STATUS::BTM_ILLEGAL_VALUE; @@ -1740,7 +1740,7 @@ static void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode) { * inquriry response * * Returns tBTM_STATUS::BTM_SUCCESS - if successful - * BTM_MODE_UNSUPPORTED - if local device cannot support it + * tBTM_STATUS::BTM_MODE_UNSUPPORTED - if local device cannot support it * ******************************************************************************/ tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) { @@ -1750,7 +1750,7 @@ tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) { return tBTM_STATUS::BTM_SUCCESS; } else { osi_free(p_buff); - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } } diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc index 9d6521a9e5..9d67123574 100644 --- a/system/stack/btm/btm_sco.cc +++ b/system/stack/btm/btm_sco.cc @@ -1398,18 +1398,18 @@ tBTM_STATUS BTM_SetEScoMode(enh_esco_params_t* p_parms) { * * Returns tBTM_STATUS::BTM_SUCCESS if the successful. * tBTM_STATUS::BTM_ILLEGAL_VALUE if there is an illegal sco_inx - * BTM_MODE_UNSUPPORTED if controller version is not BT1.2 or + * tBTM_STATUS::BTM_MODE_UNSUPPORTED if controller version is not BT1.2 or * later or does not support eSCO. * ******************************************************************************/ tBTM_STATUS BTM_RegForEScoEvts(uint16_t sco_inx, tBTM_ESCO_CBACK* p_esco_cback) { if (BTM_MAX_SCO_LINKS == 0) { - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } if (!btm_cb.sco_cb.esco_supported) { btm_cb.sco_cb.sco_db[sco_inx].esco.p_esco_cback = NULL; - return BTM_MODE_UNSUPPORTED; + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } if (sco_inx < BTM_MAX_SCO_LINKS && btm_cb.sco_cb.sco_db[sco_inx].state != SCO_ST_UNUSED) { diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 7a5e7eb222..8118c6cb36 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -1642,8 +1642,8 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm, bo // If there is no application registered with this PSM do not allow connection if (!p_serv_rec) { log::warn("PSM: 0x{:04x} no application registered", psm); - (*p_callback)(bd_addr, transport, p_ref_data, BTM_MODE_UNSUPPORTED); - return BTM_MODE_UNSUPPORTED; + (*p_callback)(bd_addr, transport, p_ref_data, tBTM_STATUS::BTM_MODE_UNSUPPORTED); + return tBTM_STATUS::BTM_MODE_UNSUPPORTED; } /* Services level0 by default have no security */ diff --git a/system/stack/btm/btm_sec.h b/system/stack/btm/btm_sec.h index 49a3916fe8..51fc9aa127 100644 --- a/system/stack/btm/btm_sec.h +++ b/system/stack/btm/btm_sec.h @@ -260,7 +260,7 @@ tBTM_LINK_KEY_TYPE BTM_SecGetDeviceLinkKeyType(const RawAddress& bd_addr); * BTM_WRONG_MODE- connection not up. * tBTM_STATUS::BTM_BUSY - security procedures are currently active * tBTM_STATUS::BTM_ERR_KEY_MISSING - link key is missing. - * BTM_MODE_UNSUPPORTED - if security manager not linked in. + * tBTM_STATUS::BTM_MODE_UNSUPPORTED - if security manager not linked in. * ******************************************************************************/ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, tBT_TRANSPORT transport, diff --git a/system/stack/include/acl_api.h b/system/stack/include/acl_api.h index da657c5550..11b935c411 100644 --- a/system/stack/include/acl_api.h +++ b/system/stack/include/acl_api.h @@ -106,7 +106,7 @@ tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role); * BTM_NO_RESOURCES if memory couldn't be allocated to issue * the command * BTM_UNKNOWN_ADDR if no active link with bd addr specified - * BTM_MODE_UNSUPPORTED if the local device does not support + * tBTM_STATUS::BTM_MODE_UNSUPPORTED if the local device does not support * role switching * ******************************************************************************/ diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h index 8b6ff6e6d7..042e997732 100644 --- a/system/stack/include/btm_api.h +++ b/system/stack/include/btm_api.h @@ -513,7 +513,7 @@ void BTM_RequestPeerSCA(const RawAddress& remote_bda, tBT_TRANSPORT transport); * inquriry response * * Returns tBTM_STATUS::BTM_SUCCESS - if successful - * BTM_MODE_UNSUPPORTED - if local device cannot support it + * tBTM_STATUS::BTM_MODE_UNSUPPORTED - if local device cannot support it * ******************************************************************************/ [[nodiscard]] tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff); |