Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/bredr_common_lib_mismatch_v6.1' into 'release/v6.1'

Browse Source 
fix(bt/controller): Fixed wrong version of btdm_common used by BR/EDR

See merge request espressif/esp-idf!52882
This commit is contained in:
Jiang Jiang Jian
2026-09-17 10:35:02 +08:00
parent f0316c53dc 0564a994e9
commit 8a1988e4d3
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/controller/esp32s31/btdm_broker.c
+1 -1
View File
@@ -851,7 +851,7 @@ btdm_broker_init(void)
{ {
#if UC_BT_CTRL_BLE_IS_ENABLE #if UC_BT_CTRL_BLE_IS_ENABLE
extern const char *ble_controller_get_compile_version(void); extern const char *ble_controller_get_compile_version(void);
if (memcmp(ble_controller_get_compile_version(), "4c3f1e9", 7) != 0) { if (memcmp(ble_controller_get_compile_version(), "42d079e", 7) != 0) {
return -1; return -1;
} }
#endif /* UC_BT_CTRL_BLE_IS_ENABLE */ #endif /* UC_BT_CTRL_BLE_IS_ENABLE */
components/bt/controller/lib_esp32s31/esp32s31-bt-lib
+1 -1
Submodule components/bt/controller/lib_esp32s31/esp32s31-bt-lib updated: 849186e861...3d8cee57c4
components/bt/porting_btdm/controller/bredr/src/bredr.c
+9
View File
@@ -128,6 +128,7 @@ extern int bredr_ctrl_feat_coex_en(void);
extern int bredr_ctrl_feat_sam_en(void); extern int bredr_ctrl_feat_sam_en(void);
extern int bredr_ctrl_feat_mws_en(void); extern int bredr_ctrl_feat_mws_en(void);
extern void bredr_ctrl_get_btdm_info(uint32_t *version, uint32_t *size);
extern const char *co_orca_get_git_version_str(void); extern const char *co_orca_get_git_version_str(void);
extern void r_orca_log_set_printf(bredr_log_printf_fn printf_fn); extern void r_orca_log_set_printf(bredr_log_printf_fn printf_fn);
/* Shutdown */ /* Shutdown */
@@ -918,6 +919,14 @@ int esp_bredr_controller_init(esp_bt_controller_config_t *cfg)
cfg->bredr.mempool_size = 1024 * (cfg->bredr.max_acl_conn + 2); cfg->bredr.mempool_size = 1024 * (cfg->bredr.max_acl_conn + 2);
cfg->bredr.mempool_ops = &s_orca_mempool_ops; cfg->bredr.mempool_ops = &s_orca_mempool_ops;
uint32_t bredr_btdm_version = 0;
uint32_t bredr_btdm_size = 0;
bredr_ctrl_get_btdm_info(&bredr_btdm_version, &bredr_btdm_size);
if ((cfg->btdm.version != bredr_btdm_version) || (sizeof(esp_bt_ctrl_btdm_config_t) != bredr_btdm_size)) {
ESP_LOGE(BREDR_LOG_TAG, "btdm version used by bredr check failed, version:%x, size:%d", bredr_btdm_version, bredr_btdm_size);
return ESP_ERR_INVALID_VERSION;
}
status = bredr_controller_init(&cfg->bredr); status = bredr_controller_init(&cfg->bredr);
if (status != 0) { if (status != 0) {
ESP_LOGE(BREDR_LOG_TAG, "bredr_controller_init failed, status:%d", status); ESP_LOGE(BREDR_LOG_TAG, "bredr_controller_init failed, status:%d", status);