From 3aad5a09f4bd711c6b7bc618480d20f55158f492 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Tue, 31 Oct 2017 11:31:15 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_disable_role_switch' into 'master' component/bt: disable the use of ROLE_SWITCH feature for classic BT as workaround See merge request !1446 --- components/bt/bluedroid/stack/include/hcidefs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/bluedroid/stack/include/hcidefs.h b/components/bt/bluedroid/stack/include/hcidefs.h index faf04fd9f..87dec34a0 100644 --- a/components/bt/bluedroid/stack/include/hcidefs.h +++ b/components/bt/bluedroid/stack/include/hcidefs.h @@ -1469,7 +1469,8 @@ typedef struct { #define HCI_FEATURE_SWITCH_MASK 0x20 #define HCI_FEATURE_SWITCH_OFF 0 -#define HCI_SWITCH_SUPPORTED(x) ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK) +// temporarily disable ROLE_SWITCH since there is an issue to be fixed +#define HCI_SWITCH_SUPPORTED(x) (0 & ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK)) #define HCI_FEATURE_HOLD_MODE_MASK 0x40 #define HCI_FEATURE_HOLD_MODE_OFF 0