[Linuxwacom-devel] [input-wacom PATCH 10/10] Declare ABS_X and ABS_Y for all device types on 2.6.38

[Jason G. <kil...@gm...>]

Devices capable of >2 touches were not declaring support for the ABS_X
and ABS_Y axes despite using pointer emulation. The 3.7+ kernel already
takes care of this for us (so there's no need to forward-port these
changes), but we need to be sure that they are declared under 2.6.38+
lest xf86-input-wacom ignore the device.
---
 2.6.38/wacom_wac.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 3185274..9c84b55 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -1512,29 +1512,18 @@ static void wacom_abs_set_axis(struct input_dev *input_dev,
 {
 	struct wacom_features *features = &wacom_wac->features;
 
+	input_set_abs_params(input_dev, ABS_X, 0, features->x_max,
+	                     features->x_fuzz, 0);
+	input_set_abs_params(input_dev, ABS_Y, 0, features->y_max,
+	                     features->y_fuzz, 0);
+
+	input_abs_set_res(input_dev, ABS_X, features->x_resolution);
+	input_abs_set_res(input_dev, ABS_Y, features->y_resolution);
+
 	if (features->device_type == BTN_TOOL_PEN) {
-		input_set_abs_params(input_dev, ABS_X, 0, features->x_max,
-				     features->x_fuzz, 0);
-		input_set_abs_params(input_dev, ABS_Y, 0, features->y_max,
-				     features->y_fuzz, 0);
 		input_set_abs_params(input_dev, ABS_PRESSURE, 0,
 			features->pressure_max, features->pressure_fuzz, 0);
-
-		/* penabled devices have fixed resolution for each model */
-		input_abs_set_res(input_dev, ABS_X, features->x_resolution);
-		input_abs_set_res(input_dev, ABS_Y, features->y_resolution);
 	} else {
-		if (features->touch_max <= 2) {
-			input_set_abs_params(input_dev, ABS_X, 0,
-				features->x_max, features->x_fuzz, 0);
-			input_set_abs_params(input_dev, ABS_Y, 0,
-				features->y_max, features->y_fuzz, 0);
-			input_abs_set_res(input_dev, ABS_X,
-				features->x_resolution);
-			input_abs_set_res(input_dev, ABS_Y,
-				features->y_resolution);
-		}
-
 		if (features->touch_max > 1) {
 			input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0,
 				features->x_max, features->x_fuzz, 0);
-- 
1.8.4