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

Commit 60a22186 authored by Aaron Armstrong Skomra's avatar Aaron Armstrong Skomra Committed by Jiri Kosina
Browse files

HID: wacom: generic: add support for touchring 



Add support for the touchring to the generic code path in support of the second
generation Intuos Pro.

We also add checks for usage->type to ensure that we handle the usage before we
report it, or change the inrange_state based on it.

Signed-off-by: default avatarAaron Skomra <aaron.skomra@wacom.com>
Reviewed-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 65ef4c1e

drivers/hid/wacom_wac.c

+18 −1
Original line number Diff line number Diff line
@@ -1733,6 +1733,10 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, 
		wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);

		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	case WACOM_HID_WD_TOUCHRINGSTATUS:

		wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);

		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	}



	switch (equivalent_usage & 0xfffffff0) {
@@ -1775,12 +1779,22 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field 
	struct input_dev *input = wacom_wac->pad_input;

	unsigned equivalent_usage = wacom_equivalent_usage(usage->hid);



	/*

	 * Avoid reporting this event and setting inrange_state if this usage

	 * hasn't been mapped.

	 */

	if (!usage->type)

		return;



	if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) {

		if (usage->hid != WACOM_HID_WD_TOUCHRING)

			wacom_wac->hid_data.inrange_state |= value;

	}



	switch (equivalent_usage) {

	case WACOM_HID_WD_TOUCHRINGSTATUS:

		if (!value)

			input_event(input, usage->type, usage->code, 0);

		break;



	default:
@@ -2288,6 +2302,9 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field, 
	if (wacom->wacom_wac.features.type != HID_GENERIC)

		return;



	if (value > field->logical_maximum || value < field->logical_minimum)

		return;



	if (WACOM_PAD_FIELD(field)) {

		wacom_wac_pad_battery_event(hdev, field, usage, value);

		if (wacom->wacom_wac.pad_input)