From 5632385d5f8c9cf411acfbc8ab6da2411c1c06aa Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Tue, 27 Mar 2018 16:35:00 +0800 Subject: [PATCH 1/2] component/bt : add bluetooth controller library compile version --- components/bt/bt.c | 3 +++ components/bt/lib | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/bt/bt.c b/components/bt/bt.c index c53e9c9336..78b26a73b4 100644 --- a/components/bt/bt.c +++ b/components/bt/bt.c @@ -57,6 +57,7 @@ extern int btdm_controller_deinit(void); extern int btdm_controller_enable(esp_bt_mode_t mode); extern int btdm_controller_disable(esp_bt_mode_t mode); extern uint8_t btdm_controller_get_mode(void); +extern const char *btdm_controller_get_compile_version(void); extern void btdm_rf_bb_init(void); /* VHCI function interface */ @@ -477,6 +478,8 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) } #endif + ESP_LOGI(BTDM_LOG_TAG, "BT controller compile version [%s]\n", btdm_controller_get_compile_version()); + btdm_osi_funcs_register(&osi_funcs); btdm_controller_mem_init(); diff --git a/components/bt/lib b/components/bt/lib index c03357972d..4e9fdabfeb 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit c03357972dd858e3b20155d5fdea00c31ffcbc9e +Subproject commit 4e9fdabfebc241f42be895c24e1790972e47d7ff From b9dab234375b6e0e0750497473cc754ca5177f39 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Wed, 28 Mar 2018 12:04:13 +0800 Subject: [PATCH 2/2] component/bt : fix interrupt slow reaction cause assert(interrupt wdt) Some application lock interrupt(portENTER_CRITICAL) too long time, it will cause bluetooth cannot react interrupt in time, then t will cause some assert, assert info following: 1. ld_acl.c 1900 2. ld_fm.c 340 3. other assert reference to this. --- components/bt/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/lib b/components/bt/lib index 4e9fdabfeb..b76cf6aa30 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 4e9fdabfebc241f42be895c24e1790972e47d7ff +Subproject commit b76cf6aa307acca2bf3634f2534c84b89f60a054