On Fri, May 17, 2013 at 03:11:39PM -0700, Ping Cheng wrote: > Signed-off-by: Ping Cheng <pi...@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Cheers, Peter > --- > src/wcmUSB.c | 4 ++++ > src/wcmValidateDevice.c | 8 +++++++- > 2 files changed, 11 insertions(+), 1 deletion(-) > > 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. <pi...@wacom.com> > + * Copyright 2009 - 2013 by Ping Cheng, Wacom. <pi...@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; > } > -- > 1.8.1.2 > ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel