diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-05 16:34:58 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-09 22:29:45 +0000 |
| commit | bd727adec5fa606d88773035eed12b198e587399 (patch) | |
| tree | e22e72f71b834337a2dfdcedc9473f80c8caaf4b | |
| parent | 9292b30e299314400542814ec625c9f94b27410c (diff) | |
| download | chrome-ec-bd727adec5fa606d88773035eed12b198e587399.tar.gz | |
charger: Deal with dumping the input voltage
This field is only accessible when CONFIG_EC_EC_COMM_BATTERY_CLIENT is
enabled, but we want to dump it in the main charger file. Add a
function to access the value.
This makes no functional change.
BUG=b:218332694
TEST=zmake build dev-posix
Check size on lux:
*** 69552 bytes in flash and 1152 bytes in RAM lux RO ****
*** 69460 bytes in flash and 1120 bytes in RAM lux RW ****
Change-Id: Iebf22c19cd3e2c649715eb3e6010709fda075929
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4510249
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/charge_state_v2.c | 7 | ||||
| -rw-r--r-- | common/charger_base.c | 5 | ||||
| -rw-r--r-- | include/charger_base.h | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index bee2872962..052d49ea1a 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -300,9 +300,10 @@ static void dump_charge_state(void) #ifdef CONFIG_CHARGER_OTG DUMP(output_current, "%dmA"); #endif -#ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT - DUMP(input_voltage, "%dmV"); -#endif + if (IS_ENABLED(CONFIG_EC_EC_COMM_BATTERY_CLIENT)) { + ccprintf("input_voltage = %dmV\n", + charger_base_get_input_voltage(&curr)); + } ccprintf("chg_ctl_mode = %s (%d)\n", cmode < CHARGE_CONTROL_COUNT ? mode_text[cmode] : "UNDEF", cmode); diff --git a/common/charger_base.c b/common/charger_base.c index f4f61ab97f..6f4f4da917 100644 --- a/common/charger_base.c +++ b/common/charger_base.c @@ -672,5 +672,10 @@ bool charger_base_charge_near_full(void) return true; } +int charger_base_get_input_voltage(const struct charge_state_data *curr) +{ + return curr->input_voltage; +} + /* Reset the base on S5->S0 transition. */ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_base_reset, HOOK_PRIO_DEFAULT); diff --git a/include/charger_base.h b/include/charger_base.h index 37df73ab6f..272dde9e26 100644 --- a/include/charger_base.h +++ b/include/charger_base.h @@ -54,4 +54,7 @@ void charger_base_show_charge(void); /* Check if the base charge is near full */ bool charger_base_charge_near_full(void); +/* Get the base input-voltage */ +int charger_base_get_input_voltage(const struct charge_state_data *curr); + #endif /* __CROS_EC_CHARGER_BASE_H */ |