diff options
author | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-17 09:04:35 +0000 |
---|---|---|
committer | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-17 09:04:35 +0000 |
commit | ccc57fa0cbd41dedd0fdfda607b4effb643b928a (patch) | |
tree | 064cdedad65202b1692e7bf9ad5f556afcb13795 /common/charge_state_v2.c | |
parent | 246a64a7a7afa655fa977b157d6b4e3bbf8854b6 (diff) | |
parent | 7f55c15872425d95df9d6e55fb9fab4a9a33937e (diff) | |
download | chrome-ec-firmware-nissa-15217.B-main.tar.gz |
Merge remote-tracking branch cros/main into firmware-nissa-15217.B-mainfirmware-nissa-15217.B-main
Generated by: util/update_release_branch.py -r --zephyr --board nissa firmware-
nissa-15217.B-main
Relevant changes:
git log --oneline 246a64a7a7..7f55c15872 -- zephyr/program/nissa
util/getversion.sh
7f55c15872 uldren: Modify battery parameter
b98a347e1b gothrax: Initial Zephyr EC image
638a938c27 yavilla: Add convertible related functions
926f0b68e1 Craask: define LED behavior at STATE_DISCHARGE_S0_BAT_LOW
BRANCH=None
BUG=b:274750316 b:279614675 b:273791621 b:282116750
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I0a1340ab45ce827aff3180468668cfcba92c6fe5
Signed-off-by: Shou-Chieh Hsu <shouchieh@google.com>
Diffstat (limited to 'common/charge_state_v2.c')
-rw-r--r-- | common/charge_state_v2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index a603d4f108..abfb6d2dd0 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -80,7 +80,7 @@ static uint8_t battery_level_shutdown; */ static const struct battery_info *batt_info; static struct charge_state_data curr; -static enum charge_state_v2 prev_state; +static enum charge_state prev_state; static int prev_ac, prev_charge, prev_disp_charge; static enum battery_present prev_bp; static enum ec_charge_control_mode chg_ctl_mode; @@ -776,7 +776,7 @@ static void notify_host_of_low_battery_charge(void) #endif } -static void set_charge_state(enum charge_state_v2 state) +static void set_charge_state(enum charge_state state) { prev_state = curr.state; curr.state = state; @@ -1026,7 +1026,7 @@ static void wakeup_battery(int *need_static) } } -__test_only enum charge_state_v2 charge_get_state_v2(void) +__test_only enum charge_state charge_get_state(void) { return curr.state; } |