mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
HID: logitech-hidpp: prefix the name with "Logitech"
Current names are reported as "K750", "M705", and it can be misleading for the users when they look at their input device list. Prefixing the names with "Logitech " makes things better. Signed-off-by: Benjamin Tissoires <[email protected]> Reviewed-by: Peter Wu <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
This commit is contained in:
parent
bf15944753
commit
b1ac9487c8
1 changed files with 34 additions and 0 deletions
|
|
@ -282,6 +282,33 @@ static inline bool hidpp_report_is_connect_event(struct hidpp_report *report)
|
|||
(report->rap.sub_id == 0x41);
|
||||
}
|
||||
|
||||
/**
|
||||
* hidpp_prefix_name() prefixes the current given name with "Logitech ".
|
||||
*/
|
||||
static void hidpp_prefix_name(char **name, int name_length)
|
||||
{
|
||||
#define PREFIX_LENGTH 9 /* "Logitech " */
|
||||
|
||||
int new_length;
|
||||
char *new_name;
|
||||
|
||||
if (name_length > PREFIX_LENGTH &&
|
||||
strncmp(*name, "Logitech ", PREFIX_LENGTH) == 0)
|
||||
/* The prefix has is already in the name */
|
||||
return;
|
||||
|
||||
new_length = PREFIX_LENGTH + name_length;
|
||||
new_name = kzalloc(new_length, GFP_KERNEL);
|
||||
if (!new_name)
|
||||
return;
|
||||
|
||||
snprintf(new_name, new_length, "Logitech %s", *name);
|
||||
|
||||
kfree(*name);
|
||||
|
||||
*name = new_name;
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------------------------- */
|
||||
/* HIDP++ 1.0 commands */
|
||||
/* -------------------------------------------------------------------------- */
|
||||
|
|
@ -321,6 +348,10 @@ static char *hidpp_get_unifying_name(struct hidpp_device *hidpp_dev)
|
|||
return NULL;
|
||||
|
||||
memcpy(name, &response.rap.params[2], len);
|
||||
|
||||
/* include the terminating '\0' */
|
||||
hidpp_prefix_name(&name, len + 1);
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
|
|
@ -498,6 +529,9 @@ static char *hidpp_get_device_name(struct hidpp_device *hidpp)
|
|||
index += ret;
|
||||
}
|
||||
|
||||
/* include the terminating '\0' */
|
||||
hidpp_prefix_name(&name, __name_length + 1);
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue