espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-05 06:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble): Avoid deadlock caused by local writes taking s_hidd_mutex

Browse Source
This commit is contained in:
Mayank Tyagi
2026-05-25 15:45:09 +05:30
parent 61a88ab53b
commit 0176a098dc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/services/hid/src/ble_svc_hid.c
+7 -4
View File
@@ -593,7 +593,8 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
} }
if(val == 0 || val == 1) { if(val == 0 || val == 1) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof hid_instances[instance].ctrl_pt, &hid_instances[instance].ctrl_pt, NULL); rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof hid_instances[instance].ctrl_pt, &hid_instances[instance].ctrl_pt, NULL);
if (rc == 0 && s_char_write_cb) { if (rc == 0 && conn_handle != BLE_HS_CONN_HANDLE_NONE &&
s_char_write_cb) {
s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_HID_CTRL_PT, hid_instances[instance].ctrl_pt); s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_HID_CTRL_PT, hid_instances[instance].ctrl_pt);
} }
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
@@ -612,7 +613,8 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
} else if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { } else if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].kbd_out_rpt), rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].kbd_out_rpt),
&hid_instances[instance].kbd_out_rpt, &out_rpt_len); &hid_instances[instance].kbd_out_rpt, &out_rpt_len);
if (rc == 0 && s_report_write_cb) { if (rc == 0 && conn_handle != BLE_HS_CONN_HANDLE_NONE &&
s_report_write_cb) {
s_report_write_cb(attr_handle, BLE_SVC_HID_RPT_TYPE_OUTPUT, 0, s_report_write_cb(attr_handle, BLE_SVC_HID_RPT_TYPE_OUTPUT, 0,
&hid_instances[instance].kbd_out_rpt, &hid_instances[instance].kbd_out_rpt,
out_rpt_len); out_rpt_len);
@@ -675,7 +677,8 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
} }
if(val == 0 || val == 1) { if(val == 0 || val == 1) {
rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].proto_mode), &hid_instances[instance].proto_mode, NULL); rc = ble_svc_hid_chr_write(ctxt->om, 0, sizeof(hid_instances[instance].proto_mode), &hid_instances[instance].proto_mode, NULL);
if (rc == 0 && s_char_write_cb) { if (rc == 0 && conn_handle != BLE_HS_CONN_HANDLE_NONE &&
s_char_write_cb) {
s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_PROTOCOL_MODE, hid_instances[instance].proto_mode); s_char_write_cb(attr_handle, BLE_SVC_HID_CHR_UUID16_PROTOCOL_MODE, hid_instances[instance].proto_mode);
} }
return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
@@ -700,7 +703,7 @@ ble_svc_hid_access(uint16_t conn_handle, uint16_t attr_handle,
return BLE_ATT_ERR_INSUFFICIENT_RES; return BLE_ATT_ERR_INSUFFICIENT_RES;
} }
rpt->len = out_rpt_len; rpt->len = out_rpt_len;
if (s_report_write_cb) { if (conn_handle != BLE_HS_CONN_HANDLE_NONE && s_report_write_cb) {
s_report_write_cb(attr_handle, rpt->type, rpt->id, rpt->data, rpt->len); s_report_write_cb(attr_handle, rpt->type, rpt->id, rpt->data, rpt->len);
} }
if (ctxt->chr->flags & BLE_GATT_CHR_F_NOTIFY) { if (ctxt->chr->flags & BLE_GATT_CHR_F_NOTIFY) {