From 8f9b44182aa118914ff48264e4ef155233df6e58 Mon Sep 17 00:00:00 2001 From: Rahul Shahare Date: Mon, 9 Sep 2019 16:25:05 +0530 Subject: [PATCH] Revert "HID: core: move Usage Page concatenation to Main item" This reverts commit 5db3c5adf44ad3166472b009b122df5ef1144c9c. Change-Id: I0fcfe4f3198a6c0f887697d6825170fe674bc9ab Signed-off-by: Rahul Shahare --- drivers/hid/hid-core.c | 36 ++++++++++++------------------------ include/linux/hid.h | 1 - 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index fd8cd41e6377..7f6c13740f4f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -200,14 +200,13 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type) * Add a usage to the temporary parser table. */ -static int hid_add_usage(struct hid_parser *parser, unsigned usage, u8 size) +static int hid_add_usage(struct hid_parser *parser, unsigned usage) { if (parser->local.usage_index >= HID_MAX_USAGES) { hid_err(parser->device, "usage index exceeded\n"); return -1; } parser->local.usage[parser->local.usage_index] = usage; - parser->local.usage_size[parser->local.usage_index] = size; parser->local.collection_index[parser->local.usage_index] = parser->collection_stack_ptr ? parser->collection_stack[parser->collection_stack_ptr - 1] : 0; @@ -464,7 +463,10 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) return 0; } - return hid_add_usage(parser, data, item->size); + if (item->size <= 2) + data = (parser->global.usage_page << 16) + data; + + return hid_add_usage(parser, data); case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM: @@ -473,6 +475,9 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) return 0; } + if (item->size <= 2) + data = (parser->global.usage_page << 16) + data; + parser->local.usage_minimum = data; return 0; @@ -483,6 +488,9 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) return 0; } + if (item->size <= 2) + data = (parser->global.usage_page << 16) + data; + count = data - parser->local.usage_minimum; if (count + parser->local.usage_index >= HID_MAX_USAGES) { /* @@ -502,7 +510,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) } for (n = parser->local.usage_minimum; n <= data; n++) - if (hid_add_usage(parser, n, item->size)) { + if (hid_add_usage(parser, n)) { dbg_hid("hid_add_usage failed\n"); return -1; } @@ -516,22 +524,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) return 0; } -/* - * Concatenate Usage Pages into Usages where relevant: - * As per specification, 6.2.2.8: "When the parser encounters a main item it - * concatenates the last declared Usage Page with a Usage to form a complete - * usage value." - */ - -static void hid_concatenate_usage_page(struct hid_parser *parser) -{ - int i; - - for (i = 0; i < parser->local.usage_index; i++) - if (parser->local.usage_size[i] <= 2) - parser->local.usage[i] += parser->global.usage_page << 16; -} - /* * Process a main item. */ @@ -541,8 +533,6 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item) __u32 data; int ret; - hid_concatenate_usage_page(parser); - data = item_udata(item); switch (item->tag) { @@ -756,8 +746,6 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item) __u32 data; int i; - hid_concatenate_usage_page(parser); - data = item_udata(item); switch (item->tag) { diff --git a/include/linux/hid.h b/include/linux/hid.h index 5f1e901353ed..d16de62231d3 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -378,7 +378,6 @@ struct hid_global { struct hid_local { unsigned usage[HID_MAX_USAGES]; /* usage array */ - u8 usage_size[HID_MAX_USAGES]; /* usage size array */ unsigned collection_index[HID_MAX_USAGES]; /* collection index array */ unsigned usage_index; unsigned usage_minimum;