Attachment 619427 Details for Bug 847570 – Fixes from 3.6.0-rc2 to restore wacom touch screen functionality in 3.5

[patch] Fixes from 3.6.0-rc2 to restore wacom touch screen functionality in 3.5

linux-3.5.fc17-wacom_touchscreen.patch (text/plain), 1.51 KB, created by Jeremy Uchitel on 2012-09-30 12:47:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Uchitel

Created: 2012-09-30 12:47:39 UTC

Size: 1.51 KB

patch

obsolete

>diff -uNrp a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
>--- a/drivers/input/tablet/wacom_sys.c	2012-09-29 13:43:57.363705894 -0400
>+++ b/drivers/input/tablet/wacom_sys.c	2012-09-29 13:49:22.847618972 -0400
>@@ -445,8 +445,7 @@ static int wacom_query_tablet_data(struc
> 	/* ask to report Wacom data */
> 	if (features->device_type == BTN_TOOL_FINGER) {
> 		/* if it is an MT Tablet PC touch */
>-		if (features->type == TABLETPC2FG ||
>-		    features->type == MTSCREEN) {
>+		if (features->type > TABLETPC) {
> 			do {
> 				rep_data[0] = 3;
> 				rep_data[1] = 4;
>@@ -465,7 +464,7 @@ static int wacom_query_tablet_data(struc
> 			} while ((error < 0 || rep_data[1] != 4) &&
> 				 limit++ < WAC_MSG_RETRIES);
> 		}
>-	} else if (features->type != TABLETPC &&
>+	} else if (features->type <= BAMBOO_PT &&
> 		   features->type != WIRELESS &&
> 		   features->device_type == BTN_TOOL_PEN) {
> 		do {
>@@ -509,16 +508,13 @@ static int wacom_retrieve_hid_descriptor
> 		if (intf->cur_altsetting->desc.bInterfaceNumber == 0) {
> 			features->device_type = 0;
> 		} else if (intf->cur_altsetting->desc.bInterfaceNumber == 2) {
>-			features->device_type = BTN_TOOL_DOUBLETAP;
>+			features->device_type = BTN_TOOL_FINGER;
> 			features->pktlen = WACOM_PKGLEN_BBTOUCH3;
> 		}
> 	}
> 
> 	/* only devices that support touch need to retrieve the info */
>-	if (features->type != TABLETPC &&
>-	    features->type != TABLETPC2FG &&
>-	    features->type != BAMBOO_PT &&
>-	    features->type != MTSCREEN) {
>+	if (features->type < BAMBOO_PT) {
> 		goto out;
> 	}
>

Actions: View | Diff

Attachments on bug 847570: 603838 | 603839 | 619427