From: Nikolai Kondrashov <spbnick@gmail.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org, Nikolai Kondrashov <spbnick@gmail.com>
Subject: [PATCH 9/9] HID: uclogic: Add support for UC-Logic TWHA60 v3
Date: Wed, 14 Sep 2016 21:38:20 +0300 [thread overview]
Message-ID: <20160914183820.20737-10-spbnick@gmail.com> (raw)
In-Reply-To: <20160914183820.20737-1-spbnick@gmail.com>
Add support for the third version of UC-Logic TWHA60, which has
three interfaces and responds to initialization.
Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
---
drivers/hid/hid-uclogic.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index 64abd8d..1509d72 100644
--- a/drivers/hid/hid-uclogic.c
+++ b/drivers/hid/hid-uclogic.c
@@ -938,6 +938,7 @@ static int uclogic_probe(struct hid_device *hdev,
{
int rc;
struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+ struct usb_device *udev = hid_to_usb_dev(hdev);
struct uclogic_drvdata *drvdata;
/*
@@ -988,6 +989,28 @@ static int uclogic_probe(struct hid_device *hdev,
drvdata->ignore_pen_usage = true;
}
break;
+ case USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60:
+ /*
+ * If it is the three-interface version, which is known to
+ * respond to initialization.
+ */
+ if (udev->config->desc.bNumInterfaces == 3) {
+ /* If it is the pen interface */
+ if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {
+ rc = uclogic_tablet_enable(hdev);
+ if (rc) {
+ hid_err(hdev, "tablet enabling failed\n");
+ return rc;
+ }
+ drvdata->invert_pen_inrange = true;
+
+ rc = uclogic_button_enable(hdev);
+ drvdata->has_virtual_pad_interface = !rc;
+ } else {
+ drvdata->ignore_pen_usage = true;
+ }
+ }
+ break;
}
rc = hid_parse(hdev);
--
2.9.3
next prev parent reply other threads:[~2016-09-14 18:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 14:08 [PATCH] hid: Misc tablet fixes and improvements Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 1/9] HID: Remove broken links to tablet descriptions Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 2/9] HID: kye: Rename MousePen i608X v2 macro Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 3/9] HID: kye: Fix MousePen i608X v2 report descriptor Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 4/9] HID: uclogic: Remove allocation failure messages Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 5/9] HID: uclogic: Switch to reporting abstract button events Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 6/9] HID: uclogic: Add support for several more tablets Nikolai Kondrashov
2016-09-14 10:15 ` Benjamin Tissoires
2016-09-14 18:38 ` [PATCH v2] hid: Misc tablet fixes and improvements Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 1/9] HID: Remove broken links to tablet descriptions Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 2/9] HID: kye: Rename MousePen i608X v2 macro Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 3/9] HID: kye: Fix MousePen i608X v2 report descriptor Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 4/9] HID: uclogic: Remove allocation failure messages Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 5/9] HID: uclogic: Switch to reporting abstract button events Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 6/9] HID: uclogic: Add support for several more tablets Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 7/9] HID: uclogic: Support UGTizer GP0610 partially Nikolai Kondrashov
2016-09-14 18:38 ` [PATCH 8/9] HID: uclogic: Override constant descriptors Nikolai Kondrashov
2016-09-14 18:38 ` Nikolai Kondrashov [this message]
2016-09-15 7:14 ` [PATCH v2] hid: Misc tablet fixes and improvements Benjamin Tissoires
2016-09-15 9:09 ` Nikolai Kondrashov
2016-09-19 12:32 ` Jiri Kosina
2016-09-13 14:08 ` [PATCH 7/9] HID: uclogic: Support UGTizer GP0610 partially Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 8/9] HID: uclogic: Override constant descriptors Nikolai Kondrashov
2016-09-13 14:08 ` [PATCH 9/9] HID: uclogic: Add support for UC-Logic TWHA60 v3 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=20160914183820.20737-10-spbnick@gmail.com \
--to=spbnick@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.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 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).