From 0ef9e3edd38c550b53d09913a2dc342eb88d3e64 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Fri, 12 Mar 2021 19:24:11 -0800 Subject: [PATCH] Use proper type tHCI_REASON btm_get_acl_disc_reason_code Toward readable code Bug: 163134718 Test: gd/cert/run Tag: #refactor BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines Change-Id: I7b2adfaa55feb96c620adfa5a6cb997055f1ce10 --- bta/test/common/mock_stack_acl.cc | 4 ++-- btif/src/btif_dm.cc | 9 +++++++-- gd/hci/acl_manager/classic_acl_connection.cc | 1 - main/test/common/mock_stack_acl.cc | 4 ++-- stack/acl/btm_acl.cc | 2 +- stack/hid/hidh_conn.cc | 2 +- stack/include/acl_api.h | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bta/test/common/mock_stack_acl.cc b/bta/test/common/mock_stack_acl.cc index 450475ce8..b976734d4 100644 --- a/bta/test/common/mock_stack_acl.cc +++ b/bta/test/common/mock_stack_acl.cc @@ -211,9 +211,9 @@ uint16_t acl_get_supported_packet_types() { mock_function_count_map[__func__]++; return 0; } -uint16_t btm_get_acl_disc_reason_code(void) { +tHCI_REASON btm_get_acl_disc_reason_code(void) { mock_function_count_map[__func__]++; - return 0; + return HCI_SUCCESS; } uint8_t BTM_SetTraceLevel(uint8_t new_level) { mock_function_count_map[__func__]++; diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index 8fca442b6..365aeffb6 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -1542,11 +1542,16 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { btm_set_bond_type_dev(p_data->link_down.bd_addr, tBTM_SEC_DEV_REC::BOND_TYPE_UNKNOWN); btif_av_acl_disconnected(bd_addr); - BTIF_TRACE_DEBUG( - "BTA_DM_LINK_DOWN_EVT. Sending BT_ACL_STATE_DISCONNECTED"); invoke_acl_state_changed_cb(BT_STATUS_SUCCESS, bd_addr, BT_ACL_STATE_DISCONNECTED, static_cast(btm_get_acl_disc_reason_code())); + LOG_DEBUG( + "Sent BT_ACL_STATE_DISCONNECTED upward as ACL link down event " + "device:%s reason:%s", + PRIVATE_ADDRESS(bd_addr), + hci_reason_code_text( + static_cast(btm_get_acl_disc_reason_code())) + .c_str()); break; case BTA_DM_BLE_KEY_EVT: diff --git a/gd/hci/acl_manager/classic_acl_connection.cc b/gd/hci/acl_manager/classic_acl_connection.cc index 0d5f68a60..52b24ba89 100644 --- a/gd/hci/acl_manager/classic_acl_connection.cc +++ b/gd/hci/acl_manager/classic_acl_connection.cc @@ -275,7 +275,6 @@ class AclConnectionTracker : public ConnectionManagementCallbacks { void on_read_remote_supported_features_status(CommandStatusView view) { ASSERT_LOG(view.IsValid(), "Bad status packet!"); - LOG_INFO("UNIMPLEMENTED called: %s", hci::ErrorCodeText(view.GetStatus()).c_str()); } void on_read_remote_extended_features_status(CommandStatusView view) { diff --git a/main/test/common/mock_stack_acl.cc b/main/test/common/mock_stack_acl.cc index c9061f2a6..4f02cfb3d 100644 --- a/main/test/common/mock_stack_acl.cc +++ b/main/test/common/mock_stack_acl.cc @@ -210,9 +210,9 @@ uint16_t acl_get_supported_packet_types() { mock_function_count_map[__func__]++; return 0; } -uint16_t btm_get_acl_disc_reason_code(void) { +tHCI_REASON btm_get_acl_disc_reason_code(void) { mock_function_count_map[__func__]++; - return 0; + return HCI_SUCCESS; } uint8_t BTM_SetTraceLevel(uint8_t new_level) { mock_function_count_map[__func__]++; diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc index 92ec9cc0f..30b656a15 100644 --- a/stack/acl/btm_acl.cc +++ b/stack/acl/btm_acl.cc @@ -1206,7 +1206,7 @@ uint16_t BTM_GetNumAclLinks(void) { * Returns true if connection is up, else false. * ******************************************************************************/ -uint16_t btm_get_acl_disc_reason_code(void) { +tHCI_REASON btm_get_acl_disc_reason_code(void) { return btm_cb.acl_cb_.get_disconnect_reason(); } diff --git a/stack/hid/hidh_conn.cc b/stack/hid/hidh_conn.cc index 3d56bba20..31a30a4e0 100644 --- a/stack/hid/hidh_conn.cc +++ b/stack/hid/hidh_conn.cc @@ -452,7 +452,7 @@ static void hidh_l2cif_config_cfm(uint16_t l2cap_cid, uint16_t initiator, static void hidh_l2cif_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) { uint8_t dhandle; tHID_CONN* p_hcon = NULL; - uint16_t disc_res = HCI_SUCCESS; + tHCI_REASON disc_res = HCI_SUCCESS; uint16_t hid_close_evt_reason; /* Find CCB based on CID */ diff --git a/stack/include/acl_api.h b/stack/include/acl_api.h index 5c1bdc249..b4829d860 100644 --- a/stack/include/acl_api.h +++ b/stack/include/acl_api.h @@ -298,7 +298,7 @@ void btm_process_cancel_complete(uint8_t status, uint8_t mode); uint8_t btm_handle_to_acl_index(uint16_t hci_handle); -uint16_t btm_get_acl_disc_reason_code(void); +tHCI_REASON btm_get_acl_disc_reason_code(void); extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport); -- 2.11.0