Reviewed-by: Chris Bagwell <ch...@cnpbagwell.com> On Mon, Mar 12, 2012 at 5:22 PM, Jason Gerecke <killert...@gmail.com> wrote: > > Signed-off-by: Jason Gerecke <killert...@gmail.com> > --- > src/wcmUSB.c | 7 +++++++ > src/wcmValidateDevice.c | 5 +++++ > 2 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/src/wcmUSB.c b/src/wcmUSB.c > index a2d30da..472f470 100644 > --- a/src/wcmUSB.c > +++ b/src/wcmUSB.c > @@ -98,6 +98,7 @@ DEFINE_MODEL(usbIntuos, "USB Intuos1", > 5); > DEFINE_MODEL(usbIntuos2, "USB Intuos2", 5); > DEFINE_MODEL(usbIntuos3, "USB Intuos3", 5); > DEFINE_MODEL(usbIntuos4, "USB Intuos4", 5); > +DEFINE_MODEL(usbIntuos5, "USB Intuos5", 5); > DEFINE_MODEL(usbVolito, "USB Volito", 4); > DEFINE_MODEL(usbVolito2, "USB Volito2", 4); > DEFINE_MODEL(usbCintiqV5, "USB CintiqV5", 5); > @@ -263,6 +264,12 @@ static struct > { WACOM_VENDOR_ID, 0xBC, 200000, 200000, &usbIntuos4 }, /* Intuos4 > WL USB Endpoint */ > { WACOM_VENDOR_ID, 0xBD, 200000, 200000, &usbIntuos4 }, /* Intuos4 > WL Bluetooth Endpoint */ > > + { WACOM_VENDOR_ID, 0x26, 200000, 200000, &usbIntuos5 }, /* Intuos5 > touch S */ > + { WACOM_VENDOR_ID, 0x27, 200000, 200000, &usbIntuos5 }, /* Intuos5 > touch M */ > + { WACOM_VENDOR_ID, 0x28, 200000, 200000, &usbIntuos5 }, /* Intuos5 > touch L */ > + { WACOM_VENDOR_ID, 0x29, 200000, 200000, &usbIntuos5 }, /* Intuos5 > S */ > + { WACOM_VENDOR_ID, 0x2A, 200000, 200000, &usbIntuos5 }, /* Intuos5 > M */ > + > { WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5 }, /* Cintiq > 21UX */ > { WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5 }, /* Cintiq > 20WSX */ > { WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5 }, /* Cintiq > 12WX */ > diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c > index 862e005..a66e066 100644 > --- a/src/wcmValidateDevice.c > +++ b/src/wcmValidateDevice.c > @@ -195,6 +195,11 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) > TabletSetFeature(priv->common, WCM_DUALRING); > /* fall through */ > > + case 0x26: /* I5 */ > + case 0x27: /* I5 */ > + case 0x28: /* I5 */ > + case 0x29: /* I5 */ > + case 0x2A: /* I5 */ > case 0xB8: /* I4 */ > case 0xB9: /* I4 */ > case 0xBA: /* I4 */ > -- > 1.7.9.1 > > > ------------------------------------------------------------------------------ > Try before you buy = See our experts in action! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-dev2 > _______________________________________________ > Linuxwacom-devel mailing list > Linuxwacom-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel