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

Commit 46a709b9 authored by Bastien Nocera's avatar Bastien Nocera Committed by Jiri Kosina
Browse files

HID: Implement Wacom quirk in the kernel 



The hid-wacom driver required user-space to poke at the tablet
to make it send data about the cursor location.

This patch makes it do the same thing but in the kernel.

Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d4bfa033

drivers/hid/hid-wacom.c

+27 −0
Original line number Original line Diff line number Diff line
@@ -156,7 +156,9 @@ static int wacom_probe(struct hid_device *hdev, 
	struct hid_input *hidinput;

	struct hid_input *hidinput;

	struct input_dev *input;

	struct input_dev *input;

	struct wacom_data *wdata;

	struct wacom_data *wdata;

	char rep_data[2];

	int ret;

	int ret;

	int limit;





	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);

	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);

	if (wdata == NULL) {

	if (wdata == NULL) {
@@ -166,6 +168,7 @@ static int wacom_probe(struct hid_device *hdev, 




	hid_set_drvdata(hdev, wdata);

	hid_set_drvdata(hdev, wdata);





	/* Parse the HID report now */

	ret = hid_parse(hdev);

	ret = hid_parse(hdev);

	if (ret) {

	if (ret) {

		dev_err(&hdev->dev, "parse failed\n");

		dev_err(&hdev->dev, "parse failed\n");
@@ -178,6 +181,30 @@ static int wacom_probe(struct hid_device *hdev, 
		goto err_free;

		goto err_free;

	}

	}





	/* Set Wacom mode2 */

	rep_data[0] = 0x03; rep_data[1] = 0x00;

	limit = 3;

	do {

		ret = hdev->hid_output_raw_report(hdev, rep_data, 2,

				HID_FEATURE_REPORT);

	} while (ret < 0 && limit-- > 0);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed to poke device #1, %d\n", ret);

		goto err_free;

	}



	/* 0x06 - high reporting speed, 0x05 - low speed */

	rep_data[0] = 0x06; rep_data[1] = 0x00;

	limit = 3;

	do {

		ret = hdev->hid_output_raw_report(hdev, rep_data, 2,

				HID_FEATURE_REPORT);

	} while (ret < 0 && limit-- > 0);

	if (ret < 0) {

		dev_err(&hdev->dev, "failed to poke device #2, %d\n", ret);

		goto err_free;

	}



	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	input = hidinput->input;

	input = hidinput->input;