ソースを参照

components/bt: backports to release/v4.1

Fix bugs about role switch
Fix watchdog timeout when sleep enabled and crash without enabling sw coex
Fix ble crash issue triggered by ble event irq miss(0x20000)
Future events scheduling error in case of wifi and bluetooth.
baohongde 6 年 前
コミット
a74d85945a

+ 1 - 1
components/bt/controller/lib

@@ -1 +1 @@
-Subproject commit 6a94e32fa9b1f78c990ef4725f66fac05040ff29
+Subproject commit 6b12784dccee69577b0a7b40784ddee3e09b31f5

+ 1 - 2
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

+ 1 - 0
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 );