From 7e98d99e3716e685faa2057576273d74597ed17f Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Thu, 10 Sep 2020 16:25:36 -0700 Subject: [PATCH] Remove useless #def BTM_IS_BRCM_CONTROLLER Towards readable code Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Test: act.py -tc BleCocTest Change-Id: Ic3f54bab7f13cde30b3089ca41bc5b4b1e33a2e8 --- stack/l2cap/l2c_utils.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/stack/l2cap/l2c_utils.cc b/stack/l2cap/l2c_utils.cc index 19b8475a9..1e580c1f4 100644 --- a/stack/l2cap/l2c_utils.cc +++ b/stack/l2cap/l2c_utils.cc @@ -2202,10 +2202,6 @@ bool l2cu_lcb_disconnecting(void) { * ******************************************************************************/ -#define BTM_IS_BRCM_CONTROLLER() \ - (controller_get_interface()->get_bt_version()->manufacturer == \ - LMP_COMPID_BROADCOM) - bool l2cu_set_acl_priority(const RawAddress& bd_addr, uint8_t priority, bool reset_after_rs) { tL2C_LCB* p_lcb; @@ -2222,7 +2218,8 @@ bool l2cu_set_acl_priority(const RawAddress& bd_addr, uint8_t priority, return (false); } - if (BTM_IS_BRCM_CONTROLLER()) { + if (controller_get_interface()->get_bt_version()->manufacturer == + LMP_COMPID_BROADCOM) { /* Called from above L2CAP through API; send VSC if changed */ if ((!reset_after_rs && (priority != p_lcb->acl_priority)) || /* Called because of a master/slave role switch; if high resend VSC */ -- 2.11.0