Re: [Bluez-users] hid2usb error

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

Hi Alexandre,

> Can I find this patch somewhere ?

in the Linux USB development mailing list archive. I searched for you
and attached it.

Regards

Marcel


[-- Attachment #2: hid-core.diff --]
[-- Type: text/x-patch, Size: 986 bytes --]

--- linux-2.6.1-orig/drivers/usb/input/hid-core.c	2004-01-08 22:59:44.000000000 -0800
+++ linux-2.6.1/drivers/usb/input/hid-core.c	2004-01-21 15:15:35.000000000 -0800
@@ -224,6 +224,9 @@
 	offset = report->size;
 	report->size += parser->global.report_size * parser->global.report_count;
 
+	if (usages < parser->global.report_count)
+		usages = parser->global.report_count;
+
 	if (usages == 0)
 		return 0; /* ignore padding fields */
 
@@ -235,9 +238,13 @@
 	field->application = hid_lookup_collection(parser, HID_COLLECTION_APPLICATION);
 
 	for (i = 0; i < usages; i++) {
-		field->usage[i].hid = parser->local.usage[i];
+		int j = i;
+		/* Duplicate the last usage we parsed if we have excess values */
+		if (i >= parser->local.usage_index)
+			j = parser->local.usage_index - 1;
+		field->usage[i].hid = parser->local.usage[j];
 		field->usage[i].collection_index =
-			parser->local.collection_index[i];
+			parser->local.collection_index[j];
 	}
 
 	field->maxusage = usages;