From b45f2d3913e5348e7e31957967b83f4a3056c231 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 15:39:06 +0800 Subject: [PATCH 01/13] Move default log level to WARNING instead ERROR in BT Controller --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 3524d276d..bc7e6aaf8 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 3524d276d64e6d8ec07688fd374581a5d305ad6d +Subproject commit bc7e6aaf80f9f5f6364b867a232cba3f9f404e5a From 899e49b90e435dc168e4d811bccd87ddeec7a2b3 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 15:47:52 +0800 Subject: [PATCH 02/13] Disable frequent warning log in ld_acl --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index bc7e6aaf8..e5ea8e195 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit bc7e6aaf80f9f5f6364b867a232cba3f9f404e5a +Subproject commit e5ea8e195f02c9893333f7d9b1eff31c3f0028cc From e0e1154b6246d39e16c23af03d278520cc788efd Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 16:04:09 +0800 Subject: [PATCH 03/13] Fix ASSERT(25,0) in lc_task.c --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index e5ea8e195..83b70bd82 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit e5ea8e195f02c9893333f7d9b1eff31c3f0028cc +Subproject commit 83b70bd82bb07b33cc2196a26b1a100bd1989322 From 7aeb3d329a47ee29200b95ab55b00eddd9a73417 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 16:17:46 +0800 Subject: [PATCH 04/13] Set AFH in BTDM Task when WiFi changes channel --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 83b70bd82..cfba102ef 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 83b70bd82bb07b33cc2196a26b1a100bd1989322 +Subproject commit cfba102efc7a14ed370a1b4bbc488e8142fb11de From c18ed5cbee531d6e12f5fb0237713ee2cbdc875b Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 16:29:27 +0800 Subject: [PATCH 05/13] Fix Connection fail in loop --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index cfba102ef..a3f99fe55 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit cfba102efc7a14ed370a1b4bbc488e8142fb11de +Subproject commit a3f99fe556010429a2c41adf504c1c920f0ee70e From 70fa5b4ac5d6679aa2ff61352965bb7e4d36168b Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 16:57:36 +0800 Subject: [PATCH 06/13] Fix int_wdt due to disable interrupt too long time --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index a3f99fe55..f2b880904 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit a3f99fe556010429a2c41adf504c1c920f0ee70e +Subproject commit f2b88090488618ae67c137728d4e7b87e119c18b From 190ff3ae37bbd0033001e219bff90438ab5ba7c8 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 17:17:40 +0800 Subject: [PATCH 07/13] Fix that when slave initiate unsniff procedure and meet transaction collision, no mode change event is repoerted --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index f2b880904..a00ec2a23 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit f2b88090488618ae67c137728d4e7b87e119c18b +Subproject commit a00ec2a23d3831f4b0bac466ebb86341293b9132 From b20f254483eaaf27f3927f885a2913c77b0877c5 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 17:44:02 +0800 Subject: [PATCH 08/13] Free lmp tx buf in EM in the procedure of handling LMP_detach_Req when not received the last acknowledge from peer device and seperate them by ACL State --- components/bt/controller/lib | 2 +- components/esp_rom/esp32/ld/esp32.rom.ld | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index a00ec2a23..3b1ba4847 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit a00ec2a23d3831f4b0bac466ebb86341293b9132 +Subproject commit 3b1ba4847e1ab2ac35c849594bcda530b172212c diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 0b6f173c2..7065cf3fd 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -707,6 +707,9 @@ PROVIDE ( r_ld_acl_timing_accuracy_set = 0x4003673c ); PROVIDE ( r_ld_acl_t_poll_get = 0x40036024 ); PROVIDE ( r_ld_acl_t_poll_set = 0x40036068 ); PROVIDE ( r_ld_acl_tx_enc = 0x400362f8 ); +PROVIDE ( ld_acl_frm_cbk = 0x40034414 ); +PROVIDE ( ld_acl_rsw_end = 0x40032bc0 ); +PROVIDE ( ld_acl_end = 0x40033140 ); PROVIDE ( r_ld_acl_unsniff = 0x400361e0 ); PROVIDE ( r_ld_active_check = 0x4003cac4 ); PROVIDE ( r_ld_afh_ch_assess_data_get = 0x4003caec ); From 08118513787634207dcd218d3dc599e822838b80 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 17:53:43 +0800 Subject: [PATCH 09/13] Fix ASSERT in ld_pscan.c at line 1032 --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 3b1ba4847..9b90c2c49 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 3b1ba4847e1ab2ac35c849594bcda530b172212c +Subproject commit 9b90c2c49ac105afb14bddc5a5f7228d2f45b1bc From 55877684a05f35d9afe91a1f8fd1141c23b33663 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 18:00:17 +0800 Subject: [PATCH 10/13] Fix ASSERT(64,0) in rwble.c --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 9b90c2c49..0ec0b596b 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 9b90c2c49ac105afb14bddc5a5f7228d2f45b1bc +Subproject commit 0ec0b596be39d6dbd7fb765f7fbfb76b9b8f0f71 From 77cc105c72650a2b6e94cfe077ed55154a5f80c6 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 18:52:15 +0800 Subject: [PATCH 11/13] Fix ld_acl schedule bug to parity shift --- components/bt/controller/lib | 2 +- components/esp_rom/esp32/ld/esp32.rom.ld | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 0ec0b596b..b5039ec9d 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 0ec0b596be39d6dbd7fb765f7fbfb76b9b8f0f71 +Subproject commit b5039ec9d25385fa99e30f73e2b61f96793e6b2c diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index 7065cf3fd..073a6a94b 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -710,6 +710,8 @@ PROVIDE ( r_ld_acl_tx_enc = 0x400362f8 ); PROVIDE ( ld_acl_frm_cbk = 0x40034414 ); PROVIDE ( ld_acl_rsw_end = 0x40032bc0 ); PROVIDE ( ld_acl_end = 0x40033140 ); +PROVIDE ( ld_acl_resched = 0x40033814 ); +PROVIDE ( ld_acl_test_mode_update = 0x40032050 ); PROVIDE ( r_ld_acl_unsniff = 0x400361e0 ); PROVIDE ( r_ld_active_check = 0x4003cac4 ); PROVIDE ( r_ld_afh_ch_assess_data_get = 0x4003caec ); From 8d1032ccac2499aa79b79d3c984b992496c2b873 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Sat, 9 May 2020 19:02:08 +0800 Subject: [PATCH 12/13] Fix ASSERT in ld_acl at line 302 forclkoff1 and localval --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index b5039ec9d..6c438a717 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit b5039ec9d25385fa99e30f73e2b61f96793e6b2c +Subproject commit 6c438a71726be5a7e0b7342815896297a12e9f0b From 8fc05d066595c3663d1682ee34ecca99ea580ea3 Mon Sep 17 00:00:00 2001 From: weitianhua Date: Mon, 11 May 2020 15:59:11 +0800 Subject: [PATCH 13/13] Fix ASSERT for RXDESC and save the log for debug --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 6c438a717..1ca31794e 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 6c438a71726be5a7e0b7342815896297a12e9f0b +Subproject commit 1ca31794e76126cdb389873599dc2f99e22b5ef7