Merge branch 'fix/ble_hidd_remove_ccc_gating_v6.1' into 'release/v6.1'

fix(esp_hid/bluedroid): remove app-layer CCC gating in HID device (6.1)

See merge request espressif/esp-idf!51008
This commit is contained in:
Jiang Jiang Jian
2026-08-31 11:13:50 +08:00
4 changed files with 16 additions and 11 deletions
-1
View File
@@ -190,7 +190,6 @@ menu "BT Logs"
menuconfig BT_LOG_CRITICAL_ONLY
bool "Enable bandwidth-optimized log mode (critical logs only)"
default n
depends on !BT_STACK_NO_LOG
select BLE_LOG_ENABLED
help
Enable bandwidth-optimized logging for the BLE Log Async Output
+1
View File
@@ -580,6 +580,7 @@ endmenu #BT debug option
config BT_STACK_NO_LOG
bool "Disable BT debug logs (minimize bin size)"
depends on BT_BLUEDROID_ENABLED
default y if BLE_LOG_ENABLED && !BLE_LOG_HOST_LOG
default n
help
This select can save the rodata code size
@@ -1114,6 +1114,12 @@ tBTM_STATUS BTM_BleExtendedScan(BOOLEAN enable, UINT16 duration, UINT16 period)
if ((err = btsnd_hcic_ble_ext_scan_enable(enable, extend_adv_cb.scan_duplicate, duration, period)) != HCI_SUCCESS) {
BTM_TRACE_ERROR("LE ES En=%d: cmd err=0x%x", enable, err);
status = BTM_HCI_ERROR | err;
} else {
if (enable) {
btm_cb.ble_ctr_cb.inq_var.state |= BTM_BLE_SCANNING;
} else {
btm_cb.ble_ctr_cb.inq_var.state &= ~BTM_BLE_SCANNING;
}
}
end:
@@ -1266,6 +1272,7 @@ void btm_ble_update_phy_evt(tBTM_BLE_UPDATE_PHY *params)
#if (BLE_50_EXTEND_SCAN_EN == TRUE)
void btm_ble_scan_timeout_evt(void)
{
btm_cb.ble_ctr_cb.inq_var.state &= ~BTM_BLE_SCANNING;
BTM_ExtBleCallbackTrigger(BTM_BLE_5_GAP_SCAN_TIMEOUT_EVT, NULL);
}
#endif // #if (BLE_50_EXTEND_SCAN_EN == TRUE)