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

Catch up with libusbhid merge (rev 205728).

Browse Source 
hid_get_data() now expects that the hid data passed in always contains
the report ID byte. Thus we should not skip the the report ID byte in
hid_interrupt().  Also, if HUP_KEYBOARD usage is an array, do not try
to modify the 'data' pointer, instead, increase the hid_item_t field
'pos' by 'report_size' before calling hid_get_data() during each
iteration.

PR:			usb/146367
Reported and tested by:	Alex Deiter
Pointy hat to:	    	kaiw
Reviewed by:	    	emax
This commit is contained in:
Kai Wang 2010-05-09 09:20:25 +00:00
parent d061cdd513
commit ef6de0e1d8
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/bluetooth/bthidd/hid.c
View File

@ -130,7 +130,7 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_t len)
hid_item_t h; hid_item_t h;
int32_t report_id, usage, page, val, int32_t report_id, usage, page, val,
mouse_x, mouse_y, mouse_z, mouse_butt, mouse_x, mouse_y, mouse_z, mouse_butt,
mevents, kevents; mevents, kevents, i;
assert(s != NULL); assert(s != NULL);
assert(s->srv != NULL); assert(s->srv != NULL);
@ -150,8 +150,8 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_t len)
} }
report_id = data[1]; report_id = data[1];
data += 2; data ++;
len -= 2; len --;
hid_device = get_hid_device(&s->bdaddr); hid_device = get_hid_device(&s->bdaddr);
assert(hid_device != NULL); assert(hid_device != NULL);
@ -202,17 +202,11 @@ hid_interrupt(bthid_session_p s, uint8_t *data, int32_t len)
if (val && val < kbd_maxkey()) if (val && val < kbd_maxkey())
bit_set(s->keys1, val); bit_set(s->keys1, val);
data ++; for (i = 1; i < h.report_count; i++) {
len --; h.pos += h.report_size;
len = min(len, h.report_size);
while (len > 0) {
val = hid_get_data(data, &h); val = hid_get_data(data, &h);
if (val && val < kbd_maxkey()) if (val && val < kbd_maxkey())
bit_set(s->keys1, val); bit_set(s->keys1, val);
data ++;
len --;
} }
} }
break; break;