Attachment 314588 Details for Bug 370471 – 01-add_support_for_intuos3_4x6.patch

[patch] 01-add_support_for_intuos3_4x6.patch

add_support_for_intuos3_4x6.patch (text/plain), 3.99 KB, created by Aristeu Rozanski on 2008-08-19 22:24:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aristeu Rozanski

Created: 2008-08-19 22:24:58 UTC

Size: 3.99 KB

patch

obsolete

>wacom: add support for Intuos3 4x6"
>
>https://bugzilla.redhat.com/show_bug.cgi?id=370471
>
>This patch adds support for Intuos3 4x6".
>
>Tested by the customer with success
>
>Upstream:
>071e0a2aee9c289f50b9329d0c26474ca94f7c7a
>8d32e3ae5972641ee9eb813e7a5c44a2b85d3694
>
>---
> drivers/usb/input/wacom.c |   25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
>--- tree.orig/drivers/usb/input/wacom.c	2008-07-07 16:49:06.000000000 -0400
>+++ tree/drivers/usb/input/wacom.c	2008-07-07 16:49:07.000000000 -0400
>@@ -97,6 +97,7 @@ enum {
> 	WACOM_G4,
> 	PL,
> 	INTUOS,
>+	INTUOS3S,
> 	INTUOS3,
> 	INTUOS312,
> 	INTUOS319,
>@@ -649,7 +650,7 @@ static void wacom_intuos_irq(struct urb 
> 	if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
> 		goto exit;
> 
>-	if (wacom->features->type >= INTUOS3) {
>+	if (wacom->features->type >= INTUOS3S) {
> 		input_report_abs(dev, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1));
> 		input_report_abs(dev, ABS_Y, (data[4] << 9) | (data[5] << 1) | (data[9] & 1));
> 		input_report_abs(dev, ABS_DISTANCE, ((data[9] >> 2) & 0x3f));
>@@ -667,7 +668,7 @@ static void wacom_intuos_irq(struct urb 
> 
> 		if (data[1] & 0x02) {
> 			/* Rotation packet */
>-			if (wacom->features->type >= INTUOS3) {
>+			if (wacom->features->type >= INTUOS3S) {
> 				/* I3 marker pen rotation reported as wheel
> 				 * due to valuator limitation
> 				 */
>@@ -682,7 +683,7 @@ static void wacom_intuos_irq(struct urb 
> 					((t - 1) / 2) : -t / 2);
> 			}
> 
>-		} else if (!(data[1] & 0x10) && wacom->features->type < INTUOS3) {
>+		} else if (!(data[1] & 0x10) && wacom->features->type < INTUOS3S) {
> 			/* 4D mouse packet */
> 			input_report_key(dev, BTN_LEFT,   data[8] & 0x01);
> 			input_report_key(dev, BTN_MIDDLE, data[8] & 0x02);
>@@ -702,13 +703,15 @@ static void wacom_intuos_irq(struct urb 
> 						 - ((data[8] & 0x02) >> 1));
> 
> 			/* I3 2D mouse side buttons */
>-			if (wacom->features->type >= INTUOS3 &&
>+			if (wacom->features->type >= INTUOS3S &&
> 			    wacom->features->type <= INTUOS319) {
> 				input_report_key(dev, BTN_SIDE,   data[8] & 0x40);
> 				input_report_key(dev, BTN_EXTRA,  data[8] & 0x20);
> 			}
> 
>-		} else if (wacom->features->type < INTUOS3) {
>+		} else if (wacom->features->type < INTUOS3S ||
>+			   wacom->features->type == INTUOS312 ||
>+			   wacom->features->type == INTUOS319) {
> 			/* Lens cursor packets */
> 			input_report_key(dev, BTN_LEFT,   data[8] & 0x01);
> 			input_report_key(dev, BTN_MIDDLE, data[8] & 0x02);
>@@ -774,6 +777,7 @@ static struct wacom_features wacom_featu
> 	{ "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 15, INTUOS3,    wacom_intuos_irq },
> 	{ "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 15, CINTIQ,     wacom_intuos_irq },
> 	{ "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS,     wacom_intuos_irq },
>+	{ "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S,   wacom_intuos_irq },
> 	{ }
> };
> 
>@@ -821,6 +825,7 @@ static struct usb_device_id wacom_ids[] 
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
>+	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
> 	{ }
> };
> 
>@@ -909,12 +914,14 @@ static int wacom_probe(struct usb_interf
> 		case INTUOS312:
> 		case INTUOS319:
> 		case CINTIQ:
>+			input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
>+			input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
>+			/* fall through */
>+		case INTUOS3S:
> 			input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
>-			input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
>-			input_set_abs_params(input_dev, ABS_RX, 0, 4097, 0, 0);
>-			input_set_abs_params(input_dev, ABS_RY, 0, 4097, 0, 0);
>+			input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3);
>+			input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
> 			/* fall through */
>-
> 		case INTUOS:
> 			input_dev->evbit[0] |= BIT(EV_MSC) | BIT(EV_REL);
> 			input_dev->mscbit[0] |= BIT(MSC_SERIAL);

Actions: View | Diff

Attachments on bug 370471: 314588 | 314589 | 314590