diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2012-11-14 16:59:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-11-15 10:08:14 +0100 |
| commit | f262d1fa2c651a5e2f92b6aee8779597631cd5d4 (patch) | |
| tree | cdb954e3eae7d1aeb462617742ed13217354828f | |
| parent | 774638386826621c984ab6994439f474709cac5e (diff) | |
| download | op-kernel-dev-f262d1fa2c651a5e2f92b6aee8779597631cd5d4.zip op-kernel-dev-f262d1fa2c651a5e2f92b6aee8779597631cd5d4.tar.gz | |
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: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-core.c | 4 | ||||
| -rw-r--r-- | include/linux/hid.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index f5004e2..b5974cd 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -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; } diff --git a/include/linux/hid.h b/include/linux/hid.h index 4161bf2..d2c42dd 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -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 */ |
