diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-05-25 18:09:34 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-07-15 16:18:29 +0000 |
commit | 8b3035567f4ad4cc4cf8092d69b9dceabd801f7f (patch) | |
tree | 3bd266d506208972385b578530647ea870ef76a2 | |
parent | 3bdfb9ef4acd666fd69bac40cc25f06b903a67bc (diff) | |
download | chrome-ec-8b3035567f4ad4cc4cf8092d69b9dceabd801f7f.tar.gz |
chgstv2: Rename battery_seems_to_be_dead/_disconnected
This patch renames battery_seems_to_be_dead/_disconnected to
battery_seems_dead/_disconnected. There is no functionality
change.
BUG=None
BRANCH=None
TEST=buildall
Change-Id: I03d023df4da4b3ab698d1d2ddafb237bb4ea60be
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3007374
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r-- | common/charge_state_v2.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index aea9b3c354..948789fba6 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -140,9 +140,9 @@ static const int base_connected; #endif /* Is battery connected but unresponsive after precharge? */ -static int battery_seems_to_be_dead; +static int battery_seems_dead; -static int battery_seems_to_be_disconnected; +static int battery_seems_disconnected; /* * Was battery removed? Set when we see BP_NO, cleared after the battery is @@ -1201,9 +1201,9 @@ static void dump_charge_state(void) ccprintf("manual_voltage = %d\n", manual_voltage); ccprintf("manual_current = %d\n", manual_current); ccprintf("user_current_limit = %dmA\n", user_current_limit); - ccprintf("battery_seems_to_be_dead = %d\n", battery_seems_to_be_dead); - ccprintf("battery_seems_to_be_disconnected = %d\n", - battery_seems_to_be_disconnected); + ccprintf("battery_seems_dead = %d\n", battery_seems_dead); + ccprintf("battery_seems_disconnected = %d\n", + battery_seems_disconnected); ccprintf("battery_was_removed = %d\n", battery_was_removed); ccprintf("debug output = %s\n", debugging ? "on" : "off"); ccprintf("Battery sustainer = %s (%d%% ~ %d%%)\n", @@ -1825,7 +1825,7 @@ static int get_desired_input_current(enum battery_present batt_present, static void wakeup_battery(int *need_static) { - if (battery_seems_to_be_dead || battery_is_cut_off()) { + if (battery_seems_dead || battery_is_cut_off()) { /* It's dead, do nothing */ set_charge_state(ST_IDLE); curr.requested_voltage = 0; @@ -1835,7 +1835,7 @@ static void wakeup_battery(int *need_static) PRECHARGE_TIMEOUT_US)) { /* We've tried long enough, give up */ CPRINTS("battery seems to be dead"); - battery_seems_to_be_dead = 1; + battery_seems_dead = 1; set_charge_state(ST_IDLE); curr.requested_voltage = 0; curr.requested_current = 0; @@ -1868,7 +1868,7 @@ void charger_task(void *u) prev_ac = prev_charge = prev_disp_charge = -1; chg_ctl_mode = CHARGE_CONTROL_NORMAL; shutdown_target_time.val = 0UL; - battery_seems_to_be_dead = 0; + battery_seems_dead = 0; #ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT base_responsive = 0; curr.input_voltage = CHARGE_VOLTAGE_UNINITIALIZED; @@ -1956,7 +1956,7 @@ void charger_task(void *u) } else { /* Some things are only meaningful on AC */ set_chg_ctrl_mode(CHARGE_CONTROL_NORMAL); - battery_seems_to_be_dead = 0; + battery_seems_dead = 0; prev_ac = curr.ac; /* @@ -2096,7 +2096,7 @@ void charger_task(void *u) if (curr.requested_voltage == 0 && curr.requested_current == 0 && - battery_seems_to_be_disconnected) { + battery_seems_disconnected) { /* * Battery is in disconnect state. Apply a * current to kick it out of this state. @@ -2109,7 +2109,7 @@ void charger_task(void *u) } else #endif if (curr.state == ST_PRECHARGE || - battery_seems_to_be_dead || + battery_seems_dead || battery_was_removed) { CPRINTS("battery woke up"); @@ -2118,7 +2118,7 @@ void charger_task(void *u) need_static = 1; } - battery_seems_to_be_dead = battery_was_removed = 0; + battery_seems_dead = battery_was_removed = 0; set_charge_state(ST_CHARGE); wait_for_it: @@ -2141,7 +2141,7 @@ wait_for_it: #ifdef CONFIG_CHARGE_MANAGER if (curr.batt.state_of_charge >= CONFIG_CHARGE_MANAGER_BAT_PCT_SAFE_MODE_EXIT && - !battery_seems_to_be_disconnected) { + !battery_seems_disconnected) { /* * Sometimes the fuel gauge will report that it has * sufficient state of charge and remaining capacity, @@ -2491,7 +2491,7 @@ enum charge_state charge_get_state(void) { switch (curr.state) { case ST_IDLE: - if (battery_seems_to_be_dead || curr.batt.is_present == BP_NO) + if (battery_seems_dead || curr.batt.is_present == BP_NO) return PWR_STATE_ERROR; return PWR_STATE_IDLE; case ST_DISCHARGE: @@ -2815,10 +2815,10 @@ static int charge_get_charge_state_debug(int param, uint32_t *value) *value = manual_voltage; break; case CS_PARAM_DEBUG_SEEMS_DEAD: - *value = battery_seems_to_be_dead; + *value = battery_seems_dead; break; case CS_PARAM_DEBUG_SEEMS_DISCONNECTED: - *value = battery_seems_to_be_disconnected; + *value = battery_seems_disconnected; break; case CS_PARAM_DEBUG_BATT_REMOVED: *value = battery_was_removed; |