Instead of displaying a generic "tablet", now g-c-c shows a pretty
"Wacom Intuos Pro S (WL)".
Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
Acked-by: Ping Cheng <pi...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[aaron.sko...@wacom.com: Imported into input-wacom repository (9956953)]
Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
[aaron.sko...@wacom.com: Backported from input-wacom repository (e440823)]
Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
---
3.17/wacom.h | 1 +
3.17/wacom_sys.c | 11 +++++++++++
3.17/wacom_wac.h | 1 +
3 files changed, 13 insertions(+)
diff --git a/3.17/wacom.h b/3.17/wacom.h
index cb93199..1e2c898 100644
--- a/3.17/wacom.h
+++ b/3.17/wacom.h
@@ -131,6 +131,7 @@ struct wacom_group_leds {
};
struct wacom_battery {
+ struct wacom *wacom;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
struct power_supply_desc bat_desc;
struct power_supply *battery;
diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c
index 3330450..dde0466 100644
--- a/3.17/wacom_sys.c
+++ b/3.17/wacom_sys.c
@@ -1101,6 +1101,7 @@ static int wacom_initialize_leds(struct wacom *wacom)
}
static enum power_supply_property wacom_battery_props[] = {
+ POWER_SUPPLY_PROP_MODEL_NAME,
POWER_SUPPLY_PROP_PRESENT,
POWER_SUPPLY_PROP_STATUS,
POWER_SUPPLY_PROP_SCOPE,
@@ -1119,6 +1120,9 @@ static int wacom_battery_get_property(struct power_supply
*psy,
int ret = 0;
switch (psp) {
+ case POWER_SUPPLY_PROP_MODEL_NAME:
+ val->strval = battery->wacom->wacom_wac.name;
+ break;
case POWER_SUPPLY_PROP_PRESENT:
val->intval = battery->bat_connected;
break;
@@ -1191,6 +1195,8 @@ static int __wacom_initialize_battery(struct wacom *wacom,
if (!devres_open_group(dev, bat_desc, GFP_KERNEL))
return -ENOMEM;
+ battery->wacom = wacom;
+
n = atomic_inc_return(&battery_no) - 1;
bat_desc->properties = wacom_battery_props;
@@ -1688,6 +1694,9 @@ static void wacom_update_name(struct wacom *wacom, const
char *suffix)
strlcpy(name, features->name, sizeof(name));
}
+ snprintf(wacom_wac->name, sizeof(wacom_wac->name), "%s%s",
+ name, suffix);
+
/* Append the device type to the name */
snprintf(wacom_wac->pen_name, sizeof(wacom_wac->pen_name),
"%s%s Pen", name, suffix);
@@ -1937,6 +1946,8 @@ static void wacom_wireless_work(struct work_struct *work)
goto fail;
}
+ strlcpy(wacom_wac->name, wacom_wac1->name,
+ sizeof(wacom_wac->name));
error = wacom_initialize_battery(wacom);
if (error)
goto fail;
diff --git a/3.17/wacom_wac.h b/3.17/wacom_wac.h
index 84e94ce..20ce7cc 100644
--- a/3.17/wacom_wac.h
+++ b/3.17/wacom_wac.h
@@ -226,6 +226,7 @@ struct wacom_remote_data {
};
struct wacom_wac {
+ char name[WACOM_NAME_MAX];
char pen_name[WACOM_NAME_MAX];
char touch_name[WACOM_NAME_MAX];
char pad_name[WACOM_NAME_MAX];
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
