lkml.org 
[lkml]   [2013]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 007/100] HID: add usage_index in struct hid_usage.
    Date
    3.5.7.23 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Benjamin Tissoires <benjamin.tissoires@gmail.com>

    commit f262d1fa2c651a5e2f92b6aee8779597631cd5d4 upstream.

    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>
    [ luis: 3.5.y prereq for:
    cc6b54a HID: validate feature and input report details ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/hid/hid-core.c | 4 ++++
    include/linux/hid.h | 1 +
    2 files changed, 5 insertions(+)

    diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
    index d4111de..4043d73 100644
    --- a/drivers/hid/hid-core.c
    +++ b/drivers/hid/hid-core.c
    @@ -94,6 +94,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");
    @@ -112,6 +113,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 cdf6171..be1afbc 100644
    --- a/include/linux/hid.h
    +++ b/include/linux/hid.h
    @@ -378,6 +378,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 */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-10-11 13:41    [W:7.517 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site