Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.30/wacom_wac.c | 22 ++++++++++++++++++++++
2.6.36/wacom_wac.c | 24 ++++++++++++++++++++++++
2.6.38/wacom_wac.c | 28 ++++++++++++++++++++++++++++
3.7/wacom_wac.c | 28 ++++++++++++++++++++++++++++
4 files changed, 102 insertions(+)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 3020ade..9a28869 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2767,12 +2767,26 @@ static const struct wacom_features wacom_features_0x350
=
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x354 };
+static const struct wacom_features wacom_features_0x351 =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen & Touch */
+ WACOM_MSPRO, 0, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x355 };
+static const struct wacom_features wacom_features_0x352 =
+ { "Wacom Cintiq Pro 32", WACOM_PKGLEN_MSPRO, 140384, 79316, 8191, 63,
+ WACOM_MSPRO, 0, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x356 };
static const struct wacom_features wacom_features_0x353 =
{ "Wacom Cintiq Pro 13FHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34f }; /* Touch */
static const struct wacom_features wacom_features_0x354 =
{ "Wacom Cintiq Pro 16UHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x350 }; /* Touch */
+static const struct wacom_features wacom_features_0x355 =
+ { "Wacom Cintiq Pro 24 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x351, .touch_max = 10 }; /*
Touch */
+static const struct wacom_features wacom_features_0x356 =
+ { "Wacom Cintiq Pro 32 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x352, .touch_max = 10 }; /*
Touch */
static const struct wacom_features wacom_features_0x357 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191, 63,
INTUOSP2, 9 };
@@ -2786,6 +2800,9 @@ static const struct wacom_features wacom_features_0x368 =
{ "Wacom DTH-1152 Touch", WACOM_PKGLEN_27QHDT,
.type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
.oPid = 0x35A }; /* Touch */
+static const struct wacom_features wacom_features_0x37C =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen-only */
+ WACOM_MSPRO, 0, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
@@ -2941,12 +2958,17 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x34E) },
{ USB_DEVICE_WACOM(0x34F) },
{ USB_DEVICE_WACOM(0x350) },
+ { USB_DEVICE_WACOM(0x351) },
+ { USB_DEVICE_WACOM(0x352) },
{ USB_DEVICE_WACOM(0x353) },
{ USB_DEVICE_WACOM(0x354) },
+ { USB_DEVICE_WACOM(0x355) },
+ { USB_DEVICE_WACOM(0x356) },
{ USB_DEVICE_DETAILED(0x357, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x358, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x35A) },
{ USB_DEVICE_WACOM(0x368) },
+ { USB_DEVICE_WACOM(0x37C) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 5443239..60c9a9b 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -2430,10 +2430,24 @@ static const struct wacom_features wacom_features_0x350
=
WACOM_MSPRO, 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_0x351 =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen & Touch */
+ WACOM_MSPRO, 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_0x352 =
+ { "Wacom Cintiq Pro 32", WACOM_PKGLEN_MSPRO, 140384, 79316, 8191, 63,
+ WACOM_MSPRO, 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_0x353 =
{ "Wacom Cintiq Pro 13FHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT }; /* Touch */
static const struct wacom_features wacom_features_0x354 =
{ "Wacom Cintiq Pro 16UHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT }; /* Touch */
+static const struct wacom_features wacom_features_0x355 =
+ { "Wacom Cintiq Pro 24 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT, .touch_max = 10 }; /* Touch */
+static const struct wacom_features wacom_features_0x356 =
+ { "Wacom Cintiq Pro 32 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT, .touch_max = 10 }; /* Touch */
static const struct wacom_features wacom_features_0x357 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191,
63, INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9 };
@@ -2446,6 +2460,11 @@ static const struct wacom_features wacom_features_0x35A =
static const struct wacom_features wacom_features_0x368 =
{ "Wacom DTH-1152 Touch", WACOM_PKGLEN_27QHDT,
.type = DTH1152T, .touch_max = 10 }; /* Touch */
+static const struct wacom_features wacom_features_0x37C =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen-only */
+ WACOM_MSPRO, 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_0x6004 =
{ "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255,
0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2585,12 +2604,17 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x34E) },
{ USB_DEVICE_WACOM(0x34F) },
{ USB_DEVICE_WACOM(0x350) },
+ { USB_DEVICE_WACOM(0x351) },
+ { USB_DEVICE_WACOM(0x352) },
{ USB_DEVICE_WACOM(0x353) },
{ USB_DEVICE_WACOM(0x354) },
+ { USB_DEVICE_WACOM(0x355) },
+ { USB_DEVICE_WACOM(0x356) },
{ USB_DEVICE_DETAILED(0x357, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x358, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x35A) },
{ USB_DEVICE_WACOM(0x368) },
+ { USB_DEVICE_WACOM(0x37C) },
{ USB_DEVICE_LENOVO(0x6004) },
{ }
};
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 3db445f..ef01985 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -3188,12 +3188,30 @@ static const struct wacom_features wacom_features_0x350
=
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x354 };
+static const struct wacom_features wacom_features_0x351 =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen & Touch */
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x355 };
+static const struct wacom_features wacom_features_0x352 =
+ { "Wacom Cintiq Pro 32", WACOM_PKGLEN_MSPRO, 140384, 79316, 8191, 63,
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x356 };
static const struct wacom_features wacom_features_0x353 =
{ "Wacom Cintiq Pro 13FHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34f }; /* Touch */
static const struct wacom_features wacom_features_0x354 =
{ "Wacom Cintiq Pro 16UHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x350 }; /* Touch */
+static const struct wacom_features wacom_features_0x355 =
+ { "Wacom Cintiq Pro 24 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x351, .touch_max = 10 }; /*
Touch */
+static const struct wacom_features wacom_features_0x356 =
+ { "Wacom Cintiq Pro 32 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x352, .touch_max = 10 }; /*
Touch */
static const struct wacom_features wacom_features_0x357 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191, 63,
INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 10 };
@@ -3208,6 +3226,11 @@ static const struct wacom_features wacom_features_0x368 =
{ "Wacom DTH-1152 Touch", WACOM_PKGLEN_27QHDT,
.type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
.oPid = 0x35A }; /* Touch */
+static const struct wacom_features wacom_features_0x37C =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen-only */
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
@@ -3376,12 +3399,17 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x34E) },
{ USB_DEVICE_WACOM(0x34F) },
{ USB_DEVICE_WACOM(0x350) },
+ { USB_DEVICE_WACOM(0x351) },
+ { USB_DEVICE_WACOM(0x352) },
{ USB_DEVICE_WACOM(0x353) },
{ USB_DEVICE_WACOM(0x354) },
+ { USB_DEVICE_WACOM(0x355) },
+ { USB_DEVICE_WACOM(0x356) },
{ USB_DEVICE_DETAILED(0x357, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x358, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x35A) },
{ USB_DEVICE_WACOM(0x368) },
+ { USB_DEVICE_WACOM(0x37C) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index df55762..015c9e1 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -3117,12 +3117,30 @@ static const struct wacom_features wacom_features_0x350
=
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x354 };
+static const struct wacom_features wacom_features_0x351 =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen & Touch */
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x355 };
+static const struct wacom_features wacom_features_0x352 =
+ { "Wacom Cintiq Pro 32", WACOM_PKGLEN_MSPRO, 140384, 79316, 8191, 63,
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x356 };
static const struct wacom_features wacom_features_0x353 =
{ "Wacom Cintiq Pro 13FHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34f }; /* Touch */
static const struct wacom_features wacom_features_0x354 =
{ "Wacom Cintiq Pro 16UHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x350 }; /* Touch */
+static const struct wacom_features wacom_features_0x355 =
+ { "Wacom Cintiq Pro 24 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x351, .touch_max = 10 }; /*
Touch */
+static const struct wacom_features wacom_features_0x356 =
+ { "Wacom Cintiq Pro 32 Touch", WACOM_PKGLEN_27QHDT, .type =
WACOM_27QHDT,
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x352, .touch_max = 10 }; /*
Touch */
static const struct wacom_features wacom_features_0x357 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191, 63,
INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 10 };
@@ -3137,6 +3155,11 @@ static const struct wacom_features wacom_features_0x368 =
{ "Wacom DTH-1152 Touch", WACOM_PKGLEN_27QHDT,
.type = DTH1152T, .touch_max = 10, .oVid = USB_VENDOR_ID_WACOM,
.oPid = 0x35A }; /* Touch */
+static const struct wacom_features wacom_features_0x37C =
+ { "Wacom Cintiq Pro 24", WACOM_PKGLEN_MSPRO, 105286, 59574, 8191, 63,
/* Pen-only */
+ WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 0,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
+ WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
@@ -3305,12 +3328,17 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x34E) },
{ USB_DEVICE_WACOM(0x34F) },
{ USB_DEVICE_WACOM(0x350) },
+ { USB_DEVICE_WACOM(0x351) },
+ { USB_DEVICE_WACOM(0x352) },
{ USB_DEVICE_WACOM(0x353) },
{ USB_DEVICE_WACOM(0x354) },
+ { USB_DEVICE_WACOM(0x355) },
+ { USB_DEVICE_WACOM(0x356) },
{ USB_DEVICE_DETAILED(0x357, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x358, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_WACOM(0x35A) },
{ USB_DEVICE_WACOM(0x368) },
+ { USB_DEVICE_WACOM(0x37C) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },
--
2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
