feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feat/display_ble_controller_init_status' into 'master'

Browse Source 
feat(ble/controller): Display BLE controller init status for ESP32 and ESP32-C3/S3

Closes BLERP-728

See merge request espressif/esp-idf!30651
This commit is contained in:
Island
2024-05-08 10:28:31 +08:00
parent 1680c2fe33 fc9290d8a2
commit 705c21d38e
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/controller/esp32/bt.c
View File

@@ -1620,7 +1620,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
btdm_cfg_mask = btdm_config_mask_load(); btdm_cfg_mask = btdm_config_mask_load();
if (btdm_controller_init(btdm_cfg_mask, cfg) != 0) { err = btdm_controller_init(btdm_cfg_mask, cfg);
if (err != 0) {
ESP_LOGE(BTDM_LOG_TAG, "%s %d\n",__func__,err);
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }

5
components/bt/controller/esp32c3/bt.c
View File

@@ -1403,7 +1403,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
periph_module_enable(PERIPH_BT_MODULE); periph_module_enable(PERIPH_BT_MODULE);
periph_module_reset(PERIPH_BT_MODULE); periph_module_reset(PERIPH_BT_MODULE);
if (btdm_controller_init(cfg) != 0) { err = btdm_controller_init(cfg);
if (err != 0) {
ESP_LOGE(BT_LOG_TAG, "%s %d\n",__func__,err);
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }

6
components/bt/host/bluedroid/Kconfig.in
View File

@@ -85,7 +85,7 @@ config BT_A2DP_ENABLE
depends on BT_CLASSIC_ENABLED depends on BT_CLASSIC_ENABLED
default n default n
help help
Advanced Audio Distrubution Profile Advanced Audio Distribution Profile
config BT_SPP_ENABLED config BT_SPP_ENABLED
bool "SPP" bool "SPP"
@@ -140,7 +140,7 @@ config BT_HFP_WBS_ENABLE
default y default y
help help
This enables Wide Band Speech. Should disable it when SCO data path is PCM. This enables Wide Band Speech. Should disable it when SCO data path is PCM.
Otherwise there will be no data transmited via GPIOs. Otherwise there will be no data transmitted via GPIOs.
menuconfig BT_HID_ENABLED menuconfig BT_HID_ENABLED
@@ -1072,7 +1072,7 @@ config BT_ACL_CONNECTIONS
is used. is used.
config BT_MULTI_CONNECTION_ENBALE config BT_MULTI_CONNECTION_ENBALE
bool "Enable BLE multi-conections" bool "Enable BLE multi-connections"
depends on BT_BLE_ENABLED depends on BT_BLE_ENABLED
default y default y
help help

6
components/bt/host/bluedroid/hci/packet_fragmenter.c
View File

@@ -171,6 +171,12 @@ static void reassemble_and_dispatch(BT_HDR *packet)
return; return;
} }
partial_packet = (BT_HDR *)osi_calloc(full_length + sizeof(BT_HDR)); partial_packet = (BT_HDR *)osi_calloc(full_length + sizeof(BT_HDR));
if (partial_packet == NULL) {
HCI_TRACE_WARNING("%s full_length %d no memory.\n", __func__, full_length);
assert(0);
}
partial_packet->event = packet->event; partial_packet->event = packet->event;
partial_packet->len = full_length; partial_packet->len = full_length;
partial_packet->offset = packet->len; partial_packet->offset = packet->len;