d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC 1.26: Correct the calculation of the report size and only look

Browse Source 
at reports that have the specified kind, instead of assuming that
there is only one report of the right kind in the report descriptor.

Approved by:	re (kensmith)
This commit is contained in:
iedowse 2006-03-25 04:46:52 +00:00
parent 4abdf3a5e1
commit d61519e4a6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/usb/hid.c
View File

@ -371,14 +371,22 @@ hid_report_size(void *buf, int len, enum hid_kind k, u_int8_t *idp)
{
struct hid_data *d;
struct hid_item h;
int size, id;
int hi, lo, size, id;
id = 0;
hi = lo = -1;
for (d = hid_start_parse(buf, len, 1<<k); hid_get_item(d, &h); )
if (h.report_ID != 0 && !id)
id = h.report_ID;
if (h.kind == k) {
if (h.report_ID != 0 && !id)
id = h.report_ID;
if (h.report_ID == id) {
if (lo < 0)
lo = h.loc.pos;
hi = h.loc.pos + h.loc.size * h.loc.count;
}
}
hid_end_parse(d);
size = h.loc.pos;
size = hi - lo;
if (id != 0) {
size += 8;
*idp = id; /* XXX wrong */