mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
HID: uclogic: merge hid-huion driver in hid-uclogic
Merge the hid-huion driver into hid-uclogic as all the devices supported by hid-huion are in fact UC-Logic devices. Signed-off-by: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Nikolai Kondrashov
Jiri Kosina
parent
70b69cfb88
commit
08177f40bd
@ -286,12 +286,6 @@ config HID_GT683R
|
|||||||
Currently the following devices are know to be supported:
|
Currently the following devices are know to be supported:
|
||||||
- MSI GT683R
|
- MSI GT683R
|
||||||
|
|
||||||
config HID_HUION
|
|
||||||
tristate "Huion tablets"
|
|
||||||
depends on USB_HID
|
|
||||||
---help---
|
|
||||||
Support for Huion 580 tablet.
|
|
||||||
|
|
||||||
config HID_KEYTOUCH
|
config HID_KEYTOUCH
|
||||||
tristate "Keytouch HID devices"
|
tristate "Keytouch HID devices"
|
||||||
depends on HID
|
depends on HID
|
||||||
@ -314,7 +308,7 @@ config HID_UCLOGIC
|
|||||||
tristate "UC-Logic"
|
tristate "UC-Logic"
|
||||||
depends on HID
|
depends on HID
|
||||||
---help---
|
---help---
|
||||||
Support for UC-Logic tablets.
|
Support for UC-Logic and Huion tablets.
|
||||||
|
|
||||||
config HID_WALTOP
|
config HID_WALTOP
|
||||||
tristate "Waltop"
|
tristate "Waltop"
|
||||||
|
|||||||
@ -41,7 +41,6 @@ obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
|
|||||||
obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o
|
obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o
|
||||||
obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o
|
obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o
|
||||||
obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
|
obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
|
||||||
obj-$(CONFIG_HID_HUION) += hid-huion.o
|
|
||||||
obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
|
obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
|
||||||
obj-$(CONFIG_HID_ICADE) += hid-icade.o
|
obj-$(CONFIG_HID_ICADE) += hid-icade.o
|
||||||
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
|
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
|
||||||
|
|||||||
@ -1,290 +0,0 @@
|
|||||||
/*
|
|
||||||
* HID driver for Huion devices not fully compliant with HID standard
|
|
||||||
*
|
|
||||||
* Copyright (c) 2013 Martin Rusko
|
|
||||||
* Copyright (c) 2014 Nikolai Kondrashov
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
|
||||||
* Software Foundation; either version 2 of the License, or (at your option)
|
|
||||||
* any later version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/device.h>
|
|
||||||
#include <linux/hid.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/usb.h>
|
|
||||||
#include <asm/unaligned.h>
|
|
||||||
#include "usbhid/usbhid.h"
|
|
||||||
|
|
||||||
#include "hid-ids.h"
|
|
||||||
|
|
||||||
/* Report descriptor template placeholder head */
|
|
||||||
#define HUION_PH_HEAD 0xFE, 0xED, 0x1D
|
|
||||||
|
|
||||||
/* Report descriptor template placeholder IDs */
|
|
||||||
enum huion_ph_id {
|
|
||||||
HUION_PH_ID_X_LM,
|
|
||||||
HUION_PH_ID_X_PM,
|
|
||||||
HUION_PH_ID_Y_LM,
|
|
||||||
HUION_PH_ID_Y_PM,
|
|
||||||
HUION_PH_ID_PRESSURE_LM,
|
|
||||||
HUION_PH_ID_NUM
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Report descriptor template placeholder */
|
|
||||||
#define HUION_PH(_ID) HUION_PH_HEAD, HUION_PH_ID_##_ID
|
|
||||||
|
|
||||||
/* Fixed report descriptor template */
|
|
||||||
static const __u8 huion_tablet_rdesc_template[] = {
|
|
||||||
0x05, 0x0D, /* Usage Page (Digitizer), */
|
|
||||||
0x09, 0x02, /* Usage (Pen), */
|
|
||||||
0xA1, 0x01, /* Collection (Application), */
|
|
||||||
0x85, 0x07, /* Report ID (7), */
|
|
||||||
0x09, 0x20, /* Usage (Stylus), */
|
|
||||||
0xA0, /* Collection (Physical), */
|
|
||||||
0x14, /* Logical Minimum (0), */
|
|
||||||
0x25, 0x01, /* Logical Maximum (1), */
|
|
||||||
0x75, 0x01, /* Report Size (1), */
|
|
||||||
0x09, 0x42, /* Usage (Tip Switch), */
|
|
||||||
0x09, 0x44, /* Usage (Barrel Switch), */
|
|
||||||
0x09, 0x46, /* Usage (Tablet Pick), */
|
|
||||||
0x95, 0x03, /* Report Count (3), */
|
|
||||||
0x81, 0x02, /* Input (Variable), */
|
|
||||||
0x95, 0x03, /* Report Count (3), */
|
|
||||||
0x81, 0x03, /* Input (Constant, Variable), */
|
|
||||||
0x09, 0x32, /* Usage (In Range), */
|
|
||||||
0x95, 0x01, /* Report Count (1), */
|
|
||||||
0x81, 0x02, /* Input (Variable), */
|
|
||||||
0x95, 0x01, /* Report Count (1), */
|
|
||||||
0x81, 0x03, /* Input (Constant, Variable), */
|
|
||||||
0x75, 0x10, /* Report Size (16), */
|
|
||||||
0x95, 0x01, /* Report Count (1), */
|
|
||||||
0xA4, /* Push, */
|
|
||||||
0x05, 0x01, /* Usage Page (Desktop), */
|
|
||||||
0x65, 0x13, /* Unit (Inch), */
|
|
||||||
0x55, 0xFD, /* Unit Exponent (-3), */
|
|
||||||
0x34, /* Physical Minimum (0), */
|
|
||||||
0x09, 0x30, /* Usage (X), */
|
|
||||||
0x27, HUION_PH(X_LM), /* Logical Maximum (PLACEHOLDER), */
|
|
||||||
0x47, HUION_PH(X_PM), /* Physical Maximum (PLACEHOLDER), */
|
|
||||||
0x81, 0x02, /* Input (Variable), */
|
|
||||||
0x09, 0x31, /* Usage (Y), */
|
|
||||||
0x27, HUION_PH(Y_LM), /* Logical Maximum (PLACEHOLDER), */
|
|
||||||
0x47, HUION_PH(Y_PM), /* Physical Maximum (PLACEHOLDER), */
|
|
||||||
0x81, 0x02, /* Input (Variable), */
|
|
||||||
0xB4, /* Pop, */
|
|
||||||
0x09, 0x30, /* Usage (Tip Pressure), */
|
|
||||||
0x27,
|
|
||||||
HUION_PH(PRESSURE_LM), /* Logical Maximum (PLACEHOLDER), */
|
|
||||||
0x81, 0x02, /* Input (Variable), */
|
|
||||||
0xC0, /* End Collection, */
|
|
||||||
0xC0 /* End Collection */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Parameter indices */
|
|
||||||
enum huion_prm {
|
|
||||||
HUION_PRM_X_LM = 1,
|
|
||||||
HUION_PRM_Y_LM = 2,
|
|
||||||
HUION_PRM_PRESSURE_LM = 4,
|
|
||||||
HUION_PRM_RESOLUTION = 5,
|
|
||||||
HUION_PRM_NUM
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Driver data */
|
|
||||||
struct huion_drvdata {
|
|
||||||
__u8 *rdesc;
|
|
||||||
unsigned int rsize;
|
|
||||||
};
|
|
||||||
|
|
||||||
static __u8 *huion_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
|
||||||
unsigned int *rsize)
|
|
||||||
{
|
|
||||||
struct huion_drvdata *drvdata = hid_get_drvdata(hdev);
|
|
||||||
switch (hdev->product) {
|
|
||||||
case USB_DEVICE_ID_HUION_TABLET:
|
|
||||||
if (drvdata->rdesc != NULL) {
|
|
||||||
rdesc = drvdata->rdesc;
|
|
||||||
*rsize = drvdata->rsize;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return rdesc;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable fully-functional tablet mode and determine device parameters.
|
|
||||||
*
|
|
||||||
* @hdev: HID device
|
|
||||||
*/
|
|
||||||
static int huion_tablet_enable(struct hid_device *hdev)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
struct usb_device *usb_dev = hid_to_usb_dev(hdev);
|
|
||||||
struct huion_drvdata *drvdata = hid_get_drvdata(hdev);
|
|
||||||
__le16 *buf = NULL;
|
|
||||||
size_t len;
|
|
||||||
s32 params[HUION_PH_ID_NUM];
|
|
||||||
s32 resolution;
|
|
||||||
__u8 *p;
|
|
||||||
s32 v;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Read string descriptor containing tablet parameters. The specific
|
|
||||||
* string descriptor and data were discovered by sniffing the Windows
|
|
||||||
* driver traffic.
|
|
||||||
* NOTE: This enables fully-functional tablet mode.
|
|
||||||
*/
|
|
||||||
len = HUION_PRM_NUM * sizeof(*buf);
|
|
||||||
buf = kmalloc(len, GFP_KERNEL);
|
|
||||||
if (buf == NULL) {
|
|
||||||
hid_err(hdev, "failed to allocate parameter buffer\n");
|
|
||||||
rc = -ENOMEM;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
rc = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
|
|
||||||
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
|
|
||||||
(USB_DT_STRING << 8) + 0x64,
|
|
||||||
0x0409, buf, len,
|
|
||||||
USB_CTRL_GET_TIMEOUT);
|
|
||||||
if (rc == -EPIPE) {
|
|
||||||
hid_err(hdev, "device parameters not found\n");
|
|
||||||
rc = -ENODEV;
|
|
||||||
goto cleanup;
|
|
||||||
} else if (rc < 0) {
|
|
||||||
hid_err(hdev, "failed to get device parameters: %d\n", rc);
|
|
||||||
rc = -ENODEV;
|
|
||||||
goto cleanup;
|
|
||||||
} else if (rc != len) {
|
|
||||||
hid_err(hdev, "invalid device parameters\n");
|
|
||||||
rc = -ENODEV;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Extract device parameters */
|
|
||||||
params[HUION_PH_ID_X_LM] = le16_to_cpu(buf[HUION_PRM_X_LM]);
|
|
||||||
params[HUION_PH_ID_Y_LM] = le16_to_cpu(buf[HUION_PRM_Y_LM]);
|
|
||||||
params[HUION_PH_ID_PRESSURE_LM] =
|
|
||||||
le16_to_cpu(buf[HUION_PRM_PRESSURE_LM]);
|
|
||||||
resolution = le16_to_cpu(buf[HUION_PRM_RESOLUTION]);
|
|
||||||
if (resolution == 0) {
|
|
||||||
params[HUION_PH_ID_X_PM] = 0;
|
|
||||||
params[HUION_PH_ID_Y_PM] = 0;
|
|
||||||
} else {
|
|
||||||
params[HUION_PH_ID_X_PM] = params[HUION_PH_ID_X_LM] *
|
|
||||||
1000 / resolution;
|
|
||||||
params[HUION_PH_ID_Y_PM] = params[HUION_PH_ID_Y_LM] *
|
|
||||||
1000 / resolution;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Allocate fixed report descriptor */
|
|
||||||
drvdata->rdesc = devm_kmalloc(&hdev->dev,
|
|
||||||
sizeof(huion_tablet_rdesc_template),
|
|
||||||
GFP_KERNEL);
|
|
||||||
if (drvdata->rdesc == NULL) {
|
|
||||||
hid_err(hdev, "failed to allocate fixed rdesc\n");
|
|
||||||
rc = -ENOMEM;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
drvdata->rsize = sizeof(huion_tablet_rdesc_template);
|
|
||||||
|
|
||||||
/* Format fixed report descriptor */
|
|
||||||
memcpy(drvdata->rdesc, huion_tablet_rdesc_template,
|
|
||||||
drvdata->rsize);
|
|
||||||
for (p = drvdata->rdesc;
|
|
||||||
p <= drvdata->rdesc + drvdata->rsize - 4;) {
|
|
||||||
if (p[0] == 0xFE && p[1] == 0xED && p[2] == 0x1D &&
|
|
||||||
p[3] < sizeof(params)) {
|
|
||||||
v = params[p[3]];
|
|
||||||
put_unaligned(cpu_to_le32(v), (s32 *)p);
|
|
||||||
p += 4;
|
|
||||||
} else {
|
|
||||||
p++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rc = 0;
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
kfree(buf);
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int huion_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
|
|
||||||
struct huion_drvdata *drvdata;
|
|
||||||
|
|
||||||
/* Allocate and assign driver data */
|
|
||||||
drvdata = devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL);
|
|
||||||
if (drvdata == NULL) {
|
|
||||||
hid_err(hdev, "failed to allocate driver data\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
hid_set_drvdata(hdev, drvdata);
|
|
||||||
|
|
||||||
switch (id->product) {
|
|
||||||
case USB_DEVICE_ID_HUION_TABLET:
|
|
||||||
/* If this is the pen interface */
|
|
||||||
if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {
|
|
||||||
rc = huion_tablet_enable(hdev);
|
|
||||||
if (rc) {
|
|
||||||
hid_err(hdev, "tablet enabling failed\n");
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
rc = hid_parse(hdev);
|
|
||||||
if (rc) {
|
|
||||||
hid_err(hdev, "parse failed\n");
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
rc = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
|
||||||
if (rc) {
|
|
||||||
hid_err(hdev, "hw start failed\n");
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int huion_raw_event(struct hid_device *hdev, struct hid_report *report,
|
|
||||||
u8 *data, int size)
|
|
||||||
{
|
|
||||||
struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
|
|
||||||
|
|
||||||
/* If this is a pen input report */
|
|
||||||
if (intf->cur_altsetting->desc.bInterfaceNumber == 0 &&
|
|
||||||
report->type == HID_INPUT_REPORT &&
|
|
||||||
report->id == 0x07 && size >= 2)
|
|
||||||
/* Invert the in-range bit */
|
|
||||||
data[1] ^= 0x40;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct hid_device_id huion_devices[] = {
|
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
|
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(hid, huion_devices);
|
|
||||||
|
|
||||||
static struct hid_driver huion_driver = {
|
|
||||||
.name = "huion",
|
|
||||||
.id_table = huion_devices,
|
|
||||||
.probe = huion_probe,
|
|
||||||
.report_fixup = huion_report_fixup,
|
|
||||||
.raw_event = huion_raw_event,
|
|
||||||
};
|
|
||||||
module_hid_driver(huion_driver);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Martin Rusko");
|
|
||||||
MODULE_DESCRIPTION("Huion HID driver");
|
|
||||||
MODULE_LICENSE("GPL");
|
|
||||||
@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* HID driver for UC-Logic devices not fully compliant with HID standard
|
* HID driver for UC-Logic devices not fully compliant with HID standard
|
||||||
*
|
*
|
||||||
* Copyright (c) 2010 Nikolai Kondrashov
|
* Copyright (c) 2010-2014 Nikolai Kondrashov
|
||||||
|
* Copyright (c) 2013 Martin Rusko
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -15,6 +16,8 @@
|
|||||||
#include <linux/hid.h>
|
#include <linux/hid.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/usb.h>
|
#include <linux/usb.h>
|
||||||
|
#include <asm/unaligned.h>
|
||||||
|
#include "usbhid/usbhid.h"
|
||||||
|
|
||||||
#include "hid-ids.h"
|
#include "hid-ids.h"
|
||||||
|
|
||||||
@ -546,11 +549,90 @@ static __u8 twha60_rdesc_fixed1[] = {
|
|||||||
0xC0 /* End Collection */
|
0xC0 /* End Collection */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Report descriptor template placeholder head */
|
||||||
|
#define UCLOGIC_PH_HEAD 0xFE, 0xED, 0x1D
|
||||||
|
|
||||||
|
/* Report descriptor template placeholder IDs */
|
||||||
|
enum uclogic_ph_id {
|
||||||
|
UCLOGIC_PH_ID_X_LM,
|
||||||
|
UCLOGIC_PH_ID_X_PM,
|
||||||
|
UCLOGIC_PH_ID_Y_LM,
|
||||||
|
UCLOGIC_PH_ID_Y_PM,
|
||||||
|
UCLOGIC_PH_ID_PRESSURE_LM,
|
||||||
|
UCLOGIC_PH_ID_NUM
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Report descriptor template placeholder */
|
||||||
|
#define UCLOGIC_PH(_ID) UCLOGIC_PH_HEAD, UCLOGIC_PH_ID_##_ID
|
||||||
|
|
||||||
|
/* Fixed report descriptor template */
|
||||||
|
static const __u8 uclogic_tablet_rdesc_template[] = {
|
||||||
|
0x05, 0x0D, /* Usage Page (Digitizer), */
|
||||||
|
0x09, 0x02, /* Usage (Pen), */
|
||||||
|
0xA1, 0x01, /* Collection (Application), */
|
||||||
|
0x85, 0x07, /* Report ID (7), */
|
||||||
|
0x09, 0x20, /* Usage (Stylus), */
|
||||||
|
0xA0, /* Collection (Physical), */
|
||||||
|
0x14, /* Logical Minimum (0), */
|
||||||
|
0x25, 0x01, /* Logical Maximum (1), */
|
||||||
|
0x75, 0x01, /* Report Size (1), */
|
||||||
|
0x09, 0x42, /* Usage (Tip Switch), */
|
||||||
|
0x09, 0x44, /* Usage (Barrel Switch), */
|
||||||
|
0x09, 0x46, /* Usage (Tablet Pick), */
|
||||||
|
0x95, 0x03, /* Report Count (3), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x95, 0x03, /* Report Count (3), */
|
||||||
|
0x81, 0x03, /* Input (Constant, Variable), */
|
||||||
|
0x09, 0x32, /* Usage (In Range), */
|
||||||
|
0x95, 0x01, /* Report Count (1), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x95, 0x01, /* Report Count (1), */
|
||||||
|
0x81, 0x03, /* Input (Constant, Variable), */
|
||||||
|
0x75, 0x10, /* Report Size (16), */
|
||||||
|
0x95, 0x01, /* Report Count (1), */
|
||||||
|
0xA4, /* Push, */
|
||||||
|
0x05, 0x01, /* Usage Page (Desktop), */
|
||||||
|
0x65, 0x13, /* Unit (Inch), */
|
||||||
|
0x55, 0xFD, /* Unit Exponent (-3), */
|
||||||
|
0x34, /* Physical Minimum (0), */
|
||||||
|
0x09, 0x30, /* Usage (X), */
|
||||||
|
0x27, UCLOGIC_PH(X_LM), /* Logical Maximum (PLACEHOLDER), */
|
||||||
|
0x47, UCLOGIC_PH(X_PM), /* Physical Maximum (PLACEHOLDER), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0x09, 0x31, /* Usage (Y), */
|
||||||
|
0x27, UCLOGIC_PH(Y_LM), /* Logical Maximum (PLACEHOLDER), */
|
||||||
|
0x47, UCLOGIC_PH(Y_PM), /* Physical Maximum (PLACEHOLDER), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0xB4, /* Pop, */
|
||||||
|
0x09, 0x30, /* Usage (Tip Pressure), */
|
||||||
|
0x27,
|
||||||
|
UCLOGIC_PH(PRESSURE_LM),/* Logical Maximum (PLACEHOLDER), */
|
||||||
|
0x81, 0x02, /* Input (Variable), */
|
||||||
|
0xC0, /* End Collection, */
|
||||||
|
0xC0 /* End Collection */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Parameter indices */
|
||||||
|
enum uclogic_prm {
|
||||||
|
UCLOGIC_PRM_X_LM = 1,
|
||||||
|
UCLOGIC_PRM_Y_LM = 2,
|
||||||
|
UCLOGIC_PRM_PRESSURE_LM = 4,
|
||||||
|
UCLOGIC_PRM_RESOLUTION = 5,
|
||||||
|
UCLOGIC_PRM_NUM
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Driver data */
|
||||||
|
struct uclogic_drvdata {
|
||||||
|
__u8 *rdesc;
|
||||||
|
unsigned int rsize;
|
||||||
|
};
|
||||||
|
|
||||||
static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||||
unsigned int *rsize)
|
unsigned int *rsize)
|
||||||
{
|
{
|
||||||
struct usb_interface *iface = to_usb_interface(hdev->dev.parent);
|
struct usb_interface *iface = to_usb_interface(hdev->dev.parent);
|
||||||
__u8 iface_num = iface->cur_altsetting->desc.bInterfaceNumber;
|
__u8 iface_num = iface->cur_altsetting->desc.bInterfaceNumber;
|
||||||
|
struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
|
||||||
|
|
||||||
switch (hdev->product) {
|
switch (hdev->product) {
|
||||||
case USB_DEVICE_ID_UCLOGIC_TABLET_PF1209:
|
case USB_DEVICE_ID_UCLOGIC_TABLET_PF1209:
|
||||||
@ -621,15 +703,120 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
if (drvdata->rdesc != NULL) {
|
||||||
|
rdesc = drvdata->rdesc;
|
||||||
|
*rsize = drvdata->rsize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return rdesc;
|
return rdesc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable fully-functional tablet mode and determine device parameters.
|
||||||
|
*
|
||||||
|
* @hdev: HID device
|
||||||
|
*/
|
||||||
|
static int uclogic_tablet_enable(struct hid_device *hdev)
|
||||||
|
{
|
||||||
|
int rc;
|
||||||
|
struct usb_device *usb_dev = hid_to_usb_dev(hdev);
|
||||||
|
struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
|
||||||
|
__le16 *buf = NULL;
|
||||||
|
size_t len;
|
||||||
|
s32 params[UCLOGIC_PH_ID_NUM];
|
||||||
|
s32 resolution;
|
||||||
|
__u8 *p;
|
||||||
|
s32 v;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read string descriptor containing tablet parameters. The specific
|
||||||
|
* string descriptor and data were discovered by sniffing the Windows
|
||||||
|
* driver traffic.
|
||||||
|
* NOTE: This enables fully-functional tablet mode.
|
||||||
|
*/
|
||||||
|
len = UCLOGIC_PRM_NUM * sizeof(*buf);
|
||||||
|
buf = kmalloc(len, GFP_KERNEL);
|
||||||
|
if (buf == NULL) {
|
||||||
|
hid_err(hdev, "failed to allocate parameter buffer\n");
|
||||||
|
rc = -ENOMEM;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
rc = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0),
|
||||||
|
USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
|
||||||
|
(USB_DT_STRING << 8) + 0x64,
|
||||||
|
0x0409, buf, len,
|
||||||
|
USB_CTRL_GET_TIMEOUT);
|
||||||
|
if (rc == -EPIPE) {
|
||||||
|
hid_err(hdev, "device parameters not found\n");
|
||||||
|
rc = -ENODEV;
|
||||||
|
goto cleanup;
|
||||||
|
} else if (rc < 0) {
|
||||||
|
hid_err(hdev, "failed to get device parameters: %d\n", rc);
|
||||||
|
rc = -ENODEV;
|
||||||
|
goto cleanup;
|
||||||
|
} else if (rc != len) {
|
||||||
|
hid_err(hdev, "invalid device parameters\n");
|
||||||
|
rc = -ENODEV;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Extract device parameters */
|
||||||
|
params[UCLOGIC_PH_ID_X_LM] = le16_to_cpu(buf[UCLOGIC_PRM_X_LM]);
|
||||||
|
params[UCLOGIC_PH_ID_Y_LM] = le16_to_cpu(buf[UCLOGIC_PRM_Y_LM]);
|
||||||
|
params[UCLOGIC_PH_ID_PRESSURE_LM] =
|
||||||
|
le16_to_cpu(buf[UCLOGIC_PRM_PRESSURE_LM]);
|
||||||
|
resolution = le16_to_cpu(buf[UCLOGIC_PRM_RESOLUTION]);
|
||||||
|
if (resolution == 0) {
|
||||||
|
params[UCLOGIC_PH_ID_X_PM] = 0;
|
||||||
|
params[UCLOGIC_PH_ID_Y_PM] = 0;
|
||||||
|
} else {
|
||||||
|
params[UCLOGIC_PH_ID_X_PM] = params[UCLOGIC_PH_ID_X_LM] *
|
||||||
|
1000 / resolution;
|
||||||
|
params[UCLOGIC_PH_ID_Y_PM] = params[UCLOGIC_PH_ID_Y_LM] *
|
||||||
|
1000 / resolution;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate fixed report descriptor */
|
||||||
|
drvdata->rdesc = devm_kzalloc(&hdev->dev,
|
||||||
|
sizeof(uclogic_tablet_rdesc_template),
|
||||||
|
GFP_KERNEL);
|
||||||
|
if (drvdata->rdesc == NULL) {
|
||||||
|
hid_err(hdev, "failed to allocate fixed rdesc\n");
|
||||||
|
rc = -ENOMEM;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
drvdata->rsize = sizeof(uclogic_tablet_rdesc_template);
|
||||||
|
|
||||||
|
/* Format fixed report descriptor */
|
||||||
|
memcpy(drvdata->rdesc, uclogic_tablet_rdesc_template,
|
||||||
|
drvdata->rsize);
|
||||||
|
for (p = drvdata->rdesc;
|
||||||
|
p <= drvdata->rdesc + drvdata->rsize - 4;) {
|
||||||
|
if (p[0] == 0xFE && p[1] == 0xED && p[2] == 0x1D &&
|
||||||
|
p[3] < sizeof(params)) {
|
||||||
|
v = params[p[3]];
|
||||||
|
put_unaligned(cpu_to_le32(v), (s32 *)p);
|
||||||
|
p += 4;
|
||||||
|
} else {
|
||||||
|
p++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
rc = 0;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
kfree(buf);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
static int uclogic_probe(struct hid_device *hdev,
|
static int uclogic_probe(struct hid_device *hdev,
|
||||||
const struct hid_device_id *id)
|
const struct hid_device_id *id)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
|
||||||
|
struct uclogic_drvdata *drvdata;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* libinput requires the pad interface to be on a different node
|
* libinput requires the pad interface to be on a different node
|
||||||
@ -637,6 +824,26 @@ static int uclogic_probe(struct hid_device *hdev,
|
|||||||
*/
|
*/
|
||||||
hdev->quirks |= HID_QUIRK_MULTI_INPUT;
|
hdev->quirks |= HID_QUIRK_MULTI_INPUT;
|
||||||
|
|
||||||
|
/* Allocate and assign driver data */
|
||||||
|
drvdata = devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL);
|
||||||
|
if (drvdata == NULL)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
hid_set_drvdata(hdev, drvdata);
|
||||||
|
|
||||||
|
switch (id->product) {
|
||||||
|
case USB_DEVICE_ID_HUION_TABLET:
|
||||||
|
/* If this 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
rc = hid_parse(hdev);
|
rc = hid_parse(hdev);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
hid_err(hdev, "parse failed\n");
|
hid_err(hdev, "parse failed\n");
|
||||||
@ -652,6 +859,21 @@ static int uclogic_probe(struct hid_device *hdev,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
/* If this is a pen input report */
|
||||||
|
if (intf->cur_altsetting->desc.bInterfaceNumber == 0 &&
|
||||||
|
report->type == HID_INPUT_REPORT &&
|
||||||
|
report->id == 0x07 && size >= 2)
|
||||||
|
/* Invert the in-range bit */
|
||||||
|
data[1] ^= 0x40;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct hid_device_id uclogic_devices[] = {
|
static const struct hid_device_id uclogic_devices[] = {
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
|
||||||
USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },
|
USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },
|
||||||
@ -667,6 +889,8 @@ static const struct hid_device_id uclogic_devices[] = {
|
|||||||
USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },
|
USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,
|
||||||
USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },
|
USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },
|
||||||
|
{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
|
||||||
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(hid, uclogic_devices);
|
MODULE_DEVICE_TABLE(hid, uclogic_devices);
|
||||||
@ -676,7 +900,10 @@ static struct hid_driver uclogic_driver = {
|
|||||||
.id_table = uclogic_devices,
|
.id_table = uclogic_devices,
|
||||||
.probe = uclogic_probe,
|
.probe = uclogic_probe,
|
||||||
.report_fixup = uclogic_report_fixup,
|
.report_fixup = uclogic_report_fixup,
|
||||||
|
.raw_event = uclogic_raw_event,
|
||||||
};
|
};
|
||||||
module_hid_driver(uclogic_driver);
|
module_hid_driver(uclogic_driver);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Martin Rusko");
|
||||||
|
MODULE_AUTHOR("Nikolai Kondrashov");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user