commit 0c5ff26307bbcdba651c9c1507229a76537e5eaa
author Myles Watson <mylesgw@google.com> Mon Jul 17 12:00:52 2023 -0700
committer Myles Watson <mylesgw@google.com> Mon Jul 17 14:51:37 2023 -0700
tree 6e00725033f9196ca1b1bec09f24e101e26acfdd
parent 803d1097870e0c78cff4618510c665c79035bc05

Controller: Remove dependency on int flags

The dependency shouldn't be in the header file.  Otherwise
it forces mocks to find it, as well.

Bug: 283254594
Test: mma -j32
Change-Id: I5d82bf128aaab9f07f4ee2e8e1a53cf01e61272b

system/gd/hci/controller.cc

diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
index 425bac9..8c25637 100644
--- a/system/gd/hci/controller.cc
+++ b/system/gd/hci/controller.cc
@@ -1348,6 +1348,25 @@
   return impl_->is_supported(op_code);
 }
 
+uint64_t Controller::MaskLeEventMask(HciVersion version, uint64_t mask) {
+  if (!common::init_flags::subrating_is_enabled()) {
+    mask = mask & ~(static_cast<uint64_t>(LLFeaturesBits::CONNECTION_SUBRATING_HOST_SUPPORT));
+  }
+  if (version >= HciVersion::V_5_3) {
+    return mask;
+  } else if (version >= HciVersion::V_5_2) {
+    return mask & kLeEventMask52;
+  } else if (version >= HciVersion::V_5_1) {
+    return mask & kLeEventMask51;
+  } else if (version >= HciVersion::V_5_0) {
+    return mask & kLeEventMask50;
+  } else if (version >= HciVersion::V_4_2) {
+    return mask & kLeEventMask42;
+  } else {
+    return mask & kLeEventMask41;
+  }
+}
+
 const ModuleFactory Controller::Factory = ModuleFactory([]() { return new Controller(); });
 
 void Controller::ListDependencies(ModuleList* list) const {

system/gd/hci/controller.h

diff --git a/system/gd/hci/controller.h b/system/gd/hci/controller.h
index db2f9ab..d05600d 100644
--- a/system/gd/hci/controller.h
+++ b/system/gd/hci/controller.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "common/init_flags.h"
 #include "hci/address.h"
 #include "hci/hci_packets.h"
 #include "hci/le_rand_callback.h"
@@ -219,24 +218,7 @@
   static constexpr uint64_t kLeEventMask42 = 0x00000000000003ff;
   static constexpr uint64_t kLeEventMask41 = 0x000000000000003f;
 
-  static uint64_t MaskLeEventMask(HciVersion version, uint64_t mask) {
-    if (!common::init_flags::subrating_is_enabled()) {
-      mask = mask & ~(static_cast<uint64_t>(LLFeaturesBits::CONNECTION_SUBRATING_HOST_SUPPORT));
-    }
-    if (version >= HciVersion::V_5_3) {
-      return mask;
-    } else if (version >= HciVersion::V_5_2) {
-      return mask & kLeEventMask52;
-    } else if (version >= HciVersion::V_5_1) {
-      return mask & kLeEventMask51;
-    } else if (version >= HciVersion::V_5_0) {
-      return mask & kLeEventMask50;
-    } else if (version >= HciVersion::V_4_2) {
-      return mask & kLeEventMask42;
-    } else {
-      return mask & kLeEventMask41;
-    }
-  }
+  static uint64_t MaskLeEventMask(HciVersion version, uint64_t mask);
 
  protected:
   void ListDependencies(ModuleList* list) const override;