On Fri, Oct 21, 2011 at 06:37:22PM -0700, Jason Gerecke wrote:
> 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 <killert...@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Cheers,
Peter
> ---
> src/wcmUSB.c | 1 +
> src/wcmValidateDevice.c | 4 ++++
> src/xf86WacomDefs.h | 1 +
> 3 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index 14de990..c92ce41 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 94bcdc6..34cae91 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 cf16648..72a48d0 100644
> --- a/src/xf86WacomDefs.h
> +++ b/src/xf86WacomDefs.h
> @@ -164,6 +164,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) (((common)->tablet_type &
> (feature)) != 0)
> #define TabletSetFeature(common, feature) ((common)->tablet_type |=
> (feature))
>
> --
> 1.7.6
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
