From: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
2.6.30/wacom_wac.c | 5 +++++
2.6.30/wacom_wac.h | 1 +
2.6.36/wacom_wac.c | 7 +++++++
2.6.36/wacom_wac.h | 1 +
2.6.38/wacom_wac.c | 7 +++++++
2.6.38/wacom_wac.h | 1 +
3.7/wacom_wac.c | 7 +++++++
3.7/wacom_wac.h | 1 +
8 files changed, 30 insertions(+)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 1e9d555..5f6eb1e 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1395,6 +1395,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
break;
case DTUS:
+ case DTUSX:
sync = wacom_dtus_irq(wacom_wac);
break;
@@ -1781,6 +1782,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case DTUS:
+ case DTUSX:
case PL:
case PTU:
case DTU:
@@ -1989,6 +1991,8 @@ static const struct wacom_features wacom_features_0xF0 =
{ "Wacom DTU1631", WACOM_PKGLEN_GRAPHIRE, 34623, 19553, 511,
0, DTU };
static const struct wacom_features wacom_features_0xFB =
{ "Wacom DTU1031", WACOM_PKGLEN_DTUS, 21896, 13760, 511,
0, DTUS, WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
+static const struct wacom_features wacom_features_0x32F =
+ { "Wacom DTU1031X", WACOM_PKGLEN_DTUS, 22472, 12728, 511,
0, DTUSX, WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x57 =
{ "Wacom DTK2241", WACOM_PKGLEN_INTUOS, 95640, 54060, 2047,
63, DTK, WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
static const struct wacom_features wacom_features_0x59 =
@@ -2177,6 +2181,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0xF8) },
{ USB_DEVICE_WACOM(0xFA) },
{ USB_DEVICE_WACOM(0xFB) },
+ { USB_DEVICE_WACOM(0x32F) },
{ USB_DEVICE_LENOVO(0x6004) },
{ }
};
diff --git a/2.6.30/wacom_wac.h b/2.6.30/wacom_wac.h
index 2e3d1a1..f45a132 100755
--- a/2.6.30/wacom_wac.h
+++ b/2.6.30/wacom_wac.h
@@ -65,6 +65,7 @@ enum {
PL,
DTU,
DTUS,
+ DTUSX,
INTUOS,
INTUOS3S,
INTUOS3,
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 89f6c77..ffac702 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1225,6 +1225,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
break;
case DTUS:
+ case DTUSX:
sync = wacom_dtus_irq(wacom_wac);
break;
@@ -1539,6 +1540,7 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case DTUS:
+ case DTUSX:
case PL:
case PTU:
case DTU:
@@ -1825,6 +1827,10 @@ static const struct wacom_features wacom_features_0xFB =
{ "Wacom DTU1031", WACOM_PKGLEN_DTUS, 21896, 13760, 511,
0, DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
+static const struct wacom_features wacom_features_0x32F =
+ { "Wacom DTU1031X", WACOM_PKGLEN_DTUS, 22472, 12728, 511,
+ 0, DTUSX, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+ WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0xCC =
{ "Wacom Cintiq 21UX2", WACOM_PKGLEN_INTUOS, 86800, 65200, 2047,
63, WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
@@ -2031,6 +2037,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0xFB) },
{ USB_DEVICE_WACOM(0x116) },
{ USB_DEVICE_WACOM(0x12C) },
+ { USB_DEVICE_WACOM(0x32F) },
{ USB_DEVICE_LENOVO(0x6004) },
{ }
};
diff --git a/2.6.36/wacom_wac.h b/2.6.36/wacom_wac.h
index c07be59..05a2000 100644
--- a/2.6.36/wacom_wac.h
+++ b/2.6.36/wacom_wac.h
@@ -65,6 +65,7 @@ enum {
PL,
DTU,
DTUS,
+ DTUSX,
BAMBOO_PT,
INTUOS,
INTUOS3S,
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 97009d2..9fbb457 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -1463,6 +1463,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
break;
case DTUS:
+ case DTUSX:
sync = wacom_dtus_irq(wacom_wac);
break;
@@ -1885,6 +1886,7 @@ int wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case DTUS:
+ case DTUSX:
case PL:
case DTU:
if (features->type == DTUS) {
@@ -2236,6 +2238,10 @@ static const struct wacom_features wacom_features_0xFB =
{ "Wacom DTU1031", WACOM_PKGLEN_DTUS, 21896, 13760, 511,
0, DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
+static const struct wacom_features wacom_features_0x32F =
+ { "Wacom DTU1031X", WACOM_PKGLEN_DTUS, 22472, 12728, 511,
+ 0, DTUSX, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+ WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x57 =
{ "Wacom DTK2241", WACOM_PKGLEN_INTUOS, 95640, 54060, 2047,
63, DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
@@ -2583,6 +2589,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x0307) },
{ USB_DEVICE_WACOM(0x30A) },
{ USB_DEVICE_WACOM(0x30C) },
+ { USB_DEVICE_WACOM(0x32F) },
{ USB_DEVICE_DETAILED(0x0309, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x323, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_LENOVO(0x6004) },
diff --git a/2.6.38/wacom_wac.h b/2.6.38/wacom_wac.h
index 8ed0a62..238c087 100644
--- a/2.6.38/wacom_wac.h
+++ b/2.6.38/wacom_wac.h
@@ -77,6 +77,7 @@ enum {
PL,
DTU,
DTUS,
+ DTUSX,
INTUOS,
INTUOS3S,
INTUOS3,
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index a7ee1cd..c6fc09a 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -1439,6 +1439,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t
len)
break;
case DTUS:
+ case DTUSX:
sync = wacom_dtus_irq(wacom_wac);
break;
@@ -1841,6 +1842,7 @@ int wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case DTUS:
+ case DTUSX:
case PL:
case DTU:
if (features->type == DTUS) {
@@ -2176,6 +2178,10 @@ static const struct wacom_features wacom_features_0xFB =
{ "Wacom DTU1031", WACOM_PKGLEN_DTUS, 21896, 13760, 511,
0, DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
+static const struct wacom_features wacom_features_0x32F =
+ { "Wacom DTU1031X", 22472, 12728, 511, 0,
+ DTUSX, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+ WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
static const struct wacom_features wacom_features_0x57 =
{ "Wacom DTK2241", WACOM_PKGLEN_INTUOS, 95640, 54060, 2047,
63, DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
@@ -2523,6 +2529,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x0307) },
{ USB_DEVICE_WACOM(0x30A) },
{ USB_DEVICE_WACOM(0x30C) },
+ { USB_DEVICE_WACOM(0x32F) },
{ USB_DEVICE_DETAILED(0x0309, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_DETAILED(0x0323, USB_CLASS_HID, 0, 0) },
{ USB_DEVICE_LENOVO(0x6004) },
diff --git a/3.7/wacom_wac.h b/3.7/wacom_wac.h
index 7e48728..a2fb9ca 100644
--- a/3.7/wacom_wac.h
+++ b/3.7/wacom_wac.h
@@ -77,6 +77,7 @@ enum {
PL,
DTU,
DTUS,
+ DTUSX,
INTUOS,
INTUOS3S,
INTUOS3,
--
2.1.3
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
www.gigenet.com
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
