Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 974aa058 authored by Chris Manton's avatar Chris Manton
Browse files

Move acl only #defs BTM_ACL 

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I70efdaa1f6907e9cd5f394c7d90a1a97bce202ad
parent 3ee084d1

system/stack/acl/btm_acl.cc

+17 −0
Original line number Diff line number Diff line
@@ -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,

system/stack/btm/security_device_record.h

+0 −17
Original line number Diff line number Diff line
@@ -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)