From 0ee8db80ff78217940e45493a3d9199cb6ee21a7 Mon Sep 17 00:00:00 2001 From: baohongde Date: Tue, 6 Nov 2018 18:03:15 +0800 Subject: [PATCH] components/bt: Point ACL RX buffer ptr to ACL RX buffer if ACL RX buffer ptr is null When WIFI task or other high priority task blocks the Bluetooth task, ACL RX buffer will use up, ACL RX buffer ptr will point to null and will never point to a valid adress. Causing errors in Bluetooth. --- components/bt/lib | 2 +- components/esp32/ld/esp32.rom.ld | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/bt/lib b/components/bt/lib index 979dd2c742..fbff6e8cb7 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 979dd2c7420e9323b3bf9dacdaa1393906114961 +Subproject commit fbff6e8cb7df876015efabf187b5c2399cfd3ffc diff --git a/components/esp32/ld/esp32.rom.ld b/components/esp32/ld/esp32.rom.ld index ca9d843a83..4be6b114a3 100644 --- a/components/esp32/ld/esp32.rom.ld +++ b/components/esp32/ld/esp32.rom.ld @@ -762,6 +762,7 @@ PROVIDE ( lmp_io_cap_req_handler = 0x4002c7a4 ); PROVIDE ( ld_acl_tx_packet_type_select = 0x4002fb40 ); PROVIDE ( ld_acl_sched = 0x40033268 ); PROVIDE ( ld_acl_sniff_sched = 0x4003340c ); +PROVIDE ( ld_acl_clk_isr = 0x40030cf8 ); PROVIDE ( lm_cmd_cmp_send = 0x40051838 ); PROVIDE ( r_ld_acl_active_hop_types_get = 0x40036e10 ); 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 ( 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 compatible. These functions also use a chunk of static RAM, by not using them we can allocate that RAM for general use.