diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2018-01-04 08:36:33 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-04 21:52:00 -0800 |
| commit | 113602c06e2fac46ca7d29433bb2a62864c633c5 (patch) | |
| tree | 23d5a5527f1a948c8535bb01003b7caea741c07a | |
| parent | 069182f5e4082ae1cf569598cdc2d9d423dafaaa (diff) | |
| download | chrome-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>
| -rw-r--r-- | common/charge_state_v2.c | 4 | ||||
| -rw-r--r-- | include/ec_commands.h | 4 |
2 files changed, 4 insertions, 4 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 = diff --git a/include/ec_commands.h b/include/ec_commands.h index 2835f83517..c48c6f5ee3 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -4710,8 +4710,8 @@ struct __ec_align_size1 ec_params_battery_dynamic_info { }; struct __ec_align2 ec_response_battery_dynamic_info { - int16_t voltage; /* Battery voltage (mV) */ - int16_t current; /* Battery current (mA); negative=discharging */ + int16_t actual_voltage; /* Battery voltage (mV) */ + int16_t actual_current; /* Battery current (mA); negative=discharging */ int16_t remaining_capacity; /* Remaining capacity (mAh) */ int16_t full_capacity; /* Capacity (mAh, might change occasionally) */ int16_t flags; /* Flags, see BATT_FLAG_* in battery.h */ |