From ec7bf9fa7bf70175c1024e2772528377962e2bc4 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Mon, 7 Sep 2020 12:39:01 -0700 Subject: [PATCH] Move acl only #defs BTM_ACL Towards readable code Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Change-Id: I70efdaa1f6907e9cd5f394c7d90a1a97bce202ad --- stack/acl/btm_acl.cc | 17 +++++++++++++++++ stack/btm/security_device_record.h | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc index 2da74b3e7..51ea5bed9 100644 --- a/stack/acl/btm_acl.cc +++ b/stack/acl/btm_acl.cc @@ -75,6 +75,23 @@ StackAclBtmAcl internal_; #define 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) + +#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) + +#define BTM_EPR_AVAILABLE(p) \ + ((HCI_ATOMIC_ENCRYPT_SUPPORTED((p)->peer_lmp_feature_pages[0]) && \ + controller_get_interface()->supports_encryption_pause()) \ + ? true \ + : false) + extern tBTM_CB btm_cb; static void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p, diff --git a/stack/btm/security_device_record.h b/stack/btm/security_device_record.h index 9f04ec431..d703ca58c 100644 --- a/stack/btm/security_device_record.h +++ b/stack/btm/security_device_record.h @@ -27,23 +27,6 @@ typedef char tBTM_LOC_BD_NAME[BTM_MAX_LOC_BD_NAME_LEN + 1]; -/* 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) - -#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) - -#define BTM_EPR_AVAILABLE(p) \ - ((HCI_ATOMIC_ENCRYPT_SUPPORTED((p)->peer_lmp_feature_pages[0]) && \ - controller_get_interface()->supports_encryption_pause()) \ - ? true \ - : false) - #define BTM_IS_BRCM_CONTROLLER() \ (controller_get_interface()->get_bt_version()->manufacturer == \ LMP_COMPID_BROADCOM) -- 2.11.0