Commit 025bcc15 authored by Jason Gerecke's avatar Jason Gerecke Committed by Jiri Kosina
Browse files

HID: wacom: Simplify 'wacom_pl_irq' 



Unlike other IRQ functions, 'wacom_pl_irq' uses the second element of
the 'tool' array to store information about its single pen. This makes
the function more difficult to understand (since it doesn't follow the
general pattern of other IRQ functions) and prevents the possibility of
refactoring how pen state is stored.

This patch rewrites 'wacom_pl_irq' to follow the usual IRQ conventions,
including storing tool type in 'tool[0]' and implicitly tracking prox
with the 'id[0]' variable.

Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 64d0ed94

drivers/hid/wacom_wac.c

+35 −49
Original line number Diff line number Diff line
@@ -125,43 +125,34 @@ static int wacom_pl_irq(struct wacom_wac *wacom) 


	prox = data[1] & 0x40;



	if (prox) {

	if (!wacom->id[0]) {

		if ((data[0] & 0x10) || (data[4] & 0x20)) {

			wacom->tool[0] = BTN_TOOL_RUBBER;

			wacom->id[0] = ERASER_DEVICE_ID;

		pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));

		if (features->pressure_max > 255)

			pressure = (pressure << 1) | ((data[4] >> 6) & 1);

		pressure += (features->pressure_max + 1) / 2;

		}

		else {

			wacom->tool[0] = BTN_TOOL_PEN;

			wacom->id[0] = STYLUS_DEVICE_ID;

		}

	}



		/*

		 * if going from out of proximity into proximity select between the eraser

		 * and the pen based on the state of the stylus2 button, choose eraser if

		 * pressed else choose pen. if not a proximity change from out to in, send

		 * an out of proximity for previous tool then a in for new tool.

	/* If the eraser is in prox, STYLUS2 is always set. If we

	 * mis-detected the type and notice that STYLUS2 isn't set

	 * then force the eraser out of prox and let the pen in.

	 */

		if (!wacom->tool[0]) {

			/* Eraser bit set for DTF */

			if (data[1] & 0x10)

				wacom->tool[1] = BTN_TOOL_RUBBER;

			else

				/* Going into proximity select tool */

				wacom->tool[1] = (data[4] & 0x20) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;

		} else {

			/* was entered with stylus2 pressed */

			if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20)) {

				/* report out proximity for previous tool */

				input_report_key(input, wacom->tool[1], 0);

	if (wacom->tool[0] == BTN_TOOL_RUBBER && !(data[4] & 0x20)) {

		input_report_key(input, BTN_TOOL_RUBBER, 0);

		input_report_abs(input, ABS_MISC, 0);

		input_sync(input);

				wacom->tool[1] = BTN_TOOL_PEN;

				return 0;

			}

		}

		if (wacom->tool[1] != BTN_TOOL_RUBBER) {

			/* Unknown tool selected default to pen tool */

			wacom->tool[1] = BTN_TOOL_PEN;

		wacom->tool[0] = BTN_TOOL_PEN;

		wacom->id[0] = STYLUS_DEVICE_ID;

	}

		input_report_key(input, wacom->tool[1], prox); /* report in proximity for tool */

		input_report_abs(input, ABS_MISC, wacom->id[0]); /* report tool id */



	pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));

	if (features->pressure_max > 255)

		pressure = (pressure << 1) | ((data[4] >> 6) & 1);

	pressure += (features->pressure_max + 1) / 2;



	input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));

	input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));

	input_report_abs(input, ABS_PRESSURE, pressure);
@@ -169,17 +160,12 @@ static int wacom_pl_irq(struct wacom_wac *wacom) 
	input_report_key(input, BTN_TOUCH, data[4] & 0x08);

	input_report_key(input, BTN_STYLUS, data[4] & 0x10);

	/* Only allow the stylus2 button to be reported for the pen tool. */

		input_report_key(input, BTN_STYLUS2, (wacom->tool[1] == BTN_TOOL_PEN) && (data[4] & 0x20));

	} else {

		/* report proximity-out of a (valid) tool */

		if (wacom->tool[1] != BTN_TOOL_RUBBER) {

			/* Unknown tool selected default to pen tool */

			wacom->tool[1] = BTN_TOOL_PEN;

		}

		input_report_key(input, wacom->tool[1], prox);

	}

	input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));



	wacom->tool[0] = prox; /* Save proximity state */

	if (!prox)

		wacom->id[0] = 0;

	input_report_key(input, wacom->tool[0], prox);

	input_report_abs(input, ABS_MISC, wacom->id[0]);

	return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE