Skip to content

Commit

Permalink
backport: HID: wacom: add new MobileStudio Pro support
Browse files Browse the repository at this point in the history 
Support new MobileStudio Pro 13 and 16 on older kernels

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
[ping.cheng@wacom.com: Imported into input-wacom repository (bbbe3ac8f943)]
Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
[ping.cheng@wacom.com: Backported to input-wacom repository (c7005ad)]
Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
  • Loading branch information
@jigpu
Ping Cheng authored and jigpu committed Sep 13, 2019
1 parent af0ec06 commit 5dee2a3
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 8 deletions.
28 changes: 26 additions & 2 deletions 2.6.32/wacom_wac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1772,8 +1772,8 @@ static int wacom_mspro_pad_irq(struct wacom_wac *wacom)
ringvalue += 3*72/16;
if (ringvalue > 71)
ringvalue -= 72;
}
else if (input->id.product == 0x34d || input->id.product == 0x34e) {
} else if (input->id.product == 0x34d || input->id.product == 0x34e ||
input->id.product == 0x398 || input->id.product == 0x399) {
/* MobileStudio Pro */
ringvalue = 35 - (ring & 0x7F);
ringvalue += 36/2;
Expand Down Expand Up @@ -3162,6 +3162,26 @@ static const struct wacom_features wacom_features_0x396 =
CINTIQ_16, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
static const struct wacom_features wacom_features_0x398 =
{ "Wacom MobileStudio Pro 13", WACOM_PKGLEN_MSPRO, 59552, 33848, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 11,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39A };
static const struct wacom_features wacom_features_0x399 =
{ "Wacom MobileStudio Pro 16", WACOM_PKGLEN_MSPRO, 69920, 39680, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 13,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39B };
static const struct wacom_features wacom_features_0x39A =
{ "Wacom MobileStudio Pro 13 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x398 };
static const struct wacom_features wacom_features_0x39B =
{ "Wacom MobileStudio Pro 16 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x399 };

#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
Expand Down Expand Up @@ -3351,6 +3371,10 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_DETAILED(0x391, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x392, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x396, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x398) },
{ USB_DEVICE_WACOM(0x399) },
{ USB_DEVICE_WACOM(0x39A) },
{ USB_DEVICE_WACOM(0x39B) },
#ifndef RHEL6_RELEASE
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
Expand Down
28 changes: 26 additions & 2 deletions 2.6.38/wacom_wac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1979,8 +1979,8 @@ static int wacom_mspro_pad_irq(struct wacom_wac *wacom)
ringvalue += 3*72/16;
if (ringvalue > 71)
ringvalue -= 72;
}
else if (input->id.product == 0x34d || input->id.product == 0x34e) {
} else if (input->id.product == 0x34d || input->id.product == 0x34e ||
input->id.product == 0x398 || input->id.product == 0x399) {
/* MobileStudio Pro */
ringvalue = 35 - (ring & 0x7F);
ringvalue += 36/2;
Expand Down Expand Up @@ -3511,6 +3511,26 @@ static const struct wacom_features wacom_features_0x396 =
CINTIQ_16, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
static const struct wacom_features wacom_features_0x398 =
{ "Wacom MobileStudio Pro 13", WACOM_PKGLEN_MSPRO, 59552, 33848, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 11,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39A };
static const struct wacom_features wacom_features_0x399 =
{ "Wacom MobileStudio Pro 16", WACOM_PKGLEN_MSPRO, 69920, 39680, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 13,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39B };
static const struct wacom_features wacom_features_0x39A =
{ "Wacom MobileStudio Pro 13 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x398 };
static const struct wacom_features wacom_features_0x39B =
{ "Wacom MobileStudio Pro 16 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x399 };

#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
Expand Down Expand Up @@ -3704,6 +3724,10 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_DETAILED(0x391, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x392, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x396, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x398) },
{ USB_DEVICE_WACOM(0x399) },
{ USB_DEVICE_WACOM(0x39A) },
{ USB_DEVICE_WACOM(0x39B) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },
Expand Down
4 changes: 2 additions & 2 deletions 3.17/wacom_wac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2112,14 +2112,14 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
(hdev->product == 0x34d || hdev->product == 0x34e || /* MobileStudio Pro */
hdev->product == 0x357 || hdev->product == 0x358 || /* Intuos Pro 2 */
hdev->product == 0x392 || /* Intuos Pro 2 */
hdev->product == 0x399)) { /* MobileStudio Pro */
hdev->product == 0x398 || hdev->product == 0x399)) { /* MobileStudio Pro */
value = (field->logical_maximum - value);

if (hdev->product == 0x357 || hdev->product == 0x358 ||
hdev->product == 0x392)
value = wacom_offset_rotation(input, usage, value, 3, 16);
else if (hdev->product == 0x34d || hdev->product == 0x34e ||
hdev->product == 0x399)
hdev->product == 0x398 || hdev->product == 0x399)
value = wacom_offset_rotation(input, usage, value, 1, 2);
}
else {
Expand Down
28 changes: 26 additions & 2 deletions 3.7/wacom_wac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1961,8 +1961,8 @@ static int wacom_mspro_pad_irq(struct wacom_wac *wacom)
ringvalue += 3*72/16;
if (ringvalue > 71)
ringvalue -= 72;
}
else if (input->id.product == 0x34d || input->id.product == 0x34e) {
} else if (input->id.product == 0x34d || input->id.product == 0x34e ||
input->id.product == 0x398 || input->id.product == 0x399) {
/* MobileStudio Pro */
ringvalue = 35 - (ring & 0x7F);
ringvalue += 36/2;
Expand Down Expand Up @@ -3441,6 +3441,26 @@ static const struct wacom_features wacom_features_0x396 =
CINTIQ_16, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
static const struct wacom_features wacom_features_0x398 =
{ "Wacom MobileStudio Pro 13", WACOM_PKGLEN_MSPRO, 59552, 33848, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 11,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39A };
static const struct wacom_features wacom_features_0x399 =
{ "Wacom MobileStudio Pro 16", WACOM_PKGLEN_MSPRO, 69920, 39680, 8191, 63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 13,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x39B };
static const struct wacom_features wacom_features_0x39A =
{ "Wacom MobileStudio Pro 13 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x398 };
static const struct wacom_features wacom_features_0x39B =
{ "Wacom MobileStudio Pro 16 Touch", WACOM_PKGLEN_MSPROT, /* Touch */
.type = WACOM_MSPROT, .touch_max = 10,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x399 };

#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
Expand Down Expand Up @@ -3634,6 +3654,10 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_DETAILED(0x391, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x392, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x396, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x398) },
{ USB_DEVICE_WACOM(0x399) },
{ USB_DEVICE_WACOM(0x39A) },
{ USB_DEVICE_WACOM(0x39B) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },
Expand Down

0 comments on commit 5dee2a3

Please sign in to comment.