From 06ff1ceae3bdc81ac3ed656b233fcb5af881efc0 Mon Sep 17 00:00:00 2001 From: baohongde Date: Thu, 20 Feb 2020 15:21:28 +0800 Subject: [PATCH] Fix bugs about role switch Jitter in FHS Jitter in first PULL Receive EDR packet fail after role switch --- components/bt/controller/lib | 2 +- components/bt/host/bluedroid/stack/include/stack/hcidefs.h | 3 +-- components/esp_rom/esp32/ld/esp32.rom.ld | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index f1ea6a5b8..c9717bf8f 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit f1ea6a5b8c50de1b561cd75090140ad9af68070a +Subproject commit c9717bf8f97b1e56f959cf3c8468f0e37ce0cd83 diff --git a/components/bt/host/bluedroid/stack/include/stack/hcidefs.h b/components/bt/host/bluedroid/stack/include/stack/hcidefs.h index b1b73efa7..fdce44d80 100644 --- a/components/bt/host/bluedroid/stack/include/stack/hcidefs.h +++ b/components/bt/host/bluedroid/stack/include/stack/hcidefs.h @@ -1522,8 +1522,7 @@ typedef struct { #define HCI_FEATURE_SWITCH_MASK 0x20 #define HCI_FEATURE_SWITCH_OFF 0 -// 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_SWITCH_SUPPORTED(x) ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK) #define HCI_FEATURE_HOLD_MODE_MASK 0x40 #define HCI_FEATURE_HOLD_MODE_OFF 0 diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 6943a7479..78e24fdef 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -654,6 +654,7 @@ PROVIDE ( ld_acl_rx_sync = 0x4002fbec ); PROVIDE ( ld_acl_rx_sync2 = 0x4002fd8c ); PROVIDE ( ld_acl_rx_no_sync = 0x4002fe78 ); PROVIDE ( ld_acl_clk_isr = 0x40030cf8 ); +PROVIDE ( ld_acl_rsw_frm_cbk = 0x40033bb0 ); PROVIDE ( ld_sco_modify = 0x40031778 ); PROVIDE ( lm_cmd_cmp_send = 0x40051838 ); PROVIDE ( ld_sco_frm_cbk = 0x400349dc );