Input: wacom - add support for three new Intuos Pro devices
Subsystems (2)
PATCH v2 1/1 Input: wacom - add support for three new Intuos Pro devices
Acked-by Chris Bagwell <[email protected]>
Signed-off-by Ping Cheng <[email protected]>
---
v2: Updated with Chris' comment (missed model specific bits in v1).
--- drivers/input/tablet/wacom_sys.c | 10 +++++-- drivers/input/tablet/wacom_wac.c | 58 ++++++++++++++++++++++++++++++---------- drivers/input/tablet/wacom_wac.h | 3 +++ 3 files changed, 55 insertions(+), 16 deletions(-)
drivers/input/tablet/wacom_sys.c +8 -2
@@ -719,7 +719,7 @@ static int wacom_led_control(struct wacom *wacom)return -ENOMEM ;if (wacom->wacom_wac.features.type >=INTUOS5S && - wacom->wacom_wac.features.type <=INTUOS5L ) { + wacom->wacom_wac.features.type <=INTUOSPL ) {/* * Touch Ring and crop mark LED luminance may take on * one of four values:
@@ -981,6 +981,9 @@ static int wacom_initialize_leds(struct wacom *wacom)case INTUOS5S :case INTUOS5 :case INTUOS5L : +case INTUOSPS : +case INTUOSPM : +case INTUOSPL : wacom->led.select[0 ] =0 ; wacom->led.select[1 ] =0 ; wacom->led.llv =32 ;
@@ -1024,6 +1027,9 @@ static void wacom_destroy_leds(struct wacom *wacom)case INTUOS5S :case INTUOS5 :case INTUOS5L : +case INTUOSPS : +case INTUOSPM : +case INTUOSPL :sysfs_remove_group (&wacom->intf->dev.kobj, &intuos5_led_attr_group);break ;
@@ -1298,7 +1304,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i* HID descriptor. If this is the touch interface (wMaxPacketSize * of WACOM_PKGLEN_BBTOUCH3), override the table values. */ -if (features->type >=INTUOS5S && features->type <=INTUOS5L ) { +if (features->type >=INTUOS5S && features->type <=INTUOSPL ) {if (endpoint->wMaxPacketSize ==WACOM_PKGLEN_BBTOUCH3 ) { features->device_type =BTN_TOOL_FINGER ; features->pktlen =WACOM_PKGLEN_BBTOUCH3 ;
drivers/input/tablet/wacom_wac.c +44 -14
137 lines not on this page · raw message
drivers/input/tablet/wacom_wac.h +3 -0
@@ -76,6 +76,9 @@ enum {INTUOS5S ,INTUOS5 ,INTUOS5L , +INTUOSPS , +INTUOSPM , +INTUOSPL ,WACOM_21UX2 ,WACOM_22HD , DTK,
Signature · 1 line
1.8.1.2