Commit 476e562 introduced kernel support for the pen interface of the
DTH-2242 (in addition to the Cintiq 13HD and DTK-2241), but missed
editing several files needed for the X driver to support the device.
This commit finishes that work.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
src/util/60-wacom.rules | 1 +
src/util/wacusb.c | 1 +
src/wacomxi/wacomcpl-exec | 6 ++++--
src/xdrv/wcmUSB.c | 1 +
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/util/60-wacom.rules b/src/util/60-wacom.rules
index e37c6dd..da16de9 100644
--- a/src/util/60-wacom.rules
+++ b/src/util/60-wacom.rules
@@ -97,6 +97,7 @@ ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0317",
ENV{WACOM_TYPE}!="touch", SYM
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c0",
SYMLINK+="input/tablet-dtf521"
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c4",
SYMLINK+="input/tablet-dtf720"
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0057",
SYMLINK+="input/tablet-dtk2241"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0059",
SYMLINK+="input/tablet-dth2242"
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="005b", ENV{WACOM_TYPE}!="touch",
SYMLINK+="input/tablet-cintiq22hdt"
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c5",
SYMLINK+="input/tablet-cintiq20wsx"
ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6",
SYMLINK+="input/tablet-cintiq12wx"
diff --git a/src/util/wacusb.c b/src/util/wacusb.c
index 38ac31d..06217d7 100755
--- a/src/util/wacusb.c
+++ b/src/util/wacusb.c
@@ -295,6 +295,7 @@ static int USBIdentifyModel(USBTABLET* pUSB);
{ "DTK-22hd", "Wacom Cintiq 22HD", 5, 0xFA },
{ "DTK-2241", "Wacom DTK 2241", 6, 0x57 },
{ "DTK-13HD", "Wacom Cintiq 13HD", 7, 0x304 },
+ { "DTH-2242", "Wacom DTH 2242", 8, 0x59 },
{ NULL }
};
diff --git a/src/wacomxi/wacomcpl-exec b/src/wacomxi/wacomcpl-exec
index 5d8bbd0..e0b495e 100755
--- a/src/wacomxi/wacomcpl-exec
+++ b/src/wacomxi/wacomcpl-exec
@@ -2018,8 +2018,9 @@ proc updateModelInfo { } {
set isLCD($i) 1
}
- #DTK2241
+ #DTK2241 / DTH2242
set isLCD(87) 1
+ set isLCD(89) 1
#TabletPC
for { set i 144 } { $i <= 159 } { incr i 1 } {
@@ -2055,8 +2056,9 @@ proc updateModelInfo { } {
#Cintiq 21UX
set numPadButtons(63) 8
set numPadStrips(63) 2
- #DTK2241
+ #DTK2241 / DTH2242
set numPadButtons(87) 6
+ set numPadButtons(89) 6
#Cintiq 22HDT
set numPadButtons(91) 18
set numPadStrips(91) 2
diff --git a/src/xdrv/wcmUSB.c b/src/xdrv/wcmUSB.c
index 6c8e8f0..092d370 100755
--- a/src/xdrv/wcmUSB.c
+++ b/src/xdrv/wcmUSB.c
@@ -542,6 +542,7 @@ static struct
{ 0x5B, 5080, 5080, &usbCintiqV5 }, /* Cintiq 22HDT */
{ 0xFA, 5080, 5080, &usbCintiqV5 }, /* Cintiq 22HD */
{ 0x57, 5080, 5080, &usbCintiqV5 }, /* DTK 2241 */
+ { 0x59, 5080, 5080, &usbCintiqV5 }, /* DTH 2242 */
{ 0x304,5080, 5080, &usbCintiqV5 }, /* Cintiq 13HD */
{ 0x90, 2540, 2540, &usbTabletPC }, /* TabletPC 0x90 */
--
2.12.0
------------------------------------------------------------------------------
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
