wacom: update to match upstream
Subsystems (2)
cover wacom: update to match upstream
The upstream linuxwacom driver (http://linuxwacom.sourceforge.net) has various updates that aren't present in the kernel. I've ported them to the current state of things and tried to clean them up a little, but some of the conditionals make >80 column lines pretty inevitable and I don't want to do any real refactoring.
PATCH 1/3 wacom: Add support for extra USB tablets
From: Ping Cheng <[email protected]>
Add support for Tablet PCs with IDs 0xE2 and 0xE3 as well as touch-only tablet 0x9F.
--- drivers/input/tablet/wacom.h | 2 + drivers/input/tablet/wacom_sys.c | 138 +++++++++++----- drivers/input/tablet/wacom_wac.c | 327 +++++++++++++++++++++++++------------- drivers/input/tablet/wacom_wac.h | 9 + 4 files changed, 328 insertions(+), 148 deletions(-)
drivers/input/tablet/wacom.h +2 -0
@@ -135,6 +135,8 @@ extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_waextern void input_dev_pt (struct input_dev *input_dev,struct wacom_wac *wacom_wac);extern void input_dev_mo (struct input_dev *input_dev,struct wacom_wac *wacom_wac);extern void input_dev_bee (struct input_dev *input_dev,struct wacom_wac *wacom_wac); +extern void input_dev_tpc (struct input_dev *input_dev,struct wacom_wac *wacom_wac); +extern void input_dev_tpc2fg (struct input_dev *input_dev,struct wacom_wac *wacom_wac);extern __u16 wacom_le16_to_cpu (unsigned char *data);extern __u16 wacom_be16_to_cpu (unsigned char *data);extern struct wacom_features *get_wacom_feature (const struct usb_device_id *id);
drivers/input/tablet/wacom_sys.c +97 -41
235 lines not on this page · raw message
drivers/input/tablet/wacom_wac.c +220 -107
480 lines not on this page · raw message
drivers/input/tablet/wacom_wac.h +9 -0
@@ -9,6 +9,10 @@#ifndef WACOM_WAC_H #define WACOM_WAC_H +/* maximum packet length for USB devices */ +#define WACOM_PKGLEN_MAX 32 + +/* device IDs */ #define STYLUS_DEVICE_ID 0x02#define TOUCH_DEVICE_ID 0x03#define CURSOR_DEVICE_ID 0x06
@@ -32,6 +36,7 @@ enum {WACOM_BEE ,WACOM_MO ,TABLETPC , +TABLETPC2FG , MAX_TYPE };
@@ -43,8 +48,12 @@ struct wacom_features {int pressure_max;int distance_max;int type; +int touch_x_res; +int touch_y_res;int touch_x_max;int touch_y_max; +unsigned char unit; +unsigned char unitExpo; };struct wacom_wac {
Signature · 1 line
1.6.5.2
PATCH 2/3 Wacom: Add support for two-finger touch
From: Ping Cheng <[email protected]>
Some wacom pads can report events for two-finger touches. Make sure that these are reported.
--- drivers/input/tablet/wacom_sys.c | 78 +++++++----- drivers/input/tablet/wacom_wac.c | 254 +++++++++++++++++++++----------------- drivers/input/tablet/wacom_wac.h | 7 +- 3 files changed, 188 insertions(+), 151 deletions(-)
drivers/input/tablet/wacom_sys.c +47 -31
@@ -209,6 +209,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac) input_dev->keybit[BIT_WORD (BTN_MOUSE )] |=BIT_MASK (BTN_LEFT ) |BIT_MASK (BTN_RIGHT ) |BIT_MASK (BTN_MIDDLE ); input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_RUBBER ) | +BIT_MASK (BTN_TOOL_PEN ) |BIT_MASK (BTN_STYLUS ) |BIT_MASK (BTN_TOOL_MOUSE ) |BIT_MASK (BTN_STYLUS2 );input_set_abs_params (input_dev,ABS_DISTANCE ,0 , wacom_wac->features->distance_max,0 ,0 ); }
@@ -256,6 +257,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)BIT_MASK (BTN_RIGHT ) |BIT_MASK (BTN_MIDDLE ) |BIT_MASK (BTN_SIDE ) |BIT_MASK (BTN_EXTRA ); input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_RUBBER ) | +BIT_MASK (BTN_TOOL_PEN ) |BIT_MASK (BTN_STYLUS ) |BIT_MASK (BTN_TOOL_MOUSE ) |BIT_MASK (BTN_TOOL_BRUSH ) |BIT_MASK (BTN_TOOL_PENCIL ) |BIT_MASK (BTN_TOOL_AIRBRUSH ) |BIT_MASK (BTN_TOOL_LENS ) |BIT_MASK (BTN_STYLUS2 );
@@ -269,7 +271,8 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)void input_dev_pl (struct input_dev *input_dev,struct wacom_wac *wacom_wac) { - input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_STYLUS2 ); + input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_PEN ) | +BIT_MASK (BTN_STYLUS ) |BIT_MASK (BTN_STYLUS2 ); }void input_dev_pt (struct input_dev *input_dev,struct wacom_wac *wacom_wac)
@@ -279,20 +282,24 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)void input_dev_tpc (struct input_dev *input_dev,struct wacom_wac *wacom_wac) { -input_set_abs_params (input_dev,ABS_RX ,0 , - wacom_wac->features->touch_x_max,4 ,0 ); -input_set_abs_params (input_dev,ABS_RY ,0 , - wacom_wac->features->touch_y_max,4 ,0 ); -input_set_abs_params (input_dev,ABS_Z ,0 , - wacom_wac->features->touch_x_res,0 ,0 ); -input_set_abs_params (input_dev,ABS_RZ ,0 , - wacom_wac->features->touch_y_res,0 ,0 ); - input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_DOUBLETAP ); +if (wacom_wac->features->device_type ==BTN_TOOL_DOUBLETAP ) { +input_set_abs_params (input_dev,ABS_RX ,0 , + wacom_wac->features->x_phy,0 ,0 ); +input_set_abs_params (input_dev,ABS_RY ,0 , + wacom_wac->features->y_phy,0 ,0 ); + input_dev->keybit[BIT_WORD (BTN_DIGI )] |= +BIT_MASK (BTN_TOOL_DOUBLETAP ); + } }void input_dev_tpc2fg (struct input_dev *input_dev,struct wacom_wac *wacom_wac) { - input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_TRIPLETAP ); +if (wacom_wac->features->device_type ==BTN_TOOL_DOUBLETAP ) { + input_dev->keybit[BIT_WORD (BTN_DIGI )] |= +BIT_MASK (BTN_TOOL_TRIPLETAP ); + input_dev->evbit[0 ] |=BIT_MASK (EV_MSC ); + input_dev->mscbit[0 ] |=BIT_MASK (MSC_SERIAL ); + } } static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,
@@ -346,15 +353,19 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hicase HID_USAGE_X :if (usage ==WCM_DESKTOP ) {if (finger) { - features->touch_x_max = + features->device_type = +BTN_TOOL_DOUBLETAP ; + features->x_max =wacom_le16_to_cpu (&report[i +3 ]); - features->touch_x_res = + features->x_phy =wacom_le16_to_cpu (&report[i +6 ]); features->unit = report[i +9 ]; features->unitExpo = report[i +11 ]; i +=12 ; }else if (pen) { + features->device_type = +BTN_TOOL_PEN ; features->x_max =wacom_le16_to_cpu (&report[i +3 ]); i +=4 ;
@@ -372,21 +383,25 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hicase HID_USAGE_Y :if (usage ==WCM_DESKTOP ) {if (finger) { + features->device_type = +BTN_TOOL_DOUBLETAP ;if (strstr (features->name,"Wacom ISDv4 E" )) { - features->touch_y_max = + features->y_max =wacom_le16_to_cpu (&report[i +3 ]); - features->touch_y_res = + features->y_phy =wacom_le16_to_cpu (&report[i +6 ]); i +=7 ; }else { - features->touch_y_max = - features->touch_x_max; - features->touch_y_res = + features->y_max = + features->x_max; + features->y_phy =wacom_le16_to_cpu (&report[i +3 ]); i +=4 ; } }else if (pen) { + features->device_type = +BTN_TOOL_PEN ; features->y_max =wacom_le16_to_cpu (&report[i +3 ]); i +=4 ;
@@ -507,6 +522,10 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i wacom_wac->features = features =get_wacom_feature (id);BUG_ON (features->pktlen >WACOM_PKGLEN_MAX ); +/* default device to penabled */ +if (features->device_type) + features->device_type =BTN_TOOL_PEN ; + input_dev->name = wacom_wac->features->name; wacom->wacom_wac = wacom_wac;usb_to_input_id (dev, &input_dev->id);
@@ -520,11 +539,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i endpoint = &intf->cur_altsetting->endpoint[0 ].desc; -/* Initialize touch_x_max and touch_y_max in case it is not defined in -HID descriptor */ if (features->type ==TABLETPC || features->type ==TABLETPC2FG ) { - features->touch_x_max =1023 ; - features->touch_y_max =1023 ;/* TabletPC need to retrieve the physical and logical maximum from report descriptor */
@@ -538,21 +553,22 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i error =wacom_parse_hid (intf, hid_desc, wacom_wac);if (error) goto fail2; - }else { - features->touch_x_max =0 ; - features->touch_y_max =0 ; - } +/* touch device found but size is not defined. use default */ +if (features->device_type ==BTN_TOOL_DOUBLETAP && + !features->x_max) { + features->x_max =1023 ; + features->y_max =1023 ; + } + } input_dev->evbit[0 ] |=BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); - input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_PEN ) | -BIT_MASK (BTN_TOUCH ) |BIT_MASK (BTN_STYLUS ); + input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOUCH );input_set_abs_params (input_dev,ABS_X ,0 , features->x_max,4 ,0 ); -input_set_abs_params (input_dev,ABS_Y ,0 , features->y_max,4 ,0 ); - -input_set_abs_params (input_dev,ABS_PRESSURE ,0 , features->pressure_max,0 ,0 ); +input_set_abs_params (input_dev,ABS_PRESSURE ,0 , + features->pressure_max,0 ,0 ); input_dev->absbit[BIT_WORD (ABS_MISC )] |=BIT_MASK (ABS_MISC );wacom_init_input_dev (input_dev, wacom_wac);
drivers/input/tablet/wacom_wac.c +138 -116
389 lines not on this page · raw message
drivers/input/tablet/wacom_wac.h +3 -4
@@ -48,10 +48,9 @@ struct wacom_features {int pressure_max;int distance_max;int type; -int touch_x_res; -int touch_y_res; -int touch_x_max; -int touch_y_max; +int device_type; +int x_phy; +int y_phy;unsigned char unit;unsigned char unitExpo; };
Signature · 1 line
1.6.5.2
PATCH 3/3 wacom: Improve support for Penabled devices
From: Ping Cheng <[email protected]>
Refactor the code somewhat in order to provide better support for Penabled devices.
--- drivers/input/tablet/wacom_sys.c | 144 ++++++++++++++++++++++++-------------- drivers/input/tablet/wacom_wac.c | 24 ++----- drivers/input/tablet/wacom_wac.h | 9 +++ 3 files changed, 108 insertions(+), 69 deletions(-)
drivers/input/tablet/wacom_sys.c +92 -52
@@ -1,7 +1,7 @@/* * drivers/input/tablet/wacom_sys.c * -* USB Wacom Graphire and Wacom Intuos tablet support - system specific code +* USB Wacom tablet support - system specific code */ /*
@@ -282,7 +282,8 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)void input_dev_tpc (struct input_dev *input_dev,struct wacom_wac *wacom_wac) { -if (wacom_wac->features->device_type ==BTN_TOOL_DOUBLETAP ) { +if ((wacom_wac->features->device_type ==BTN_TOOL_DOUBLETAP ) || + (wacom_wac->features->device_type ==BTN_TOOL_TRIPLETAP )) {input_set_abs_params (input_dev,ABS_RX ,0 , wacom_wac->features->x_phy,0 ,0 ); input_set_abs_params(input_dev, ABS_RY, 0,
@@ -294,7 +295,7 @@ void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac)void input_dev_tpc2fg (struct input_dev *input_dev,struct wacom_wac *wacom_wac) { -if (wacom_wac->features->device_type ==BTN_TOOL_DOUBLETAP ) { +if (wacom_wac->features->device_type ==BTN_TOOL_TRIPLETAP ) { input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOOL_TRIPLETAP ); input_dev->evbit[0 ] |=BIT_MASK (EV_MSC );
@@ -303,10 +304,9 @@ void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac) }static int wacom_parse_hid (struct usb_interface *intf,struct hid_descriptor *hid_desc, -struct wacom_wac *wacom_wac) +struct wacom_features *features) {struct usb_device *dev =interface_to_usbdev (intf); -struct wacom_features *features = wacom_wac->features;char limit =0 ;int i =0 , usage =WCM_UNDEFINED , finger =0 , pen =0 , result =0 ;unsigned char *report;
@@ -355,6 +355,14 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hiif (finger) { features->device_type =BTN_TOOL_DOUBLETAP ; +if (features->type == +TABLETPC2FG ) { +/* need to reset back */ + features->pktlen = +WACOM_PKGLEN_TPC2FG ; + features->device_type = +BTN_TOOL_TRIPLETAP ; + } features->x_max =wacom_le16_to_cpu (&report[i +3 ]); features->x_phy =
@@ -364,6 +372,11 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi report[i +11 ]; i +=12 ; }else if (pen) { +/* penabled only accepts exact bytes of data */ +if (features->type == +TABLETPC2FG ) + features->pktlen = +WACOM_PKGLEN_PENABLED ; features->device_type =BTN_TOOL_PEN ; features->x_max =
@@ -385,8 +398,13 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hiif (finger) { features->device_type =BTN_TOOL_DOUBLETAP ; -if (strstr (features->name, -"Wacom ISDv4 E" )) { +if (features->type == +TABLETPC2FG ) { +/* need to reset back */ + features->pktlen = +WACOM_PKGLEN_TPC2FG ; + features->device_type = +BTN_TOOL_TRIPLETAP ; features->y_max =wacom_le16_to_cpu (&report[i +3 ]); features->y_phy =
@@ -400,6 +418,11 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi i +=4 ; } }else if (pen) { +/* penabled only accepts exact bytes of data */ +if (features->type == +TABLETPC2FG ) + features->pktlen = +WACOM_PKGLEN_PENABLED ; features->device_type =BTN_TOOL_PEN ; features->y_max =
@@ -441,19 +464,20 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hireturn result; } -static int wacom_query_tablet_data (struct usb_interface *intf, -struct wacom_features *features) +static int wacom_reset_report (struct usb_interface *intf, +struct wacom_features *features) { -unsigned char *rep_data; -int limit =0 ; -int error; -int report_id =2 ; +char *rep_data, limit =0 , report_id =2 ; +int error = -ENOMEM ; rep_data =kmalloc (4 ,GFP_KERNEL ); -if (!rep_data) -return -ENOMEM ; -if (features->type ==TABLETPC2FG ) { +/* +* Ask to report tablet data if it is 2FGT or not a Tablet PC. +* Repeat 3 times since on some systems the first 2 may fail. +*/ + +if (features->device_type ==BTN_TOOL_TRIPLETAP ) { do { rep_data[0] = 3; rep_data[1] = 4;
@@ -466,7 +490,8 @@ static int wacom_query_tablet_data(struct usb_interface *intf, report_id, rep_data, 3); }while ((error <0 || rep_data[1 ] !=4 ) && limit++ <3 ); - }else if (features->type !=TABLETPC ) { + }else if ((features->type !=TABLETPC ) && + (features->type !=TABLETPC2FG )) { do { rep_data[0] = 2; rep_data[1] = 2;
@@ -482,7 +507,44 @@ static int wacom_query_tablet_data(struct usb_interface *intf,kfree (rep_data); -return error <0 ? error :0 ; +return error; +} + +static int wacom_retrieve_hid_descriptor (struct usb_interface *intf, +struct wacom_features *features) +{ +int error =0 ; +struct usb_host_interface *interface = intf->cur_altsetting; +struct hid_descriptor *hid_desc; + +/* default device to penabled */ + features->device_type =BTN_TOOL_PEN ; + +/* only Tablet PCs need to retrieve the info */ +if ((features->type !=TABLETPC ) && (features->type !=TABLETPC2FG )) + goto out; + +if (usb_get_extra_descriptor (interface,HID_DEVICET_HID , &hid_desc)) { +if (usb_get_extra_descriptor (&interface->endpoint[0 ], +HID_DEVICET_REPORT , &hid_desc)) { +printk (KERN_ERR +"wacom: can not retrieve extra class descriptor\n" ); + error =1 ; + goto out; + } + } + error =wacom_parse_hid (intf, hid_desc, features); +if (error) + goto out; + +/* touch device found but size is not defined. use default */ +if (features->device_type ==BTN_TOOL_DOUBLETAP && !features->x_max) { + features->x_max =1023 ; + features->y_max =1023 ; + } + +out: +return error; }static int wacom_probe (struct usb_interface *intf,const struct usb_device_id *id)
@@ -522,10 +584,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i wacom_wac->features = features =get_wacom_feature (id);BUG_ON (features->pktlen >WACOM_PKGLEN_MAX ); -/* default device to penabled */ -if (features->device_type) - features->device_type =BTN_TOOL_PEN ; - input_dev->name = wacom_wac->features->name; wacom->wacom_wac = wacom_wac;usb_to_input_id (dev, &input_dev->id);
@@ -539,28 +597,10 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i endpoint = &intf->cur_altsetting->endpoint[0 ].desc; -if (features->type ==TABLETPC || features->type ==TABLETPC2FG ) { - -/* TabletPC need to retrieve the physical and logical maximum -from report descriptor */ -if (usb_get_extra_descriptor (interface,HID_DEVICET_HID , &hid_desc)) { -if (usb_get_extra_descriptor (&interface->endpoint[0 ], -HID_DEVICET_REPORT , &hid_desc)) { -printk ("wacom: can not retrive extra class descriptor\n" ); - goto fail2; - } - } - error =wacom_parse_hid (intf, hid_desc, wacom_wac); -if (error) - goto fail2; - -/* touch device found but size is not defined. use default */ -if (features->device_type ==BTN_TOOL_DOUBLETAP && - !features->x_max) { - features->x_max =1023 ; - features->y_max =1023 ; - } - } +/* Retrieve the physical and logical size for OEM devices */ + error =wacom_retrieve_hid_descriptor (intf, features); +if (error) + goto fail2; input_dev->evbit[0 ] |=BIT_MASK (EV_KEY ) |BIT_MASK (EV_ABS ); input_dev->keybit[BIT_WORD (BTN_DIGI )] |=BIT_MASK (BTN_TOUCH );
@@ -584,12 +624,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *iif (error) goto fail3; -/* -* Ask the tablet to report tablet data if it is not a Tablet PC. -* Note that if query fails it is not a hard failure. -*/ -if (wacom_wac->features->type !=TABLETPC ) -wacom_query_tablet_data (intf, features); +/* switch to wacom mode if needed */ +wacom_reset_report (intf, features);usb_set_intfdata (intf, wacom);return 0 ;
@@ -631,12 +667,16 @@ static int wacom_suspend(struct usb_interface *intf, pm_message_t message)static int wacom_resume (struct usb_interface *intf) {struct wacom *wacom =usb_get_intfdata (intf); +struct wacom_features *features = wacom->wacom_wac->features;int rv;mutex_lock (&wacom->lock); -if (wacom->open) +if (wacom->open) { rv =usb_submit_urb (wacom->irq,GFP_NOIO ); -else +/* switch to wacom mode if needed */ +if (!wacom_retrieve_hid_descriptor (intf, features)) +wacom_reset_report (intf, features); + }else rv =0 ;mutex_unlock (&wacom->lock);
drivers/input/tablet/wacom_wac.c +7 -17
@@ -1,7 +1,7 @@/* * drivers/input/tablet/wacom_wac.c * -* USB Wacom Graphire and Wacom Intuos tablet support - Wacom specific code +* USB Wacom tablet support - Wacom specific code * */
@@ -14,14 +14,6 @@#include "wacom.h" #include "wacom_wac.h" -/* packet length for individual models */ -#define WACOM_PKGLEN_PENPRTN 7 -#define WACOM_PKGLEN_GRAPHIRE 8 -#define WACOM_PKGLEN_BBFUN 9 -#define WACOM_PKGLEN_INTUOS 10 -#define WACOM_PKGLEN_TPC1FG 5 -#define WACOM_PKGLEN_TPC2FG 14 -static int wacom_penpartner_irq (struct wacom_wac *wacom,void *wcombo) {unsigned char *data = wacom->data;
@@ -869,7 +861,6 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)return wacom_intuos_irq (wacom_wac, wcombo);case TABLETPC : -case TABLETPC2FG :return wacom_tpc_irq (wacom_wac, wcombo);
@@ -916,8 +907,7 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w/* fall through */ case TABLETPC :input_dev_tpc (input_dev, wacom_wac); -if (wacom_wac->features->device_type == -BTN_TOOL_DOUBLETAP ) +if (wacom_wac->features->device_type !=BTN_TOOL_PEN )break ;/* no need to process stylus stuff */ /* fall through */
@@ -988,11 +978,11 @@ static struct wacom_features wacom_features[] = { { "Wacom Cintiq 21UX", WACOM_PKGLEN_INTUOS, 87200, 65600, 1023, 63, CINTIQ }, { "Wacom Cintiq 20WSX", WACOM_PKGLEN_INTUOS, 86680, 54180, 1023, 63, WACOM_BEE }, { "Wacom Cintiq 12WX", WACOM_PKGLEN_INTUOS, 53020, 33440, 1023, 63, WACOM_BEE }, - { "Wacom DTU1931", WACOM_PKGLEN_GRAPHIRE, 37832, 30305, 511, 0, PL }, - { "Wacom ISDv4 90", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, - { "Wacom ISDv4 93", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, - { "Wacom ISDv4 9A", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, - { "Wacom ISDv4 9F", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPC }, + { "Wacom DTU1931", WACOM_PKGLEN_PENABLED, 37832, 30305, 511, 0, PL }, + { "Wacom ISDv4 90", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC }, + { "Wacom ISDv4 93", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC }, + { "Wacom ISDv4 9A", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC }, + { "Wacom ISDv4 9F", WACOM_PKGLEN_PENABLED, 26202, 16325, 255, 0, TABLETPC }, { "Wacom ISDv4 E2", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG }, { "Wacom ISDv4 E3", WACOM_PKGLEN_TPC2FG, 26202, 16325, 255, 0, TABLETPC2FG }, { "Wacom Intuos2 6x8", WACOM_PKGLEN_INTUOS, 20320, 16240, 1023, 31, INTUOS },
drivers/input/tablet/wacom_wac.h +9 -0
@@ -12,6 +12,15 @@/* maximum packet length for USB devices */ #define WACOM_PKGLEN_MAX 32 +/* packet length for individual models */ +#define WACOM_PKGLEN_PENPRTN 7 +#define WACOM_PKGLEN_GRAPHIRE 8 +#define WACOM_PKGLEN_BBFUN 9 +#define WACOM_PKGLEN_INTUOS 10 +#define WACOM_PKGLEN_PENABLED 8 +#define WACOM_PKGLEN_TPC1FG 5 +#define WACOM_PKGLEN_TPC2FG 14 +/* device IDs */ #define STYLUS_DEVICE_ID 0x02#define TOUCH_DEVICE_ID 0x03
Signature · 1 line
1.6.5.2