Commit 12969e3b authored Sep 11, 2014 by Benjamin Tissoires Committed by Jiri Kosina Sep 12, 2014

HID: wacom: make the WL connection friendly for the desktop



Currently, tablets connected to the WL receiver all share the same
VID/PID. There is no way for the user space to know which one is which
besides parsing the name. We can force the PID to be set to the
actual hardware. This way, the input device will have the correct PID
which can be match in libwacom.

With only this trick, the pad input does not inherit the ID_INPUT_TABLET
udev property from its parent. We can force udev to accept it by declaring
a BTN_STYLUS which is never used.

This way, tablets connected through WL can be used from the user point of
view in the same way they are used while connected through wire.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 912ca216

drivers/hid/wacom_sys.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1035,7 +1035,7 @@ static struct input_dev wacom_allocate_input(struct wacom wacom)
		input_dev->uniq = hdev->uniq;
		input_dev->id.bustype = hdev->bus;
		input_dev->id.vendor = hdev->vendor;
		input_dev->id.product = hdev->product;
		input_dev->id.product = wacom_wac->pid ? wacom_wac->pid : hdev->product;
		input_dev->id.version = hdev->version;
		input_set_drvdata(input_dev, wacom);

drivers/hid/wacom_wac.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1990,6 +1990,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
		input_set_abs_params(input_dev, ABS_X, 0, 1, 0, 0);
		input_set_abs_params(input_dev, ABS_Y, 0, 1, 0, 0);

		/* kept for making udev and libwacom accepting the pad */
		__set_bit(BTN_STYLUS, input_dev->keybit);

		switch (features->type) {
		case GRAPHIRE_BT:
		__set_bit(BTN_0, input_dev->keybit);

Admin message