Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 422b0314 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Dmitry Torokhov
Browse files

Input: wacom - split out the pad device for DTUS 



MSC_SERIAL can be safely removed from the pad device.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: default avatarPing Cheng <pingc@wacom.com>
Reviewed-by: default avatarJason Gerecke <killertofu@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 3116871f

drivers/input/tablet/wacom_wac.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -217,17 +217,13 @@ static int wacom_dtus_irq(struct wacom_wac *wacom) 
			"%s: received unknown report #%d", __func__, data[0]);

			"%s: received unknown report #%d", __func__, data[0]);

		return 0;

		return 0;

	} else if (data[0] == WACOM_REPORT_DTUSPAD) {

	} else if (data[0] == WACOM_REPORT_DTUSPAD) {

		input = wacom->pad_input;

		input_report_key(input, BTN_0, (data[1] & 0x01));

		input_report_key(input, BTN_0, (data[1] & 0x01));

		input_report_key(input, BTN_1, (data[1] & 0x02));

		input_report_key(input, BTN_1, (data[1] & 0x02));

		input_report_key(input, BTN_2, (data[1] & 0x04));

		input_report_key(input, BTN_2, (data[1] & 0x04));

		input_report_key(input, BTN_3, (data[1] & 0x08));

		input_report_key(input, BTN_3, (data[1] & 0x08));

		input_report_abs(input, ABS_MISC,

		input_report_abs(input, ABS_MISC,

				 data[1] & 0x0f ? PAD_DEVICE_ID : 0);

				 data[1] & 0x0f ? PAD_DEVICE_ID : 0);

		/*

		 * Serial number is required when expresskeys are

		 * reported through pen interface.

		 */

		input_event(input, EV_MSC, MSC_SERIAL, 0xf0);

		return 1;

		return 1;

	} else {

	} else {

		prox = data[1] & 0x80;

		prox = data[1] & 0x80;
@@ -257,7 +253,6 @@ static int wacom_dtus_irq(struct wacom_wac *wacom) 
			wacom->id[0] = 0;

			wacom->id[0] = 0;

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

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

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

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

		input_event(input, EV_MSC, MSC_SERIAL, 1);

		return 1;

		return 1;

	}

	}

}

}
@@ -1615,7 +1610,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, 
				   struct wacom_wac *wacom_wac)

				   struct wacom_wac *wacom_wac)

{

{

	struct wacom_features *features = &wacom_wac->features;

	struct wacom_features *features = &wacom_wac->features;

	int i;





	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
@@ -1765,11 +1759,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, 
	case DTUS:

	case DTUS:

	case PL:

	case PL:

	case DTU:

	case DTU:

		if (features->type == DTUS) {

			input_set_capability(input_dev, EV_MSC, MSC_SERIAL);

			for (i = 0; i < 4; i++)

				__set_bit(BTN_0 + i, input_dev->keybit);

		}

		__set_bit(BTN_TOOL_PEN, input_dev->keybit);

		__set_bit(BTN_TOOL_PEN, input_dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);
@@ -1985,6 +1974,11 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 




		break;

		break;





	case DTUS:

		for (i = 0; i < 4; i++)

			__set_bit(BTN_0 + i, input_dev->keybit);

		break;



	case INTUOSHT:

	case INTUOSHT:

	case BAMBOO_PT:

	case BAMBOO_PT:

		/* pad device is on the touch interface */

		/* pad device is on the touch interface */