summaryrefslogtreecommitdiff
path: root/common/charge_state_v2.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2018-01-04 08:36:33 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-04 21:52:00 -0800
commit113602c06e2fac46ca7d29433bb2a62864c633c5 (patch)
tree23d5a5527f1a948c8535bb01003b7caea741c07a /common/charge_state_v2.c
parent069182f5e4082ae1cf569598cdc2d9d423dafaaa (diff)
downloadchrome-ec-113602c06e2fac46ca7d29433bb2a62864c633c5.tar.gz
ec_commands: battery_dynamic_info: Rename current to actual_current
current is actually a reserved keyword in the Linux kernel, replace it by actual_current. And voltage by actual_voltage for consistency. BRANCH=none BUG=b:65697962 BUG=b:65697620 TEST=make buildall -j Change-Id: I8b8115174d15a1cc4b1189a54104bfec559ed72c Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/848460 Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'common/charge_state_v2.c')
-rw-r--r--common/charge_state_v2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 7236f34009..c68351e4aa 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -357,10 +357,10 @@ static void update_dynamic_battery_info(void)
}
if (!(curr.batt.flags & BATT_FLAG_BAD_VOLTAGE))
- base_battery_dynamic.voltage = curr.batt.voltage;
+ base_battery_dynamic.actual_voltage = curr.batt.voltage;
if (!(curr.batt.flags & BATT_FLAG_BAD_CURRENT))
- base_battery_dynamic.current = curr.batt.current;
+ base_battery_dynamic.actual_current = curr.batt.current;
if (!(curr.batt.flags & BATT_FLAG_BAD_DESIRED_VOLTAGE))
base_battery_dynamic.desired_voltage =