diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-03 13:15:07 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-05 15:16:07 +0000 |
| commit | 1612a1ad427ec5929748fa6b94fb58b9bb8dd171 (patch) | |
| tree | 15f72bab9d622801dfe2fb66a79056940f64ce61 /common/charge_state_v2.c | |
| parent | 78c68ee1529fd13e0ea43f70cf097fad93aa0fa0 (diff) | |
| download | chrome-ec-1612a1ad427ec5929748fa6b94fb58b9bb8dd171.tar.gz | |
charger: Drop some #ifdefs from charger task
Convert these to if() to avoid the extra build paths.
This makes no functional change.
BUG=b:218332694
TEST=zmake build dev-posix
Change-Id: I1933097a0a1085cbbeb21e55fa3a26ad01fa042c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4500685
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'common/charge_state_v2.c')
| -rw-r--r-- | common/charge_state_v2.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index dde612b81e..ff9a752695 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1942,13 +1942,11 @@ void charger_task(void *u) curr.state = ST_IDLE; } -#ifdef CONFIG_CHARGE_MANAGER - if (curr.batt.state_of_charge >= + if (IS_ENABLED(CONFIG_CHARGE_MANAGER) && + curr.batt.state_of_charge >= CONFIG_CHARGE_MANAGER_BAT_PCT_SAFE_MODE_EXIT && - !battery_seems_disconnected) { + !battery_seems_disconnected) charge_manager_leave_safe_mode(); - } -#endif /* Keep the AP informed */ if (need_static) @@ -1972,13 +1970,12 @@ void charger_task(void *u) prev_full = is_full; -#ifndef CONFIG_CHARGER_MAINTAIN_VBAT /* Turn charger off if it's not needed */ - if (curr.state == ST_IDLE || curr.state == ST_DISCHARGE) { + if (!IS_ENABLED(CONFIG_CHARGER_MAINTAIN_VBAT) && + (curr.state == ST_IDLE || curr.state == ST_DISCHARGE)) { curr.requested_voltage = 0; curr.requested_current = 0; } -#endif /* Apply external limits */ if (curr.requested_current > user_current_limit) @@ -2013,20 +2010,17 @@ void charger_task(void *u) if (manual_current != -1) curr.requested_current = manual_current; } - } else { -#ifndef CONFIG_CHARGER_MAINTAIN_VBAT + } else if (!IS_ENABLED(CONFIG_CHARGER_MAINTAIN_VBAT)) { curr.requested_voltage = charger_closest_voltage( curr.batt.voltage + info->voltage_step); curr.requested_current = -1; -#endif -#ifdef CONFIG_EC_EC_COMM_BATTERY_SERVER /* * On EC-EC server, do not charge if curr.ac is 0: there * might still be some external power available but we * do not want to use it for charging. */ - curr.requested_current = 0; -#endif + if (IS_ENABLED(CONFIG_EC_EC_COMM_BATTERY_SERVER)) + curr.requested_current = 0; } if (IS_ENABLED(CONFIG_EC_EC_COMM_BATTERY_CLIENT)) |