jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9322 from dhalbert/tinyusb-out-report-changes

Browse source 
Update `tud_hid_set_report_cb()` report handling
This commit is contained in:
Scott Shawcroft 2024-06-11 13:27:40 -07:00 committed by GitHub
commit e43270e030
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shared-module/usb_hid/Device.c
View file

@ -282,7 +282,12 @@ void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t rep
usb_hid_device_obj_t *hid_device = NULL;
size_t id_idx;
if (report_id == 0 && report_type == HID_REPORT_TYPE_INVALID) {
// As of https://github.com/hathach/tinyusb/pull/2253, HID_REPORT_TYPE_INVALID reports are not
// sent to this callback, but are instead sent to tud_hid_report_fail_cb(), which we don't bother
// to implement.
// So this callback is only going to see HID_REPORT_TYPE_OUTPUT.
// HID_REPORT_TYPE_FEATURE is not used yet.
if (report_id == 0) {
// This could be a report with a non-zero report ID in the first byte, or
// it could be for report ID 0.
// Heuristic: see if there's a device with report ID 0, and if its report length matches
@ -299,12 +304,10 @@ void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t rep
buffer++;
bufsize--;
}
} else if (report_type != HID_REPORT_TYPE_OUTPUT && report_type != HID_REPORT_TYPE_FEATURE) {
return;
}
// report_id might be changed due to parsing above, so test again.
if ((report_id == 0 && report_type == HID_REPORT_TYPE_INVALID) ||
if ((report_id == 0) ||
// Fetch the matching device if we don't already have the report_id 0 device.
(usb_hid_get_device_with_report_id(report_id, &hid_device, &id_idx) &&
hid_device &&