scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-31 02:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ec_commands: battery_dynamic_info: Rename current to actual_current

Browse Source 
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>
This commit is contained in:
Nicolas Boichat
2018-01-04 08:36:33 +08:00
committed by chrome-bot
parent 069182f5e4
commit 113602c06e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/charge_state_v2.c
View File

@@ -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 =

4
include/ec_commands.h
View File

@@ -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 */