Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f262d1fa authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: add usage_index in struct hid_usage. 



Currently, there is no way to know the index of the current field
in the .input_mapping and .event callbacks  when this field is inside
an array of HID fields.
This patch adds this index to the struct hid_usage so that this
information is available to input_mapping and event callbacks.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 77463838

drivers/hid/hid-core.c

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ EXPORT_SYMBOL_GPL(hid_register_report); 
static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages, unsigned values)

{

	struct hid_field *field;

	int i;



	if (report->maxfield == HID_MAX_FIELDS) {

		hid_err(report->device, "too many fields in report\n");
@@ -110,6 +111,9 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned 
	field->value = (s32 *)(field->usage + usages);

	field->report = report;



	for (i = 0; i < usages; i++)

		field->usage[i].usage_index = i;



	return field;

}

include/linux/hid.h

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ struct hid_collection { 
struct hid_usage {

	unsigned  hid;			/* hid usage code */

	unsigned  collection_index;	/* index into collection array */

	unsigned  usage_index;		/* index into usage array */

	/* hidinput data */

	__u16     code;			/* input driver code */

	__u8      type;			/* input driver type */