On Tue, Sep 10, 2013 at 04:42:22PM -0700, Ping Cheng wrote:
> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
> Signed-off-by: Ping Cheng <pi...@wacom.com>
> ---
> v2: updated to new WacomModelDesc format
cb14924..59086ba master -> master
thanks.
Cheers,
Peter
> ---
> src/wcmUSB.c | 4 ++++
> src/wcmValidateDevice.c | 3 +++
> 2 files changed, 7 insertions(+)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index 068b306..eaaf854 100644
> --- a/src/wcmUSB.c
> +++ b/src/wcmUSB.c
> @@ -97,6 +97,7 @@ 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(usbIntuosPro, "USB Intuos Pro", 5);
> DEFINE_MODEL(usbVolito, "USB Volito", 4);
> DEFINE_MODEL(usbVolito2, "USB Volito2", 4);
> DEFINE_MODEL(usbCintiqV5, "USB CintiqV5", 5);
> @@ -270,6 +271,9 @@ static struct WacomModelDesc
> { 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, 0x314,200000, 200000, &usbIntuosPro, "Intuos Pro S"
> },
> + { WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro, "Intuos Pro M"
> },
> + { WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro, "Intuos Pro L"
> },
>
> { WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5, "Cintiq 21UX"
> },
> { WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5, "Cintiq 20WSX"
> },
> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
> index b3c9c61..1a5e722 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -202,6 +202,9 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
> TabletSetFeature(priv->common, WCM_DUALRING | WCM_LCD);
> /* fall through */
>
> + case 0x314: /* Intuos Pro S */
> + case 0x315: /* Intuos Pro M */
> + case 0x317: /* Intuos Pro L */
> case 0x26: /* I5 */
> case 0x27: /* I5 */
> case 0x28: /* I5 */
> --
> 1.8.1.2
>
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
