# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.582 -> 1.583
# drivers/usb/wacom.c 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/06/10 [EMAIL PROTECTED] 1.583
# [PATCH] Fix for Intuos tablet in wacom.c
#
# When you removed the smoothing algorithm you forgot to make
# the change my previous patch fixed. Anyway, I took a look at the code
# and found that it could be cleaned up a little.
# This patch works for me, but I can only test it with an Intuos tablet
# although it should not break anything.
# --------------------------------------------
#
diff -Nru a/drivers/usb/wacom.c b/drivers/usb/wacom.c
--- a/drivers/usb/wacom.c Mon Jun 10 15:26:59 2002
+++ b/drivers/usb/wacom.c Mon Jun 10 15:26:59 2002
@@ -111,7 +111,6 @@
struct wacom_features *features;
int tool[2];
int open;
- int x, y;
__u32 serial[2];
};
@@ -209,16 +208,16 @@
input_report_abs(dev, ABS_DISTANCE, data[7]);
input_report_rel(dev, REL_WHEEL, (signed char) data[6]);
- input_report_abs(dev, ABS_X, wacom->x = x);
- input_report_abs(dev, ABS_Y, wacom->y = y);
+ input_report_abs(dev, ABS_X, x);
+ input_report_abs(dev, ABS_Y, y);
input_event(dev, EV_MSC, MSC_SERIAL, data[1] & 0x01);
return;
}
if (data[1] & 0x80) {
- input_report_abs(dev, ABS_X, wacom->x = x);
- input_report_abs(dev, ABS_Y, wacom->y = y);
+ input_report_abs(dev, ABS_X, x);
+ input_report_abs(dev, ABS_Y, y);
}
input_report_abs(dev, ABS_PRESSURE, data[6] | ((__u32)data[7] << 8));
@@ -236,7 +235,6 @@
struct input_dev *dev = &wacom->dev;
unsigned int t;
int idx;
- int x, y;
if (urb->status) return;
@@ -285,11 +283,8 @@
return;
}
- x = ((__u32)data[2] << 8) | data[3];
- y = ((__u32)data[4] << 8) | data[5];
-
- input_report_abs(dev, ABS_X, wacom->x);
- input_report_abs(dev, ABS_Y, wacom->y);
+ input_report_abs(dev, ABS_X, ((__u32)data[2] << 8) | data[3]);
+ input_report_abs(dev, ABS_Y, ((__u32)data[4] << 8) | data[5]);
input_report_abs(dev, ABS_DISTANCE, data[9] >> 4);
if ((data[1] & 0xb8) == 0xa0) { /*
general pen packet */
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -
http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
