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

Commit 49b764ae authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - add device type to device name string 



Devices supporting both pen and touch features share the same product ID,
but presented as 2 separate input devices. By adding device type to device
name string we can help userspace applications and users differentiate
between them. 'Finger' is used for the touch since touch has been used as
a suffix by userland hotplugging services.

Signed-off-by: default avatarJason Childs <oblivian@users.sourceforge.net>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 23c239be

drivers/input/tablet/wacom_sys.c

+11 −1
Original line number Diff line number Diff line
@@ -592,7 +592,17 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
	if (error)

		goto fail2;



	input_dev->name = features->name;

	strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));



	if (features->type == TABLETPC || features->type == TABLETPC2FG) {

		/* Append the device type to the name */

		strlcat(wacom_wac->name,

			features->device_type == BTN_TOOL_PEN ?

				" Pen" : " Finger",

			sizeof(wacom_wac->name));

	}



	input_dev->name = wacom_wac->name;

	wacom->wacom_wac = wacom_wac;



	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

drivers/input/tablet/wacom_wac.h

+4 −3
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct wacom_features { 
};



struct wacom_wac {

	char name[64];

	unsigned char *data;

	int tool[2];

	int id[2];