| Message ID | 1425404645-20134-7-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On 03/03/2015 07:44 PM, Benjamin Tissoires wrote: > This hack is only needed for Huion tablets. It does not seem to have > any effect on the other tablets handled by this device right now, but > it's better to check for the product id sooner than discovering that > we have messed up one tablet later. > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > --- > > changes in v3: > - stores a flag to know when to invert the bit. > - add #define UCLOGIC_PEN_REPORT_ID > > new in v2 > > drivers/hid/hid-uclogic.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c > index f44e72b..bdda9fd 100644 > --- a/drivers/hid/hid-uclogic.c > +++ b/drivers/hid/hid-uclogic.c > @@ -564,6 +564,7 @@ enum uclogic_ph_id { > > /* Report descriptor template placeholder */ > #define UCLOGIC_PH(_ID) UCLOGIC_PH_HEAD, UCLOGIC_PH_ID_##_ID > +#define UCLOGIC_PEN_REPORT_ID 0x07 It would be nice to also use this macro in the replaced report descriptor itself, but this will do for now. Reviewed-by: Nikolai Kondrashov <spbnick@gmail.com> Thanks a lot, Benjamin! Nick P.S. I like the way you describe the changes between patchset versions, will have to keep it in mind and use in my own. -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mar 03 2015 or thereabouts, Nikolai Kondrashov wrote: > On 03/03/2015 07:44 PM, Benjamin Tissoires wrote: > >This hack is only needed for Huion tablets. It does not seem to have > >any effect on the other tablets handled by this device right now, but > >it's better to check for the product id sooner than discovering that > >we have messed up one tablet later. > > > >Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > >--- > > > >changes in v3: > >- stores a flag to know when to invert the bit. > >- add #define UCLOGIC_PEN_REPORT_ID > > > >new in v2 > > > > drivers/hid/hid-uclogic.c | 13 ++++++++----- > > 1 file changed, 8 insertions(+), 5 deletions(-) > > > >diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c > >index f44e72b..bdda9fd 100644 > >--- a/drivers/hid/hid-uclogic.c > >+++ b/drivers/hid/hid-uclogic.c > >@@ -564,6 +564,7 @@ enum uclogic_ph_id { > > > > /* Report descriptor template placeholder */ > > #define UCLOGIC_PH(_ID) UCLOGIC_PH_HEAD, UCLOGIC_PH_ID_##_ID > >+#define UCLOGIC_PEN_REPORT_ID 0x07 > > It would be nice to also use this macro in the replaced report descriptor > itself, but this will do for now. Yeah. I thought about that too. I was about to send it that way, but then I realized that we do not control the report ID from the device (it's not overwritten by raw_event()). So it feels weird to just have this macro in the middle of the report descriptor. I think we can just leave it as it right now and maybe change the whole thing later if needed. > > Reviewed-by: Nikolai Kondrashov <spbnick@gmail.com> Thanks! > > Thanks a lot, Benjamin! > No worries. Thanks for the reviews. Once Jiri will pull these, I'll send the corresponding patches to DIGImend-devel for the digimend-kernel tree. Cheers, Benjamin > Nick > > P.S. I like the way you describe the changes between patchset versions, will > have to keep it in mind and use in my own. -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c index f44e72b..bdda9fd 100644 --- a/drivers/hid/hid-uclogic.c +++ b/drivers/hid/hid-uclogic.c @@ -564,6 +564,7 @@ enum uclogic_ph_id { /* Report descriptor template placeholder */ #define UCLOGIC_PH(_ID) UCLOGIC_PH_HEAD, UCLOGIC_PH_ID_##_ID +#define UCLOGIC_PEN_REPORT_ID 0x07 /* Fixed report descriptor template */ static const __u8 uclogic_tablet_rdesc_template[] = { @@ -625,6 +626,7 @@ enum uclogic_prm { struct uclogic_drvdata { __u8 *rdesc; unsigned int rsize; + bool invert_pen_inrange; }; static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc, @@ -905,6 +907,7 @@ static int uclogic_probe(struct hid_device *hdev, hid_err(hdev, "tablet enabling failed\n"); return rc; } + drvdata->invert_pen_inrange = true; } break; } @@ -927,12 +930,12 @@ static int uclogic_probe(struct hid_device *hdev, static int uclogic_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { - struct usb_interface *intf = to_usb_interface(hdev->dev.parent); + struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev); - /* If this is a pen input report */ - if (intf->cur_altsetting->desc.bInterfaceNumber == 0 && - report->type == HID_INPUT_REPORT && - report->id == 0x07 && size >= 2) + if ((drvdata->invert_pen_inrange) && + (report->type == HID_INPUT_REPORT) && + (report->id == UCLOGIC_PEN_REPORT_ID) && + (size >= 2)) /* Invert the in-range bit */ data[1] ^= 0x40;
This hack is only needed for Huion tablets. It does not seem to have any effect on the other tablets handled by this device right now, but it's better to check for the product id sooner than discovering that we have messed up one tablet later. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> --- changes in v3: - stores a flag to know when to invert the bit. - add #define UCLOGIC_PEN_REPORT_ID new in v2 drivers/hid/hid-uclogic.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)