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

Commit 7e503a37 authored by Przemo Firszt's avatar Przemo Firszt Committed by Jiri Kosina
Browse files

HID: wacom: Add reporting of wheel for Intuos4 WL 



This patch adds reporting of ABS_WHEEL event. Raported walues are 0..71
and are related to absolute location of the finger on the wheel.

Signed-off-by: default avatarPrzemo Firszt <przemo@firszt.eu>
Reviewed-by: default avatarJason Gerecke <killertofu@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9a911da8

drivers/hid/hid-wacom.c

+24 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
struct wacom_data {

	__u16 tool;

	__u16 butstate;

	__u8 whlstate;

	__u8 features;

	__u32 id;

	__u32 serial;
@@ -322,6 +323,23 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata, 
			struct input_dev *input, unsigned char *data)

{

	__u16 new_butstate;

	__u8 new_whlstate;

	__u8 sync = 0;



	new_whlstate = data[1];

	if (new_whlstate != wdata->whlstate) {

		wdata->whlstate = new_whlstate;

		if (new_whlstate & 0x80) {

			input_report_key(input, BTN_TOUCH, 1);

			input_report_abs(input, ABS_WHEEL, (new_whlstate & 0x7f));

			input_report_key(input, BTN_TOOL_FINGER, 1);

		} else {

			input_report_key(input, BTN_TOUCH, 0);

			input_report_abs(input, ABS_WHEEL, 0);

			input_report_key(input, BTN_TOOL_FINGER, 0);

		}

		sync = 1;

	}



	new_butstate = (data[3] << 1) | (data[2] & 0x01);

	if (new_butstate != wdata->butstate) {
@@ -336,6 +354,10 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata, 
		input_report_key(input, BTN_7, new_butstate & 0x080);

		input_report_key(input, BTN_8, new_butstate & 0x100);

		input_report_key(input, BTN_TOOL_FINGER, 1);

		sync = 1;

	}



	if (sync) {

		input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);

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

		input_sync(input);
@@ -510,6 +532,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, 
		input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);

		break;

	case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:

		__set_bit(ABS_WHEEL, input->absbit);

		__set_bit(ABS_MISC, input->absbit);

		__set_bit(BTN_2, input->keybit);

		__set_bit(BTN_3, input->keybit);
@@ -518,6 +541,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, 
		__set_bit(BTN_6, input->keybit);

		__set_bit(BTN_7, input->keybit);

		__set_bit(BTN_8, input->keybit);

		input_set_abs_params(input, ABS_WHEEL, 0, 71, 0, 0);

		input_set_abs_params(input, ABS_X, 0, 40640, 4, 0);

		input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0);

		input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0);