commit 43ede32522dd5ac0275409169c888c43c3590cba
author Chris Manton <cmanton@google.com> Tue Mar 09 15:29:58 2021 -0800
committer Chris Manton <cmanton@google.com> Sat Mar 13 09:29:15 2021 -0800
tree 8fda43c6108d7a2df8e154f41d6c7365c29199b8
parent 20cf70b630c09e5333811d1db0ddc39761551198

Const-ify stack/acl/btm_acl::packet types defs

Bug: 182370398
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I84063d5c4ada9156f5c9d200b2c0a534cb403eb9

system/stack/acl/btm_acl.cc

diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc
index 3ae2d88..317bdc5 100644
--- a/system/stack/acl/btm_acl.cc
+++ b/system/stack/acl/btm_acl.cc
@@ -103,18 +103,18 @@
   uint16_t hci_len;
 } __attribute__((packed)) acl_header_t;
 
-#define BTM_MAX_SW_ROLE_FAILED_ATTEMPTS 3
+constexpr uint8_t BTM_MAX_SW_ROLE_FAILED_ATTEMPTS = 3;
 
 /* Define masks for supported and exception 2.0 ACL packet types
  */
-#define BTM_ACL_SUPPORTED_PKTS_MASK                                           \
-  (HCI_PKT_TYPES_MASK_DM1 | HCI_PKT_TYPES_MASK_DH1 | HCI_PKT_TYPES_MASK_DM3 | \
-   HCI_PKT_TYPES_MASK_DH3 | HCI_PKT_TYPES_MASK_DM5 | HCI_PKT_TYPES_MASK_DH5)
+constexpr uint16_t BTM_ACL_SUPPORTED_PKTS_MASK =
+    (HCI_PKT_TYPES_MASK_DM1 | HCI_PKT_TYPES_MASK_DH1 | HCI_PKT_TYPES_MASK_DM3 |
+     HCI_PKT_TYPES_MASK_DH3 | HCI_PKT_TYPES_MASK_DM5 | HCI_PKT_TYPES_MASK_DH5);
 
-#define BTM_ACL_EXCEPTION_PKTS_MASK                            \
-  (HCI_PKT_TYPES_MASK_NO_2_DH1 | HCI_PKT_TYPES_MASK_NO_3_DH1 | \
-   HCI_PKT_TYPES_MASK_NO_2_DH3 | HCI_PKT_TYPES_MASK_NO_3_DH3 | \
-   HCI_PKT_TYPES_MASK_NO_2_DH5 | HCI_PKT_TYPES_MASK_NO_3_DH5)
+constexpr uint16_t BTM_ACL_EXCEPTION_PKTS_MASK =
+    (HCI_PKT_TYPES_MASK_NO_2_DH1 | HCI_PKT_TYPES_MASK_NO_3_DH1 |
+     HCI_PKT_TYPES_MASK_NO_2_DH3 | HCI_PKT_TYPES_MASK_NO_3_DH3 |
+     HCI_PKT_TYPES_MASK_NO_2_DH5 | HCI_PKT_TYPES_MASK_NO_3_DH5);
 
 inline bool IsEprAvailable(const tACL_CONN& p_acl) {
   if (!p_acl.peer_lmp_feature_valid[0]) {