Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_backports_v3.2_0328' into 'release/v3.2'

Browse source 
Bugfix/btdm backports v3.2 0328

See merge request espressif/esp-idf!8154
This commit is contained in:
Jiang Jiang Jian 2020-04-16 20:53:05 +08:00
commit acfee765f7
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/bt/bluedroid/stack/include/stack/hcidefs.h
View file

@ -1521,8 +1521,7 @@ typedef struct {
#define HCI_FEATURE_SWITCH_MASK 0x20 #define HCI_FEATURE_SWITCH_MASK 0x20
#define HCI_FEATURE_SWITCH_OFF 0 #define HCI_FEATURE_SWITCH_OFF 0
// temporarily disable ROLE_SWITCH since there is an issue to be fixed #define HCI_SWITCH_SUPPORTED(x) ((x)[HCI_FEATURE_SWITCH_OFF] & HCI_FEATURE_SWITCH_MASK)
#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_MASK 0x40
#define HCI_FEATURE_HOLD_MODE_OFF 0 #define HCI_FEATURE_HOLD_MODE_OFF 0

2
components/bt/lib

@ -1 +1 @@
Subproject commit 21d16b124158e4398ec4c363472f3a8c737399f6 Subproject commit ab7570ca071b5c860ddb8c9cf257016353da102e

2
components/esp32/ld/esp32.rom.ld
View file

@ -665,6 +665,7 @@ PROVIDE ( lmp_dhkey_chk_handler = 0x4002ab48 );
PROVIDE ( lmp_pause_enc_aes_req_handler = 0x400279a4 ); PROVIDE ( lmp_pause_enc_aes_req_handler = 0x400279a4 );
PROVIDE ( lmp_io_cap_res_handler = 0x4002c670 ); PROVIDE ( lmp_io_cap_res_handler = 0x4002c670 );
PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 ); PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 );
PROVIDE ( lc_cmd_cmp_bd_addr_send = 0x4002cec4 );
PROVIDE ( ld_acl_tx_packet_type_select = 0x4002fb40 ); PROVIDE ( ld_acl_tx_packet_type_select = 0x4002fb40 );
PROVIDE ( ld_acl_sched = 0x40033268 ); PROVIDE ( ld_acl_sched = 0x40033268 );
PROVIDE ( ld_acl_sniff_sched = 0x4003340c ); PROVIDE ( ld_acl_sniff_sched = 0x4003340c );
@ -674,6 +675,7 @@ PROVIDE ( ld_acl_rx_sync = 0x4002fbec );
PROVIDE ( ld_acl_rx_sync2 = 0x4002fd8c ); PROVIDE ( ld_acl_rx_sync2 = 0x4002fd8c );
PROVIDE ( ld_acl_rx_no_sync = 0x4002fe78 ); PROVIDE ( ld_acl_rx_no_sync = 0x4002fe78 );
PROVIDE ( ld_acl_clk_isr = 0x40030cf8 ); PROVIDE ( ld_acl_clk_isr = 0x40030cf8 );
PROVIDE ( ld_acl_rsw_frm_cbk = 0x40033bb0 );
PROVIDE ( ld_sco_modify = 0x40031778 ); PROVIDE ( ld_sco_modify = 0x40031778 );
PROVIDE ( lm_cmd_cmp_send = 0x40051838 ); PROVIDE ( lm_cmd_cmp_send = 0x40051838 );
PROVIDE ( ld_sco_frm_cbk = 0x400349dc ); PROVIDE ( ld_sco_frm_cbk = 0x400349dc );