Attachment 161887 Details for Bug 253088 – test patch

[patch] test patch

rhel4-add_support_to_intuos3_4x5.patch (text/plain), 11.20 KB, created by Aristeu Rozanski on 2007-08-20 14:55:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aristeu Rozanski

Created: 2007-08-20 14:55:41 UTC

Size: 11.20 KB

patch

obsolete

>Index: tree/drivers/usb/input/wacom.c
>===================================================================
>--- tree.orig/drivers/usb/input/wacom.c
>+++ tree/drivers/usb/input/wacom.c
>@@ -83,6 +83,21 @@ MODULE_LICENSE(DRIVER_LICENSE);
> 
> #define USB_VENDOR_ID_WACOM	0x056a
> 
>+enum {
>+	PENPARTNER = 0,
>+	GRAPHIRE,
>+	WACOM_G4,
>+	PTU,
>+	PL,
>+	INTUOS,
>+	INTUOS3S,
>+	INTUOS3,
>+	INTUOSL,
>+	CINTIQ,
>+	WACOM_MO,
>+	MAX_TYPE,
>+};
>+
> struct wacom_features {
> 	char *name;
> 	int pktlen;
>@@ -362,7 +377,7 @@ static void wacom_graphire_irq(struct ur
> 
> 		case 2: /* Mouse with wheel */
> 			input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
>-			if (wacom->features->type == 6) {
>+			if (wacom->features->type == WACOM_G4) {
> 				rw = data[7] & 0x04 ? (data[7] & 0x03)-4 : (data[7] & 0x03);
> 				input_report_rel(dev, REL_WHEEL, -rw);
> 			} else
>@@ -373,7 +388,7 @@ static void wacom_graphire_irq(struct ur
> 			input_report_key(dev, BTN_TOOL_MOUSE, data[7] > 24);
> 			input_report_key(dev, BTN_LEFT, data[1] & 0x01);
> 			input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
>-			if (wacom->features->type == 6)
>+			if (wacom->features->type == WACOM_G4)
> 				input_report_abs(dev, ABS_DISTANCE, data[6] & 0x3f);
> 			else
> 				input_report_abs(dev, ABS_DISTANCE, data[7]);
>@@ -397,7 +412,7 @@ static void wacom_graphire_irq(struct ur
> 	input_sync(dev);
> 
> 	/* send pad data */
>-	if (wacom->features->type == 6) {
>+	if (wacom->features->type == WACOM_G4) {
> 		if ((wacom->serial[1] & 0xc0) != (data[7] & 0xf8)) {
> 			wacom->id[1] = 1;
> 			wacom->serial[1] = (data[7] & 0xf8);
>@@ -574,11 +589,11 @@ static void wacom_intuos_irq(struct urb 
> 	if (wacom_intuos_inout(urb)) goto exit;
> 
> 	/* Cintiq doesn't send data when RDY bit isn't set */
>-	if (wacom->features->type == 5 && !(data[1] & 0x40))
>+	if (wacom->features->type == CINTIQ && !(data[1] & 0x40))
> 		goto exit;
> 
> 	/* Intuos3* and Cintiq have more than 16 bits for each axis */
>-	if (wacom->features->type == 4 || wacom->features->type == 5) {
>+	if (wacom->features->type == INTUOS3 || wacom->features->type == CINTIQ) {
> 		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));
>@@ -746,47 +761,48 @@ exit:
> }
> 
> static struct wacom_features wacom_features[] = {
>-	{ "Wacom Penpartner",    7,   5040,  3780,  255, 32, 0, wacom_penpartner_irq },
>-        { "Wacom Graphire",      8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
>- 	{ "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Graphire3 4x5", 8,  10208,  7424,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 32, 6, wacom_graphire_irq },
>-	{ "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 32, 6, wacom_graphire_irq },
>-  	{ "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 15, 2, wacom_intuos_irq },
>- 	{ "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 15, 2, wacom_intuos_irq },
>- 	{ "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 15, 2, wacom_intuos_irq },
>- 	{ "Wacom Intuos 12x12", 10,  30480, 31680, 1023, 15, 2, wacom_intuos_irq },
>- 	{ "Wacom Intuos 12x18", 10,  45720, 31680, 1023, 15, 2, wacom_intuos_irq },
>- 	{ "Wacom PL400",         8,   5408,  4056,  255, 32, 3, wacom_pl_irq },
>- 	{ "Wacom PL500",         8,   6144,  4608,  255, 32, 3, wacom_pl_irq },
>- 	{ "Wacom PL600",         8,   6126,  4604,  255, 32, 3, wacom_pl_irq },
>- 	{ "Wacom PL600SX",       8,   6260,  5016,  255, 32, 3, wacom_pl_irq },
>- 	{ "Wacom PL550",         8,   6144,  4608,  511, 32, 3, wacom_pl_irq },
>- 	{ "Wacom PL800",         8,   7220,  5780,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom PL700",         8,   6758,  5406,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom PL510",         8,   6282,  4762,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom DTU710",        8,  34080, 27660,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom DTF521",        8,   6282,  4762,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom DTF720",        8,   6858,  5506,  511, 32, 3, wacom_pl_irq },
>-	{ "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 15, 2, wacom_intuos_irq },
>-	{ "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, 2, wacom_intuos_irq },
>-	{ "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 15, 2, wacom_intuos_irq },
>-	{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, 2, wacom_intuos_irq },
>-	{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, 2, wacom_intuos_irq },
>-	{ "Wacom Volito",        8,   5104,  3712,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom PenStation2",   8,   3250,  2320,  255, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Volito2 4x5",   8,   5104,  3712,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Volito2 2x3",   8,   3248,  2320,  511, 32, 1, wacom_graphire_irq },
>-	{ "Wacom PenPartner2",   8,   3250,  2320,  255, 32, 1, wacom_graphire_irq },
>-	{ "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, 3, wacom_ptu_irq },
>-	{ "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 15, 4, wacom_intuos3_irq },
>-	{ "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 15, 4, wacom_intuos3_irq },
>-	{ "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 15, 4, wacom_intuos3_irq },
>-	{ "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 15, 4, wacom_intuos3_irq },
>-	{ "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 15, 5, wacom_intuos_irq },
>-	{ "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, 2, wacom_intuos_irq },
>+	{ "Wacom Penpartner",    7,   5040,  3780,  255, 32, PENPARTNER, wacom_penpartner_irq },
>+        { "Wacom Graphire",      8,  10206,  7422,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+ 	{ "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Graphire3 4x5", 8,  10208,  7424,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 32, WACOM_G4, wacom_graphire_irq },
>+	{ "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 32, WACOM_G4, wacom_graphire_irq },
>+  	{ "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 15, INTUOS, wacom_intuos_irq },
>+ 	{ "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 15, INTUOS, wacom_intuos_irq },
>+ 	{ "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 15, INTUOS, wacom_intuos_irq },
>+ 	{ "Wacom Intuos 12x12", 10,  30480, 31680, 1023, 15, INTUOS, wacom_intuos_irq },
>+ 	{ "Wacom Intuos 12x18", 10,  45720, 31680, 1023, 15, INTUOS, wacom_intuos_irq },
>+ 	{ "Wacom PL400",         8,   5408,  4056,  255, 32, PL, wacom_pl_irq },
>+ 	{ "Wacom PL500",         8,   6144,  4608,  255, 32, PL, wacom_pl_irq },
>+ 	{ "Wacom PL600",         8,   6126,  4604,  255, 32, PL, wacom_pl_irq },
>+ 	{ "Wacom PL600SX",       8,   6260,  5016,  255, 32, PL, wacom_pl_irq },
>+ 	{ "Wacom PL550",         8,   6144,  4608,  511, 32, PL, wacom_pl_irq },
>+ 	{ "Wacom PL800",         8,   7220,  5780,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom PL700",         8,   6758,  5406,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom PL510",         8,   6282,  4762,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom DTU710",        8,  34080, 27660,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom DTF521",        8,   6282,  4762,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom DTF720",        8,   6858,  5506,  511, 32, PL, wacom_pl_irq },
>+	{ "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 15, INTUOS, wacom_intuos_irq },
>+	{ "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS, wacom_intuos_irq },
>+	{ "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 15, INTUOS, wacom_intuos_irq },
>+	{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, INTUOS, wacom_intuos_irq },
>+	{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, INTUOS, wacom_intuos_irq },
>+	{ "Wacom Volito",        8,   5104,  3712,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom PenStation2",   8,   3250,  2320,  255, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Volito2 4x5",   8,   5104,  3712,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Volito2 2x3",   8,   3248,  2320,  511, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom PenPartner2",   8,   3250,  2320,  255, 32, GRAPHIRE, wacom_graphire_irq },
>+	{ "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, PTU, wacom_ptu_irq },
>+	{ "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 15, INTUOS3, wacom_intuos3_irq },
>+	{ "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 15, INTUOS3S, wacom_intuos3_irq },
>+	{ "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 15, INTUOS3, wacom_intuos3_irq },
>+	{ "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 15, INTUOS3, wacom_intuos3_irq },
>+	{ "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 15, INTUOS3, wacom_intuos3_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 },
>  	{ }
> };
> 
>@@ -830,6 +846,7 @@ static struct usb_device_id wacom_ids[] 
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB2) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
>+	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
> 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
> 	{ }
>@@ -893,7 +910,7 @@ static int wacom_probe(struct usb_interf
> 	wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) | BIT(BTN_TOUCH) | BIT(BTN_STYLUS);
> 
> 	switch (wacom->features->type) {
>-		case 6:
>+		case WACOM_G4:
> 			wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
> 			wacom->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) |
> 			BIT(BTN_1) |
>@@ -904,7 +921,7 @@ static int wacom_probe(struct usb_interf
> 			BIT(BTN_6) |
> 			BIT(BTN_7);
> 			/* fall through */
>-		case 1:
>+		case GRAPHIRE:
> 			wacom->dev.evbit[0] |= BIT(EV_REL);
> 			wacom->dev.relbit[0] |= BIT(REL_WHEEL);
> 			wacom->dev.absbit[0] |= BIT(ABS_DISTANCE);
>@@ -912,14 +929,19 @@ static int wacom_probe(struct usb_interf
>  			wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_RUBBER) | BIT(BTN_TOOL_MOUSE) | BIT(BTN_STYLUS2);
> 			break;
> 
>-		case 4: /* new functions for Intuos3 */
>-		case 5: /* cintiq */
>+		case INTUOS3: /* new functions for Intuos3 */
>+		case CINTIQ: /* cintiq */
> 			wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
>-			wacom->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);
>-			wacom->dev.absbit[0] |= BIT(ABS_RX) | BIT(ABS_RY);
>+			wacom->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
>+			wacom->dev.absbit[0] |= BIT(ABS_RY);
>+			/* fall through */
>+
>+		case INTUOS3S:
>+			wacom->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3);
>+			wacom->dev.absbit[0] |= BIT(ABS_RX);
> 			/* fall through */
> 
>-		case 2:
>+		case INTUOS:
> 			wacom->dev.evbit[0] |= BIT(EV_MSC) | BIT(EV_REL);
> 			wacom->dev.mscbit[0] |= BIT(MSC_SERIAL);
> 			wacom->dev.relbit[0] |= BIT(REL_WHEEL);
>@@ -929,7 +951,8 @@ static int wacom_probe(struct usb_interf
> 			wacom->dev.absbit[0] |= BIT(ABS_DISTANCE) | BIT(ABS_WHEEL) | BIT(ABS_TILT_X) | BIT(ABS_TILT_Y) | BIT(ABS_RZ) | BIT(ABS_THROTTLE);
> 			break;
> 
>-		case 3:
>+		case PL:
>+		case PTU:
>  			wacom->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_STYLUS2) | BIT(BTN_TOOL_RUBBER);
> 			break;
> 	}

Actions: View | Diff

Attachments on bug 253088: 161887 | 299057