redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

HID: wacom: retrieve name from HID descriptor for generic devices 

HID generic devices share the same default name, "Wacom HID". This
causes userland programs to show same device names for different
devices, which would confuse end users with same device names for
different devices too.

This patch uses name retrieved from HID descriptor, if a meaningful
name is reported. Otherwise, affix its product ID to "Wacom HID".

Names from descriptor may contain extra whitespaces. To comfort
readers' eyes, we removed those extra whitespaces too.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
hifive-unleashed-5.1
Ping Cheng 2015-04-24 15:32:51 -07:00 committed by Jiri Kosina
parent 007760cf08
commit c24eab4e0e
1 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/hid/wacom_sys.c
View File

@ -1402,6 +1402,52 @@ static size_t wacom_compute_pktlen(struct hid_device *hdev)
return size;
}
static void wacom_update_name(struct wacom *wacom)
{
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
struct wacom_features *features = &wacom_wac->features;
/* Generic devices name unspecified */
if ((features->type == HID_GENERIC) && !strcmp("Wacom HID", features->name)) {
if (strstr(wacom->hdev->name, "Wacom") ||
strstr(wacom->hdev->name, "wacom") ||
strstr(wacom->hdev->name, "WACOM")) {
/* name is in HID descriptor, use it */
strlcpy(wacom_wac->name, wacom->hdev->name,
sizeof(wacom_wac->name));
/* strip out excess whitespaces */
while (1) {
char *gap = strstr(wacom_wac->name, " ");
if (gap == NULL)
break;
/* shift everything including the terminator */
memmove(gap, gap+1, strlen(gap));
}
/* get rid of trailing whitespace */
if (wacom_wac->name[strlen(wacom_wac->name)-1] == ' ')
wacom_wac->name[strlen(wacom_wac->name)-1] = '\0';
} else {
/* no meaningful name retrieved. use product ID */
snprintf(wacom_wac->name, sizeof(wacom_wac->name),
"%s %X", features->name, wacom->hdev->product);
}
} else {
strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
}
/* Append the device type to the name */
snprintf(wacom_wac->pad_name, sizeof(wacom_wac->pad_name),
"%s Pad", wacom_wac->name);
if (features->device_type != BTN_TOOL_FINGER)
strlcat(wacom_wac->name, " Pen", WACOM_NAME_MAX);
else if (features->touch_max)
strlcat(wacom_wac->name, " Finger", WACOM_NAME_MAX);
else
strlcat(wacom_wac->name, " Pad", WACOM_NAME_MAX);
}
static int wacom_probe(struct hid_device *hdev,
const struct hid_device_id *id)
{
@ -1484,17 +1530,7 @@ static int wacom_probe(struct hid_device *hdev,
wacom_setup_device_quirks(wacom);
wacom_calculate_res(features);
strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
snprintf(wacom_wac->pad_name, sizeof(wacom_wac->pad_name),
"%s Pad", features->name);
/* Append the device type to the name */
if (features->device_type != BTN_TOOL_FINGER)
strlcat(wacom_wac->name, " Pen", WACOM_NAME_MAX);
else if (features->touch_max)
strlcat(wacom_wac->name, " Finger", WACOM_NAME_MAX);
else
strlcat(wacom_wac->name, " Pad", WACOM_NAME_MAX);
wacom_update_name(wacom);
error = wacom_add_shared_data(hdev);
if (error)