diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2017-04-28 12:25:30 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-05 15:46:09 -0400 |
| commit | 37d1601938349e79e9c31a8aba431d5543e09e72 (patch) | |
| tree | f36bdb6b0f3af60a8467958b6ae430840da31eed /drivers/hid/wacom_wac.c | |
| parent | 7af4c727c7b6104f94f2ffc3d0899e75a9cc1e55 (diff) | |
HID: wacom: generic: Scale battery capacity measurements to percentages
The power_supply subsystem expects us to provide it with capacity values
measured in percent. In particular, AES devices (HID_DG_BATTERYSTRENGTH)
use the range 0-255, which needs to be rescaled. The MobileStudio Pro
(WACOM_HID_WD_BATTERY_LEVEL) uses the range 0-100, but there's no guarantee
that future devices will share the same range.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 4b225fb19a16..fd989e09ae2d 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c | |||
| @@ -1811,6 +1811,7 @@ static void wacom_wac_pad_battery_event(struct hid_device *hdev, struct hid_fiel | |||
| 1811 | 1811 | ||
| 1812 | switch (equivalent_usage) { | 1812 | switch (equivalent_usage) { |
| 1813 | case WACOM_HID_WD_BATTERY_LEVEL: | 1813 | case WACOM_HID_WD_BATTERY_LEVEL: |
| 1814 | value = value * 100 / (field->logical_maximum - field->logical_minimum); | ||
| 1814 | wacom_wac->hid_data.battery_capacity = value; | 1815 | wacom_wac->hid_data.battery_capacity = value; |
| 1815 | wacom_wac->hid_data.bat_connected = 1; | 1816 | wacom_wac->hid_data.bat_connected = 1; |
| 1816 | break; | 1817 | break; |
| @@ -2035,6 +2036,7 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field | |||
| 2035 | wacom_wac->hid_data.sense_state = value; | 2036 | wacom_wac->hid_data.sense_state = value; |
| 2036 | return; | 2037 | return; |
| 2037 | case HID_DG_BATTERYSTRENGTH: | 2038 | case HID_DG_BATTERYSTRENGTH: |
| 2039 | value = value * 100 / (field->logical_maximum - field->logical_minimum); | ||
| 2038 | wacom_wac->hid_data.battery_capacity = value; | 2040 | wacom_wac->hid_data.battery_capacity = value; |
| 2039 | wacom_wac->hid_data.bat_connected = 1; | 2041 | wacom_wac->hid_data.bat_connected = 1; |
| 2040 | break; | 2042 | break; |
