diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2013-05-17 15:11:39 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-23 09:55:17 +1000 |
| commit | 3578b919360e7a4d6cfbbe4c33c3084be0c6d5c9 (patch) | |
| tree | 0bfc33bc5d9b7b1d564c4a129bb64d57111dacdb | |
| parent | 2dffd217b112c346c6c0b07e82cb069a3cf84246 (diff) | |
| download | xf86-input-wacom-3578b919360e7a4d6cfbbe4c33c3084be0c6d5c9.tar.gz | |
Add support for Cintiq 22HDT and 13HD, DTK2241 and DTH2242.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmUSB.c | 4 | ||||
| -rw-r--r-- | src/wcmValidateDevice.c | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 3751de9..af0f357 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -277,6 +277,10 @@ static struct { WACOM_VENDOR_ID, 0xF4, 200000, 200000, &usbCintiqV5 }, /* Cintiq 24HD */ { WACOM_VENDOR_ID, 0xFA, 200000, 200000, &usbCintiqV5 }, /* Cintiq 22HD */ { WACOM_VENDOR_ID, 0xF8, 200000, 200000, &usbCintiqV5 }, /* Cintiq 24HD touch (EMR digitizer) */ + { WACOM_VENDOR_ID, 0x304,200000, 200000, &usbCintiqV5 }, /* Cintiq 13HD */ + { WACOM_VENDOR_ID, 0x57, 200000, 200000, &usbCintiqV5 }, /* DTK2241 */ + { WACOM_VENDOR_ID, 0x59, 200000, 200000, &usbCintiqV5 }, /* DTH2242 */ + { WACOM_VENDOR_ID, 0x5B, 200000, 200000, &usbCintiqV5 }, /* Cintiq 22HDT */ { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC }, /* TabletPC 0x90 */ { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC }, /* TabletPC 0x93 */ diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index e62946e..011c423 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -1,5 +1,5 @@ /* - * Copyright 2009 - 2010 by Ping Cheng, Wacom. <pingc@wacom.com> + * Copyright 2009 - 2013 by Ping Cheng, Wacom. <pingc@wacom.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -263,6 +263,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) case 0xC6: /* CintiqV5 */ case 0xCC: /* CinitqV5 */ case 0xFA: /* Cintiq 22HD */ + case 0x5B: /* Cintiq 22HDT Pen */ TabletSetFeature(priv->common, WCM_LCD); /* fall through */ case 0xB0: /* I3 */ @@ -294,6 +295,11 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) case 0x9F: case 0xF6: /* Cintiq 24HDT Touch */ + case 0x57: /* DTK2241 */ + case 0x59: /* DTH2242 Pen */ + case 0x5D: /* DTH2242 Touch */ + case 0x5E: /* Cintiq 22HDT Touch */ + case 0x304:/* Cintiq 13HD */ TabletSetFeature(priv->common, WCM_LCD); break; } |