summaryrefslogtreecommitdiff
path: root/common/charge_state_v2.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2018-01-08 15:04:39 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-10 09:19:05 -0800
commit5ec8f4f49541efa98a606dbf84f0516b66378bef (patch)
treeaf3ba088920cb0820565fab551002b1a1f18baf4 /common/charge_state_v2.c
parent31e68a035b83acf13b73f3b5b63fbb99540faea9 (diff)
downloadchrome-ec-5ec8f4f49541efa98a606dbf84f0516b66378bef.tar.gz
ec_commands: EC_CMD_BATTERY_GET_DYNAMIC: Clarify the meaning of flags
flags are actually _not_ BATT_FLAG_*, but EC_BATT_FLAG_*. Clarify that in the comment, and add a new EC_BATT_FLAG_INVALID flag to indicate that some of the data may be invalid (dual-battery master needs to know that to make appropriate charging/discharging decision). BRANCH=none BUG=b:65697962 BUG=b:65697620 TEST=Flash hammer and wand, flags make sense. Change-Id: I3c428c850020a29b3f452504b60b52946a04c503 Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/859400 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common/charge_state_v2.c')
-rw-r--r--common/charge_state_v2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c
index 71d46265a5..cc145d6971 100644
--- a/common/charge_state_v2.c
+++ b/common/charge_state_v2.c
@@ -218,6 +218,9 @@ static void update_dynamic_battery_info(void)
batt_present = 0;
}
+ if (curr.batt.flags & EC_BATT_FLAG_INVALID_DATA)
+ tmp |= EC_BATT_FLAG_INVALID_DATA;
+
if (!(curr.batt.flags & BATT_FLAG_BAD_VOLTAGE))
*memmap_volt = curr.batt.voltage;
@@ -356,6 +359,9 @@ static void update_dynamic_battery_info(void)
batt_present = 0;
}
+ if (curr.batt.flags & EC_BATT_FLAG_INVALID_DATA)
+ tmp |= EC_BATT_FLAG_INVALID_DATA;
+
if (!(curr.batt.flags & BATT_FLAG_BAD_VOLTAGE))
base_battery_dynamic.actual_voltage = curr.batt.voltage;