diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2011-12-12 09:20:31 -0800 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2011-12-29 11:23:40 -0800 |
| commit | fe1dc1753010809a7741f05784b5abe9d2ee5cff (patch) | |
| tree | 863ff247c028f7678c705997cfe14505c60f57cf | |
| parent | 477a261ef79172d6378613fc4cab0026ed49d02f (diff) | |
Add basic support for Cintiq 24HD
Adds the Cintiq 24HD (056a:00f4) to the device lists. The 24HD
has two features not found on prior tablets: three capacitive
buttons, and a second touch ring. Subsuquent patches will
address adding support for them.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmUSB.c | 1 | ||||
| -rw-r--r-- | src/wcmValidateDevice.c | 4 | ||||
| -rw-r--r-- | src/xf86WacomDefs.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 755c410..c95895a 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -264,6 +264,7 @@ static struct { WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5 }, /* Cintiq 20WSX */ { WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5 }, /* Cintiq 12WX */ { WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5 }, /* Cintiq 21UX2 */ + { WACOM_VENDOR_ID, 0xF4, 200000, 200000, &usbCintiqV5 }, /* Cintiq 24HD */ { 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 538db0a..97df312 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -191,6 +191,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) switch (priv->common->tablet_id) { + case 0xF4: /* Cintiq 24HD */ + TabletSetFeature(priv->common, WCM_DUALRING); + /* fall through */ + case 0xB8: /* I4 */ case 0xB9: /* I4 */ case 0xBA: /* I4 */ diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index 32b18ee..72de096 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -165,6 +165,7 @@ struct _WacomModel button handling, always an LCD) */ #define WCM_PENTOUCH 0x00000400 /* Tablet supports pen and touch */ +#define WCM_DUALRING 0x00000800 /* Tablet has two touch rings */ #define TabletHasFeature(common, feature) MaskIsSet((common)->tablet_type, (feature)) #define TabletSetFeature(common, feature) MaskSet((common)->tablet_type, (feature)) |