From d64f464405b22ac7a9543e0a96dd39926516ae15 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Thu, 24 Sep 2020 17:11:21 -0700
Subject: [PATCH] Straighten out
 stack/acl/btm_acl::btm_read_remote_version_complete

Towards readable code

Bug: 163134718
Tag: #refactor
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I87db6ce0106e98684f1582a60f28beed81d66aec
---
 stack/acl/btm_acl.cc | 66 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc
index 0756e3a29..a090e8170 100644
--- a/stack/acl/btm_acl.cc
+++ b/stack/acl/btm_acl.cc
@@ -805,41 +805,51 @@ void BTM_default_block_role_switch() {
  * Returns          void
  *
  ******************************************************************************/
+static void btm_process_remote_version_complete(uint8_t status, uint16_t handle,
+                                                uint8_t lmp_version,
+                                                uint16_t manufacturer,
+                                                uint16_t lmp_subversion) {
+  tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle);
+  if (p_acl_cb == nullptr) {
+    LOG_WARN("Received remote version complete for unknown device");
+    return;
+  }
+
+  if (status == HCI_SUCCESS) {
+    p_acl_cb->lmp_version = lmp_version;
+    p_acl_cb->manufacturer = manufacturer;
+    p_acl_cb->lmp_subversion = lmp_subversion;
+
+    if (p_acl_cb->transport == BT_TRANSPORT_BR_EDR) {
+      internal_.btm_read_remote_features(p_acl_cb->hci_handle);
+    }
+    bluetooth::common::LogRemoteVersionInfo(handle, status, lmp_version,
+                                            manufacturer, lmp_subversion);
+  } else {
+    bluetooth::common::LogRemoteVersionInfo(handle, status, 0, 0, 0);
+  }
+
+  if (p_acl_cb->transport == BT_TRANSPORT_LE) {
+    l2cble_notify_le_connection(p_acl_cb->remote_addr);
+    l2cble_use_preferred_conn_params(p_acl_cb->remote_addr);
+  }
+}
+
 void btm_read_remote_version_complete(uint8_t* p) {
-  tACL_CONN* p_acl_cb = &btm_cb.acl_cb_.acl_db[0];
   uint8_t status;
   uint16_t handle;
-  int xx;
-  BTM_TRACE_DEBUG("btm_read_remote_version_complete");
+  uint8_t lmp_version;
+  uint16_t manufacturer;
+  uint16_t lmp_subversion;
 
   STREAM_TO_UINT8(status, p);
   STREAM_TO_UINT16(handle, p);
+  STREAM_TO_UINT8(lmp_version, p);
+  STREAM_TO_UINT16(manufacturer, p);
+  STREAM_TO_UINT16(lmp_subversion, p);
 
-  /* Look up the connection by handle and copy features */
-  for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_acl_cb++) {
-    if ((p_acl_cb->in_use) && (p_acl_cb->hci_handle == handle)) {
-      if (status == HCI_SUCCESS) {
-        STREAM_TO_UINT8(p_acl_cb->lmp_version, p);
-        STREAM_TO_UINT16(p_acl_cb->manufacturer, p);
-        STREAM_TO_UINT16(p_acl_cb->lmp_subversion, p);
-
-        if (p_acl_cb->transport == BT_TRANSPORT_BR_EDR) {
-          internal_.btm_read_remote_features(p_acl_cb->hci_handle);
-        }
-        bluetooth::common::LogRemoteVersionInfo(
-            handle, status, p_acl_cb->lmp_version, p_acl_cb->manufacturer,
-            p_acl_cb->lmp_subversion);
-      } else {
-        bluetooth::common::LogRemoteVersionInfo(handle, status, 0, 0, 0);
-      }
-
-      if (p_acl_cb->transport == BT_TRANSPORT_LE) {
-        l2cble_notify_le_connection(p_acl_cb->remote_addr);
-        l2cble_use_preferred_conn_params(p_acl_cb->remote_addr);
-      }
-      break;
-    }
-  }
+  btm_process_remote_version_complete(status, handle, lmp_version, manufacturer,
+                                      lmp_subversion);
 }
 
 /*******************************************************************************
-- 
2.11.0