diff options
| author |   Peter Hutterer <peter.hutterer@who-t.net> | 2018-12-05 10:42:22 +1000 |
|---|---|---|
| committer |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2018-12-07 16:27:12 +0100 |
| commit | c53431eb696f3c64c12c00afb81048af54b61532 (patch) | |
| tree | c0f52c90c7a7fdbace4088af27c41fe9de6103b0 /drivers/hid/hid-core.c | |
| parent | Input: add `REL_WHEEL_HI_RES` and `REL_HWHEEL_HI_RES` (diff) | |
| download | linux-dev-c53431eb696f3c64c12c00afb81048af54b61532.tar.xz linux-dev-c53431eb696f3c64c12c00afb81048af54b61532.zip | |
HID: core: store the collections as a basic tree
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>
Verified-by: Harry Cutts <hcutts@chromium.org>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |