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

Commit 4082da80 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: wacom: generic: add mode change touch key 



Wacom Cintiq Pro added a touch key to switch the tablet between
display and opaque mode. This patch informs the change by removing
the old devices and creating new ones with proper properties.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarPing Cheng <ping.cheng@wacom.com>
Tested-by: default avatarAaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 4eb220cb

drivers/hid/wacom.h

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ enum wacom_worker { 
	WACOM_WORKER_WIRELESS,

	WACOM_WORKER_BATTERY,

	WACOM_WORKER_REMOTE,

	WACOM_WORKER_MODE_CHANGE,

};



struct wacom;
@@ -167,6 +168,7 @@ struct wacom { 
	struct work_struct remote_work;

	struct delayed_work init_work;

	struct wacom_remote *remote;

	struct work_struct mode_change_work;

	bool generic_has_leds;

	struct wacom_leds {

		struct wacom_group_leds *groups;
@@ -196,6 +198,9 @@ static inline void wacom_schedule_work(struct wacom_wac *wacom_wac, 
	case WACOM_WORKER_REMOTE:

		schedule_work(&wacom->remote_work);

		break;

	case WACOM_WORKER_MODE_CHANGE:

		schedule_work(&wacom->mode_change_work);

		break;

	}

}

drivers/hid/wacom_sys.c

+49 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ static void wacom_post_parse_hid(struct hid_device *hdev, 


	if (features->type == HID_GENERIC) {

		/* Any last-minute generic device setup */

		if (wacom_wac->has_mode_change) {

			if (wacom_wac->is_direct_mode)

				features->device_type |= WACOM_DEVICETYPE_DIRECT;

			else

				features->device_type &= ~WACOM_DEVICETYPE_DIRECT;

		}



		if (features->touch_max > 1) {

			if (features->device_type & WACOM_DEVICETYPE_DIRECT)

				input_mt_init_slots(wacom_wac->touch_input,
@@ -2488,6 +2495,46 @@ static void wacom_remote_work(struct work_struct *work) 
	}

}



static void wacom_mode_change_work(struct work_struct *work)

{

	struct wacom *wacom = container_of(work, struct wacom, mode_change_work);

	struct wacom_shared *shared = wacom->wacom_wac.shared;

	struct wacom *wacom1 = NULL;

	struct wacom *wacom2 = NULL;

	bool is_direct = wacom->wacom_wac.is_direct_mode;

	int error = 0;



	if (shared->pen) {

		wacom1 = hid_get_drvdata(shared->pen);

		wacom_release_resources(wacom1);

		hid_hw_stop(wacom1->hdev);

		wacom1->wacom_wac.has_mode_change = true;

		wacom1->wacom_wac.is_direct_mode = is_direct;

	}



	if (shared->touch) {

		wacom2 = hid_get_drvdata(shared->touch);

		wacom_release_resources(wacom2);

		hid_hw_stop(wacom2->hdev);

		wacom2->wacom_wac.has_mode_change = true;

		wacom2->wacom_wac.is_direct_mode = is_direct;

	}



	if (wacom1) {

		error = wacom_parse_and_register(wacom1, false);

		if (error)

			return;

	}



	if (wacom2) {

		error = wacom_parse_and_register(wacom2, false);

		if (error)

			return;

	}



	return;

}



static int wacom_probe(struct hid_device *hdev,

		const struct hid_device_id *id)

{
@@ -2532,6 +2579,7 @@ static int wacom_probe(struct hid_device *hdev, 
	INIT_WORK(&wacom->wireless_work, wacom_wireless_work);

	INIT_WORK(&wacom->battery_work, wacom_battery_work);

	INIT_WORK(&wacom->remote_work, wacom_remote_work);

	INIT_WORK(&wacom->mode_change_work, wacom_mode_change_work);



	/* ask for the report descriptor to be loaded by HID */

	error = hid_parse(hdev);
@@ -2574,6 +2622,7 @@ static void wacom_remove(struct hid_device *hdev) 
	cancel_work_sync(&wacom->wireless_work);

	cancel_work_sync(&wacom->battery_work);

	cancel_work_sync(&wacom->remote_work);

	cancel_work_sync(&wacom->mode_change_work);

	if (hdev->bus == BUS_BLUETOOTH)

		device_remove_file(&hdev->dev, &dev_attr_speed);

drivers/hid/wacom_wac.c

+16 −1
Original line number Diff line number Diff line
@@ -1780,6 +1780,14 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, 
		wacom_map_usage(input, usage, field, EV_KEY, KEY_CONTROLPANEL, 0);

		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	case WACOM_HID_WD_MODE_CHANGE:

		/* do not overwrite previous data */

		if (!wacom_wac->has_mode_change) {

			wacom_wac->has_mode_change = true;

			wacom_wac->is_direct_mode = true;

		}

		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	}



	switch (equivalent_usage & 0xfffffff0) {
@@ -1828,7 +1836,7 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field 
	 * Avoid reporting this event and setting inrange_state if this usage

	 * hasn't been mapped.

	 */

	if (!usage->type)

	if (!usage->type && equivalent_usage != WACOM_HID_WD_MODE_CHANGE)

		return;



	if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) {
@@ -1850,6 +1858,13 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field 
		}

		break;



	case WACOM_HID_WD_MODE_CHANGE:

		if (wacom_wac->is_direct_mode != value) {

			wacom_wac->is_direct_mode = value;

			wacom_schedule_work(&wacom->wacom_wac, WACOM_WORKER_MODE_CHANGE);

		}

		break;



	case WACOM_HID_WD_BUTTONCENTER:

		for (i = 0; i < wacom->led.count; i++)

			wacom_update_led(wacom, features->numbered_buttons,

drivers/hid/wacom_wac.h

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
#define WACOM_HID_WD_BATTERY_LEVEL      (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)

#define WACOM_HID_WD_EXPRESSKEY00       (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)

#define WACOM_HID_WD_EXPRESSKEYCAP00    (WACOM_HID_UP_WACOMDIGITIZER | 0x0950)

#define WACOM_HID_WD_MODE_CHANGE        (WACOM_HID_UP_WACOMDIGITIZER | 0x0980)

#define WACOM_HID_WD_CONTROLPANEL       (WACOM_HID_UP_WACOMDIGITIZER | 0x0982)

#define WACOM_HID_WD_ONSCREEN_KEYBOARD  (WACOM_HID_UP_WACOMDIGITIZER | 0x0983)

#define WACOM_HID_WD_BUTTONCONFIG       (WACOM_HID_UP_WACOMDIGITIZER | 0x0986)
@@ -330,6 +331,9 @@ struct wacom_wac { 
	int mode_value;

	struct hid_data hid_data;

	bool has_mute_touch_switch;

	bool has_mode_change;

	bool is_direct_mode;



};



#endif