espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/iperf_bt_error_when_wifi_connect_v3.0' into 'release/v3.0'

Browse Source 
components/bt: Point ACL RX buffer ptr to ACL RX buffer if ACL RX buffer ptr is null(backport 3.0)

See merge request idf/esp-idf!3644
This commit is contained in:
Jiang Jiang Jian
2018-11-12 15:29:37 +08:00
parent f9f3870e02 0ee8db80ff
commit 93530e676e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/lib

Submodule components/bt/lib updated: 979dd2c742...fbff6e8cb7

5
components/esp32/ld/esp32.rom.ld
View File

@@ -762,6 +762,7 @@ PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 );
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 );
PROVIDE ( ld_acl_clk_isr = 0x40030cf8 );
PROVIDE ( lm_cmd_cmp_send = 0x40051838 ); PROVIDE ( lm_cmd_cmp_send = 0x40051838 );
PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 ); PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 );
PROVIDE ( r_ld_acl_afh_confirm = 0x40036d40 ); PROVIDE ( r_ld_acl_afh_confirm = 0x40036d40 );
@@ -1485,8 +1486,8 @@ PROVIDE ( esp_rom_spiflash_attach = 0x40062a6c );
PROVIDE ( esp_rom_spiflash_config_clk = 0x40062bc8 ); PROVIDE ( esp_rom_spiflash_config_clk = 0x40062bc8 );
PROVIDE ( g_rom_spiflash_chip = 0x3ffae270 ); PROVIDE ( g_rom_spiflash_chip = 0x3ffae270 );
/* /*
These functions are xtos-related (or call xtos-related functions) and do not play well These functions are xtos-related (or call xtos-related functions) and do not play well
with multicore FreeRTOS. Where needed, we provide alternatives that are multicore with multicore FreeRTOS. Where needed, we provide alternatives that are multicore
compatible. These functions also use a chunk of static RAM, by not using them we can compatible. These functions also use a chunk of static RAM, by not using them we can
allocate that RAM for general use. allocate that RAM for general use.