From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Nikolai Kondrashov <spbnick@gmail.com>, Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
DIGImend-devel <DIGImend-devel@lists.sourceforge.net>
Subject: [PATCH 4/4] HID: uclogic: name the input nodes based on their tool
Date: Tue, 24 Feb 2015 19:05:30 -0500 [thread overview]
Message-ID: <1424822730-14938-5-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1424822730-14938-1-git-send-email-benjamin.tissoires@redhat.com>
We append "Pen", "Pad", "Mouse" or "Keyboard" suffix to the appropriate
input node to match what the Wacom driver does and be more convenient for
the user to know which one is which.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/hid/hid-uclogic.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index c03e076..7042238 100644
--- a/drivers/hid/hid-uclogic.c
+++ b/drivers/hid/hid-uclogic.c
@@ -713,6 +713,45 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
return rdesc;
}
+static void uclogic_input_configured(struct hid_device *hdev,
+ struct hid_input *hi)
+{
+ char *name;
+ const char *suffix = NULL;
+ struct hid_field *field;
+ size_t len;
+
+ /* no report associated (HID_QUIRK_MULTI_INPUT not set) */
+ if (!hi->report)
+ return;
+
+ field = hi->report->field[0];
+
+ switch (field->application) {
+ case HID_GD_KEYBOARD:
+ suffix = "Keyboard";
+ break;
+ case HID_GD_MOUSE:
+ suffix = "Mouse";
+ break;
+ case HID_GD_KEYPAD:
+ suffix = "Pad";
+ break;
+ case HID_DG_PEN:
+ suffix = "Pen";
+ break;
+ }
+
+ if (suffix) {
+ len = strlen(hdev->name) + 2 + strlen(suffix);
+ name = devm_kzalloc(&hi->input->dev, len, GFP_KERNEL);
+ if (name) {
+ snprintf(name, len, "%s %s", hdev->name, suffix);
+ hi->input->name = name;
+ }
+ }
+}
+
/**
* Enable fully-functional tablet mode and determine device parameters.
*
@@ -906,6 +945,7 @@ static struct hid_driver uclogic_driver = {
.probe = uclogic_probe,
.report_fixup = uclogic_report_fixup,
.raw_event = uclogic_raw_event,
+ .input_configured = uclogic_input_configured,
};
module_hid_driver(uclogic_driver);
--
2.1.0
next prev parent reply other threads:[~2015-02-25 0:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 0:05 [PATCH 0/4] HID: huion/uclogic merge and few additions Benjamin Tissoires
2015-02-25 0:05 ` [PATCH 1/4] HID: uclogic: Set quirks from inside the driver Benjamin Tissoires
2015-02-25 21:04 ` Nikolai Kondrashov
2015-02-25 21:23 ` Benjamin Tissoires
2015-02-25 0:05 ` [PATCH 2/4] HID: uclogic: merge hid-huion driver in hid-uclogic Benjamin Tissoires
2015-02-25 21:04 ` Nikolai Kondrashov
2015-02-25 21:28 ` Benjamin Tissoires
2015-02-25 22:23 ` Nikolai Kondrashov
2015-02-25 0:05 ` [PATCH 3/4] HID: uclogic: present only the working interfaces on the Huion tablets Benjamin Tissoires
2015-02-25 21:04 ` Nikolai Kondrashov
2015-02-25 21:30 ` Benjamin Tissoires
2015-02-26 17:02 ` Benjamin Tissoires
2015-02-25 0:05 ` Benjamin Tissoires [this message]
2015-02-25 21:04 ` [PATCH 4/4] HID: uclogic: name the input nodes based on their tool Nikolai Kondrashov
2015-02-25 21:36 ` Benjamin Tissoires
2015-02-25 22:28 ` Nikolai Kondrashov
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=1424822730-14938-5-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=DIGImend-devel@lists.sourceforge.net \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spbnick@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).