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

Commit 43ede325 authored by Chris Manton's avatar Chris Manton
Browse files

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
parent 20cf70b6

system/stack/acl/btm_acl.cc

+9 −9
Original line number Diff line number Diff line
@@ -103,18 +103,18 @@ typedef struct { 
  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)



#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_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_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]) {