From: Peter Hutterer <peter.hutterer@who-t.net>
To: linux-input@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Jiri Kosina <jikos@kernel.org>, Harry Cutts <hcutts@chromium.org>,
torvalds@linux-foundation.org,
Nestor Lopez Casado <nlopezcasad@logitech.com>,
linux-kernel@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Subject: [PATCH 2/8] HID: core: store the collections as a basic tree
Date: Thu, 22 Nov 2018 16:34:03 +1000 [thread overview]
Message-ID: <20181122063409.15816-3-peter.hutterer@who-t.net> (raw)
In-Reply-To: <20181122063409.15816-1-peter.hutterer@who-t.net>
For each collection parsed, store a pointer to the parent collection
(if any). This makes it a lot easier to look up which collection(s)
any given item is part of
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
drivers/hid/hid-core.c | 4 ++++
include/linux/hid.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5bec9244c45b..43d488a45120 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -172,6 +172,8 @@ static int open_collection(struct hid_parser *parser, unsigned type)
collection->type = type;
collection->usage = usage;
collection->level = parser->collection_stack_ptr - 1;
+ collection->parent = parser->active_collection;
+ parser->active_collection = collection;
if (type == HID_COLLECTION_APPLICATION)
parser->device->maxapplication++;
@@ -190,6 +192,8 @@ static int close_collection(struct hid_parser *parser)
return -EINVAL;
}
parser->collection_stack_ptr--;
+ if (parser->active_collection)
+ parser->active_collection = parser->active_collection->parent;
return 0;
}
diff --git a/include/linux/hid.h b/include/linux/hid.h
index a355d61940f2..fdfda898656c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -427,6 +427,7 @@ struct hid_local {
*/
struct hid_collection {
+ struct hid_collection *parent;
unsigned type;
unsigned usage;
unsigned level;
@@ -650,6 +651,7 @@ struct hid_parser {
unsigned int *collection_stack;
unsigned int collection_stack_ptr;
unsigned int collection_stack_size;
+ struct hid_collection *active_collection;
struct hid_device *device;
unsigned int scan_flags;
};
--
2.19.1
next prev parent reply other threads:[~2018-11-22 6:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 6:34 [PATCH 0/8] HID: MS and Logitech high-resolution scroll wheel support Peter Hutterer
2018-11-22 6:34 ` [PATCH 1/8] Input: add `REL_WHEEL_HI_RES` and `REL_HWHEEL_HI_RES` Peter Hutterer
2018-11-22 6:34 ` Peter Hutterer [this message]
2018-11-22 6:34 ` [PATCH 3/8] HID: core: process the Resolution Multiplier Peter Hutterer
2018-11-22 6:34 ` [PATCH 4/8] HID: input: use the Resolution Multiplier for high-resolution scrolling Peter Hutterer
2018-11-22 23:28 ` Peter Hutterer
2018-11-27 2:17 ` Harry Cutts
2018-11-27 2:30 ` Linus Torvalds
2018-11-27 23:51 ` Peter Hutterer
2018-11-28 3:40 ` [PATCH v2 " Peter Hutterer
2018-11-22 6:34 ` [PATCH 5/8] HID: logitech-hidpp: fix typo, hiddpp to hidpp Peter Hutterer
2018-11-22 6:34 ` [PATCH 6/8] HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice Peter Hutterer
2018-11-22 6:34 ` [PATCH 7/8] HID: logitech: Add function to enable HID++ 1.0 "scrolling acceleration" Peter Hutterer
2018-11-22 6:34 ` [PATCH 8/8] HID: logitech: Enable high-resolution scrolling on Logitech mice Peter Hutterer
2018-11-22 17:05 ` Linus Torvalds
2018-11-28 3:38 ` [PATCH v2 " Peter Hutterer
2018-11-28 23:03 ` [PATCH " Harry Cutts
2018-11-28 23:22 ` [PATCH 0/8] HID: MS and Logitech high-resolution scroll wheel support Harry Cutts
2018-11-29 4:27 ` Peter Hutterer
2018-11-29 10:25 ` Benjamin Tissoires
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181122063409.15816-3-peter.hutterer@who-t.net \
--to=peter.hutterer@who-t.net \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hcutts@chromium.org \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nlopezcasad@logitech.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.