diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2012-08-02 09:23:55 -0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2012-10-19 17:08:27 -0700 |
| commit | 7c91665c86c93b9668a1649d20b32550fbdc544b (patch) | |
| tree | 10d7adf7a8f7c1b1e4c24448a81f252685bdf9e1 | |
| parent | 8c17d224a5df855ccdb1bb15862156782532074c (diff) | |
| download | xf86-input-wacom-7c91665c86c93b9668a1649d20b32550fbdc544b.tar.gz | |
Add support for Cintiq 24HD touch
Adds support for the EMR and touch digitizers on the Cintiq 24HD
touch. The digitizers are on separate USB devices, which can lead to
the cursor jumping back and forth between the stylus and finger.
Performing arbitration between the two (disabling finger while pen is in
proximity) is expected to be handled by the kernel driver.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmUSB.c | 1 | ||||
| -rw-r--r-- | src/wcmValidateDevice.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index f90def9..4eb15d4 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -278,6 +278,7 @@ static struct { WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5 }, /* Cintiq 21UX2 */ { 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, 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 1d09102..658092b 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -189,6 +189,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) switch (priv->common->tablet_id) { + case 0xF8: /* Cintiq 24HDT */ case 0xF4: /* Cintiq 24HD */ TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD); /* fall through */ @@ -279,6 +280,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) break; case 0x9F: + case 0xF6: /* Cintiq 24HDT Touch */ TabletSetFeature(priv->common, WCM_LCD); break; } |