diff options
| author | Simon Glass <sjg@chromium.org> | 2023-05-08 15:33:31 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-11 14:04:30 +0000 |
| commit | b729eab7c75553c830b54be5da7a348127f0b49c (patch) | |
| tree | db654291e97be430144d4bcad27e4f04db9f87f7 | |
| parent | c1b39d008cf6aa8ed53780c5b4ff1bd55951d1b4 (diff) | |
| download | chrome-ec-b729eab7c75553c830b54be5da7a348127f0b49c.tar.gz | |
charger: Move charger_state_v2.h into charge_state.h
We don't have a v1 anymore, so the name makes no sense. Move it into
the existing file.
Include charge_state.h instead of v2, doing this in the same change to
avoid build errors.
This makes no functional change.
BUG=b:218332694
TEST=make buildall
Change-Id: Ic3e3adc45e4d002c2cd5ba8aa65e24686e01d628
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516191
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Yuval Peress <peress@google.com>
128 files changed, 337 insertions, 356 deletions
diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c index 0e467140b3..7ff873963d 100644 --- a/baseboard/asurada/baseboard.c +++ b/baseboard/asurada/baseboard.c @@ -9,7 +9,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c index 89b027124e..391b9134c5 100644 --- a/baseboard/asurada/usbc_config.c +++ b/baseboard/asurada/usbc_config.c @@ -10,7 +10,7 @@ #include "bc12/mt6360_public.h" #include "bc12/pi3usb9201_public.h" #include "button.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "charger/isl923x_public.h" #include "console.h" diff --git a/baseboard/brya/charger_bq25720.c b/baseboard/brya/charger_bq25720.c index 4976abdea6..827152e115 100644 --- a/baseboard/brya/charger_bq25720.c +++ b/baseboard/brya/charger_bq25720.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index 4f43d8d238..c162331f89 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -9,7 +9,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/baseboard/goroh/baseboard.c b/baseboard/goroh/baseboard.c index c94e7a3af9..554437ab6e 100644 --- a/baseboard/goroh/baseboard.c +++ b/baseboard/goroh/baseboard.c @@ -11,7 +11,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 37bb61b423..10e66c50dc 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -9,7 +9,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index c79d14cf6d..b65aa5ba8b 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -10,7 +10,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chip/npcx/ps2_chip.h" #include "chip/npcx/pwm_chip.h" diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index b4e37e6bc8..b342cd74ed 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -7,7 +7,7 @@ #include "atomic.h" #include "battery_fuel_gauge.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "console.h" #include "cros_board_info.h" diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c index c4ae3ea72d..60ad6e5cdb 100644 --- a/baseboard/intelrvp/chg_usb_pd.c +++ b/baseboard/intelrvp/chg_usb_pd.c @@ -6,7 +6,7 @@ /* Common USB PD charge configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "gpio.h" #include "hooks.h" #include "tcpm/tcpci.h" diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c index 3f2959ebdb..1d18109f6f 100644 --- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c +++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c @@ -6,7 +6,7 @@ /* Intel-RVP family-specific configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "driver/ppc/sn5s330.h" #include "gpio.h" diff --git a/baseboard/kukui/charger_mt6370.c b/baseboard/kukui/charger_mt6370.c index 80587745ea..d3b8cb10ef 100644 --- a/baseboard/kukui/charger_mt6370.c +++ b/baseboard/kukui/charger_mt6370.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger_mt6370.h" #include "console.h" #include "driver/charger/rt946x.h" diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c index 2f2c141510..1ca7935762 100644 --- a/baseboard/kukui/usb_pd_policy.c +++ b/baseboard/kukui/usb_pd_policy.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "console.h" #include "gpio.h" diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index dcf16cf7c6..e54656f08a 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -11,7 +11,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/agah/charger_isl9241.c b/board/agah/charger_isl9241.c index 902bd57aa3..892c857ad6 100644 --- a/board/agah/charger_isl9241.c +++ b/board/agah/charger_isl9241.c @@ -35,7 +35,6 @@ #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/ambassador/board.c b/board/ambassador/board.c index d8de0ec5fa..dd839574b5 100644 --- a/board/ambassador/board.c +++ b/board/ambassador/board.c @@ -8,7 +8,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "common.h" #include "core/cortex-m/cpu.h" diff --git a/board/anahera/board.c b/board/anahera/board.c index 4b328e6db2..f5fc90a9aa 100644 --- a/board/anahera/board.c +++ b/board/anahera/board.c @@ -6,7 +6,7 @@ #include "battery.h" #include "button.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/anahera/charger.c b/board/anahera/charger.c index 4976abdea6..827152e115 100644 --- a/board/anahera/charger.c +++ b/board/anahera/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/asurada/board.c b/board/asurada/board.c index 82cda97dfd..a9b5e0aab4 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/aurash/board.c b/board/aurash/board.c index 64a8ca6015..ec833141a7 100644 --- a/board/aurash/board.c +++ b/board/aurash/board.c @@ -7,7 +7,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/banshee/charger.c b/board/banshee/charger.c index c6ee062ab5..76e2712181 100644 --- a/board/banshee/charger.c +++ b/board/banshee/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/beadrix/board.c b/board/beadrix/board.c index d14996c6e5..92da9f5295 100644 --- a/board/beadrix/board.c +++ b/board/beadrix/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/isl923x.h" diff --git a/board/beetley/board.c b/board/beetley/board.c index 697e2a50fe..7bd12e9bdb 100644 --- a/board/beetley/board.c +++ b/board/beetley/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_lis2dw12.h" diff --git a/board/blipper/board.c b/board/blipper/board.c index 58867cafb2..15a2d4b520 100644 --- a/board/blipper/board.c +++ b/board/blipper/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_lis2dw12.h" diff --git a/board/boten/board.c b/board/boten/board.c index fe23078c4c..c352d12f78 100644 --- a/board/boten/board.c +++ b/board/boten/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_lis2dw12.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/board/boxy/board.c b/board/boxy/board.c index 10ad5aec30..a0f8dd6683 100644 --- a/board/boxy/board.c +++ b/board/boxy/board.c @@ -9,7 +9,7 @@ #include "board.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/ppc/syv682x_public.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/board/brask/board.c b/board/brask/board.c index be41092f0e..8bdb113ac5 100644 --- a/board/brask/board.c +++ b/board/brask/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/brya/charger.c b/board/brya/charger.c index 4976abdea6..827152e115 100644 --- a/board/brya/charger.c +++ b/board/brya/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/bugzzy/board.c b/board/bugzzy/board.c index c3f62e8787..5102db15be 100644 --- a/board/bugzzy/board.c +++ b/board/bugzzy/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/cappy2/board.c b/board/cappy2/board.c index 99f9f1bf73..9525e9c1f2 100644 --- a/board/cappy2/board.c +++ b/board/cappy2/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/bc12/pi3usb9201.h" #include "driver/charger/isl923x.h" diff --git a/board/cherry/board.c b/board/cherry/board.c index f8700404ed..8d3faaf621 100644 --- a/board/cherry/board.c +++ b/board/cherry/board.c @@ -5,7 +5,7 @@ /* Cherry board configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "console.h" #include "driver/accel_bma422.h" diff --git a/board/chronicler/board.c b/board/chronicler/board.c index daec7df9c3..ca6ae5c392 100644 --- a/board/chronicler/board.c +++ b/board/chronicler/board.c @@ -9,7 +9,7 @@ #include "battery_smart.h" #include "button.h" #include "cbi_ec_fw_config.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "driver/sync.h" #include "driver/tcpm/ps8xxx.h" diff --git a/board/constitution/board.c b/board/constitution/board.c index deb00f6c2c..8a3e56032e 100644 --- a/board/constitution/board.c +++ b/board/constitution/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/corori/board.c b/board/corori/board.c index 545765b0d7..0717b73750 100644 --- a/board/corori/board.c +++ b/board/corori/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/corori2/board.c b/board/corori2/board.c index 7bfc7d2e10..909099c6f8 100644 --- a/board/corori2/board.c +++ b/board/corori2/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/cret/board.c b/board/cret/board.c index 4439a30044..59edd8145a 100644 --- a/board/cret/board.c +++ b/board/cret/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/crota/charger.c b/board/crota/charger.c index ce19b66194..7b3edd270d 100644 --- a/board/crota/charger.c +++ b/board/crota/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/dibbi/board.c b/board/dibbi/board.c index 5b7e8dd7c5..200a53043c 100644 --- a/board/dibbi/board.c +++ b/board/dibbi/board.c @@ -9,7 +9,7 @@ #include "board.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/ppc/syv682x_public.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/board/dojo/board.c b/board/dojo/board.c index ca85def38c..28788d4641 100644 --- a/board/dojo/board.c +++ b/board/dojo/board.c @@ -7,7 +7,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "console.h" #include "cros_board_info.h" diff --git a/board/dooly/board.c b/board/dooly/board.c index d0711c9c12..306fc86ae3 100644 --- a/board/dooly/board.c +++ b/board/dooly/board.c @@ -9,7 +9,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "common.h" #include "core/cortex-m/cpu.h" diff --git a/board/drawcia/board.c b/board/drawcia/board.c index aa0c23c585..78459b6ef5 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/drawcia_riscv/board.c b/board/drawcia_riscv/board.c index 6cd76b17bd..d8d0189635 100644 --- a/board/drawcia_riscv/board.c +++ b/board/drawcia_riscv/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/driblee/board.c b/board/driblee/board.c index fd03b64e03..739be95ce3 100644 --- a/board/driblee/board.c +++ b/board/driblee/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/drobit/board.c b/board/drobit/board.c index d51097f97d..ab4e98c887 100644 --- a/board/drobit/board.c +++ b/board/drobit/board.c @@ -7,7 +7,7 @@ #include "accelgyro.h" #include "button.h" #include "cbi_ec_fw_config.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "driver/bc12/pi3usb9201.h" #include "driver/ppc/syv682x.h" diff --git a/board/eldrid/board.c b/board/eldrid/board.c index e43bc79b5b..c5a0bb437e 100644 --- a/board/eldrid/board.c +++ b/board/eldrid/board.c @@ -7,7 +7,7 @@ #include "accelgyro.h" #include "button.h" #include "cbi_ec_fw_config.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "driver/accel_bma2x2.h" #include "driver/accelgyro_bmi160.h" diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c index 03d0727b70..d2124188ce 100644 --- a/board/ezkinil/board.c +++ b/board/ezkinil/board.c @@ -6,7 +6,7 @@ #include "adc.h" #include "button.h" #include "cbi_ssfc.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "cros_board_info.h" #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" diff --git a/board/felwinter/charger_isl9241.c b/board/felwinter/charger_isl9241.c index ddb37cbbcb..b86d92965b 100644 --- a/board/felwinter/charger_isl9241.c +++ b/board/felwinter/charger_isl9241.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/gaelin/board.c b/board/gaelin/board.c index a2d760b92a..3b87757351 100644 --- a/board/gaelin/board.c +++ b/board/gaelin/board.c @@ -6,7 +6,7 @@ #include "assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/galtic/board.c b/board/galtic/board.c index 68a36216fe..a05c9f470d 100644 --- a/board/galtic/board.c +++ b/board/galtic/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_bma2x2.h" #include "driver/accel_kionix.h" diff --git a/board/gimble/board.c b/board/gimble/board.c index 8b849f7613..0a04dc5714 100644 --- a/board/gimble/board.c +++ b/board/gimble/board.c @@ -6,7 +6,7 @@ #include "battery.h" #include "button.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/gimble/charger.c b/board/gimble/charger.c index 4976abdea6..827152e115 100644 --- a/board/gimble/charger.c +++ b/board/gimble/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/gladios/board.c b/board/gladios/board.c index b0fad206c0..551c53f20f 100644 --- a/board/gladios/board.c +++ b/board/gladios/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/gooey/board.c b/board/gooey/board.c index 6a9d07dbce..0160832c04 100644 --- a/board/gooey/board.c +++ b/board/gooey/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_lis2dw12.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/board/goroh/board.c b/board/goroh/board.c index a9eaa35b92..d13c7cfb1b 100644 --- a/board/goroh/board.c +++ b/board/goroh/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/haboki/board.c b/board/haboki/board.c index 2b5e852824..74cf39483b 100644 --- a/board/haboki/board.c +++ b/board/haboki/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/hades/charger_isl9241.c b/board/hades/charger_isl9241.c index 4886191fcc..ad59c5f139 100644 --- a/board/hades/charger_isl9241.c +++ b/board/hades/charger_isl9241.c @@ -35,7 +35,6 @@ #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/kano/charger.c b/board/kano/charger.c index ddb37cbbcb..b86d92965b 100644 --- a/board/kano/charger.c +++ b/board/kano/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/kinox/board.c b/board/kinox/board.c index 5748e5b013..02d741ddc5 100644 --- a/board/kinox/board.c +++ b/board/kinox/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/kracko/board.c b/board/kracko/board.c index 025ec5109c..2f69f43632 100644 --- a/board/kracko/board.c +++ b/board/kracko/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/kuldax/board.c b/board/kuldax/board.c index 545ee3c23c..c5fb16c5e7 100644 --- a/board/kuldax/board.c +++ b/board/kuldax/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/lalala/board.c b/board/lalala/board.c index ed8c5ae2e5..2d9c004f20 100644 --- a/board/lalala/board.c +++ b/board/lalala/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/lantis/board.c b/board/lantis/board.c index 92c030def1..600f141639 100644 --- a/board/lantis/board.c +++ b/board/lantis/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/lisbon/board.c b/board/lisbon/board.c index b0fad206c0..551c53f20f 100644 --- a/board/lisbon/board.c +++ b/board/lisbon/board.c @@ -6,7 +6,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" diff --git a/board/madoo/board.c b/board/madoo/board.c index a1cdb024f9..bb031c3acf 100644 --- a/board/madoo/board.c +++ b/board/madoo/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/magolor/board.c b/board/magolor/board.c index af524d9bfa..7759a38a0c 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/marasov/charger.c b/board/marasov/charger.c index c531286643..d78c345f94 100644 --- a/board/marasov/charger.c +++ b/board/marasov/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/metaknight/board.c b/board/metaknight/board.c index cde7ed51ec..7675c7c8f5 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/mithrax/charger_isl9241.c b/board/mithrax/charger_isl9241.c index c6ee062ab5..76e2712181 100644 --- a/board/mithrax/charger_isl9241.c +++ b/board/mithrax/charger_isl9241.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/moli/board.c b/board/moli/board.c index e3a7bd0fa9..a8e4eddc9d 100644 --- a/board/moli/board.c +++ b/board/moli/board.c @@ -7,7 +7,7 @@ #include "builtin/assert.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/nocturne/battery.c b/board/nocturne/battery.c index bfb4b25467..4914f89b2e 100644 --- a/board/nocturne/battery.c +++ b/board/nocturne/battery.c @@ -8,7 +8,7 @@ #include "battery.h" #include "battery_smart.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/nocturne/board.c b/board/nocturne/board.c index b566d43e41..de7671163b 100644 --- a/board/nocturne/board.c +++ b/board/nocturne/board.c @@ -9,7 +9,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "chipset.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/omnigul/charger.c b/board/omnigul/charger.c index dc8fa76be3..b3ca8dc104 100644 --- a/board/omnigul/charger.c +++ b/board/omnigul/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/osiris/charger.c b/board/osiris/charger.c index c6ee062ab5..76e2712181 100644 --- a/board/osiris/charger.c +++ b/board/osiris/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/pirika/board.c b/board/pirika/board.c index f153da2ce7..d1baae03f2 100644 --- a/board/pirika/board.c +++ b/board/pirika/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_kionix.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/board/primus/board.c b/board/primus/board.c index 2a8ff39ac7..f42e83c509 100644 --- a/board/primus/board.c +++ b/board/primus/board.c @@ -7,7 +7,7 @@ #include "button.h" #include "charge_manager.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/primus/charger.c b/board/primus/charger.c index 4976abdea6..827152e115 100644 --- a/board/primus/charger.c +++ b/board/primus/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/puff/board.c b/board/puff/board.c index ce2a59d8cb..7e5c2ad8e6 100644 --- a/board/puff/board.c +++ b/board/puff/board.c @@ -8,7 +8,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "common.h" #include "core/cortex-m/cpu.h" diff --git a/board/redrix/charger.c b/board/redrix/charger.c index 4976abdea6..827152e115 100644 --- a/board/redrix/charger.c +++ b/board/redrix/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/sasuke/board.c b/board/sasuke/board.c index bc96165f4d..502fa60bd5 100644 --- a/board/sasuke/board.c +++ b/board/sasuke/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/sasukette/board.c b/board/sasukette/board.c index f5076382e6..7284d2d3c8 100644 --- a/board/sasukette/board.c +++ b/board/sasukette/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/bc12/pi3usb9201.h" diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 9c26757ba0..daa247b385 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -8,7 +8,6 @@ #include "button.h" #include "charge_manager.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/shotzo/board.c b/board/shotzo/board.c index ca90a54301..6ae6d8e55c 100644 --- a/board/shotzo/board.c +++ b/board/shotzo/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/charger/sm5803.h" diff --git a/board/spherion/board.c b/board/spherion/board.c index 0170a8998e..b6df18b119 100644 --- a/board/spherion/board.c +++ b/board/spherion/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/storo/board.c b/board/storo/board.c index 854838d844..d8f1b09ae1 100644 --- a/board/storo/board.c +++ b/board/storo/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "cros_board_info.h" #include "driver/accel_bma2x2.h" diff --git a/board/taeko/board.c b/board/taeko/board.c index a654d4c76a..aaf7f215ff 100644 --- a/board/taeko/board.c +++ b/board/taeko/board.c @@ -7,7 +7,7 @@ #include "button.h" #include "charge_manager.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/taeko/charger.c b/board/taeko/charger.c index 4976abdea6..827152e115 100644 --- a/board/taeko/charger.c +++ b/board/taeko/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/taniks/board.c b/board/taniks/board.c index 5657de1fe7..fdda313c9e 100644 --- a/board/taniks/board.c +++ b/board/taniks/board.c @@ -7,7 +7,7 @@ #include "button.h" #include "charge_manager.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/taniks/charger.c b/board/taniks/charger.c index 4976abdea6..827152e115 100644 --- a/board/taniks/charger.c +++ b/board/taniks/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/taranza/board.c b/board/taranza/board.c index 09a44f3b79..2fdeebb57b 100644 --- a/board/taranza/board.c +++ b/board/taranza/board.c @@ -9,7 +9,7 @@ #include "board.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/ppc/syv682x_public.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/board/vell/charger.c b/board/vell/charger.c index 3f57ca11ed..59d8812993 100644 --- a/board/vell/charger.c +++ b/board/vell/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/vilboz/board.c b/board/vilboz/board.c index c14a2152ec..d759865fc7 100644 --- a/board/vilboz/board.c +++ b/board/vilboz/board.c @@ -5,7 +5,7 @@ #include "battery_smart.h" #include "button.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "cros_board_info.h" #include "driver/accel_lis2dw12.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/board/volmar/charger.c b/board/volmar/charger.c index c6ee062ab5..76e2712181 100644 --- a/board/volmar/charger.c +++ b/board/volmar/charger.c @@ -4,7 +4,7 @@ */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/board/waddledee/board.c b/board/waddledee/board.c index 814e2e8921..229573eb42 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_kionix.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c index 7dc87f38da..80234defdf 100644 --- a/board/waddledoo/board.c +++ b/board/waddledoo/board.c @@ -9,7 +9,7 @@ #include "button.h" #include "cbi_fw_config.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/waddledoo2/board.c b/board/waddledoo2/board.c index 7adb032f98..8a7a2b461d 100644 --- a/board/waddledoo2/board.c +++ b/board/waddledoo2/board.c @@ -10,7 +10,7 @@ #include "cbi_fw_config.h" #include "cbi_ssfc.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "common.h" diff --git a/board/wheelie/board.c b/board/wheelie/board.c index a8c5859e9d..f2acbb4efa 100644 --- a/board/wheelie/board.c +++ b/board/wheelie/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "button.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "driver/accel_lis2dh.h" #include "driver/accelgyro_lsm6dsm.h" diff --git a/common/charge_manager.c b/common/charge_manager.c index 2c79047efa..47874afc01 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -9,7 +9,7 @@ #include "builtin/assert.h" #include "charge_manager.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "console.h" #include "dps.h" diff --git a/common/charger.c b/common/charger.c index 12e1961f4b..0f4f6f7a9c 100644 --- a/common/charger.c +++ b/common/charger.c @@ -7,7 +7,7 @@ #include "battery_smart.h" #include "builtin/assert.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "console.h" diff --git a/common/ec_ec_comm_server.c b/common/ec_ec_comm_server.c index 174ac54757..3c83253138 100644 --- a/common/ec_ec_comm_server.c +++ b/common/ec_ec_comm_server.c @@ -6,7 +6,7 @@ */ #include "battery.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "common.h" #include "console.h" #include "crc8.h" diff --git a/common/ocpc.c b/common/ocpc.c index 5d2d97dc2c..39e13dc046 100644 --- a/common/ocpc.c +++ b/common/ocpc.c @@ -8,7 +8,7 @@ #include "battery.h" #include "battery_fuel_gauge.h" #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "console.h" diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c index 222d2f58a4..a13770a02c 100644 --- a/driver/charger/bq25710.c +++ b/driver/charger/bq25710.c @@ -9,7 +9,7 @@ #include "battery_smart.h" #include "bq257x0_regs.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "console.h" diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c index a5fae9329d..997838f53e 100644 --- a/driver/charger/isl923x.c +++ b/driver/charger/isl923x.c @@ -9,7 +9,7 @@ #include "battery.h" #include "battery_smart.h" #include "builtin/assert.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "common.h" #include "compile_time_macros.h" diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c index 391c60956a..a3e22c5b8b 100644 --- a/driver/charger/sm5803.c +++ b/driver/charger/sm5803.c @@ -7,7 +7,7 @@ #include "atomic.h" #include "battery.h" #include "battery_smart.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "extpower.h" #include "gpio.h" diff --git a/include/charge_state.h b/include/charge_state.h index 57f9521b0e..34576dc333 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -5,7 +5,13 @@ #ifndef __CROS_EC_CHARGE_STATE_H #define __CROS_EC_CHARGE_STATE_H +#include "battery.h" +#include "battery_smart.h" +#include "charger.h" +#include "chipset.h" #include "common.h" +#include "ec_ec_comm_client.h" +#include "ocpc.h" #include "stdbool.h" #include "timer.h" @@ -61,7 +67,7 @@ enum led_pwr_state { /* Battery is responsive */ #define CHARGE_FLAG_BATT_RESPONSIVE BIT(2) -/* Debugging constants, in the same order as enum led_pwr_state. This string +/* Debugging constants, in the same order as enum pwr_state. This string * table was moved here to sync with enum above. */ #define CHARGE_STATE_NAME_TABLE \ @@ -72,6 +78,46 @@ enum led_pwr_state { } /* End of CHARGE_STATE_NAME_TABLE macro */ +/* + * The values exported by charge_get_state() and charge_get_flags() are used + * only to control the LEDs (with one not-quite-correct exception). For V2 + * we use a different set of states internally. + */ +enum charge_state_v2 { + ST_IDLE = 0, + ST_DISCHARGE, + ST_CHARGE, + ST_PRECHARGE, + + NUM_STATES_V2 +}; + +struct charge_state_data { + timestamp_t ts; + int ac; + int batt_is_charging; + struct charger_params chg; + struct batt_params batt; + enum charge_state_v2 state; + int requested_voltage; + int requested_current; + int desired_input_current; +#ifdef CONFIG_CHARGER_OTG + int output_current; +#endif +#ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT + int input_voltage; +#endif +#ifdef CONFIG_OCPC + struct ocpc_data ocpc; +#endif +}; + +struct sustain_soc { + int8_t lower; + int8_t upper; +}; + /** * Return current charge state. */ @@ -191,7 +237,185 @@ int charge_get_battery_temp(int idx, int *temp_ptr); */ const struct batt_params *charger_current_battery_params(void); +/** + * Set the output current limit and voltage. This is used to provide power from + * the charger chip ("OTG" mode). + * + * @param chgnum Charger index to act upon + * @param ma Maximum current to provide in mA (0 to disable output). + * @param mv Voltage in mV (ignored if ma == 0). + * @return EC_SUCCESS or error + */ +int charge_set_output_current_limit(int chgnum, int ma, int mv); + +/** + * Set the charge input current limit. This value is stored and sent every + * time AC is applied. + * + * The input current limit is automatically derated by + * CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT (if configured), and is clamped to + * no less than CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT mA (if configured). + * + * @param ma New input current limit in mA + * @param mv Negotiated charge voltage in mV. + * @return EC_SUCCESS or error + */ +int charge_set_input_current_limit(int ma, int mv); + +/** + * Set the desired manual charge current when in idle mode. + * + * @param curr_ma: Charge current in mA. + */ +void chgstate_set_manual_current(int curr_ma); + +/** + * Set the desired manual charge voltage when in idle mode. + * + * @param volt_mv: Charge voltage in mV. + */ +void chgstate_set_manual_voltage(int volt_mv); + +/** + * Board-specific routine to indicate if the base is connected. + */ +int board_is_base_connected(void); + +/** + * Board-specific routine to enable power distribution between lid and base + * (current can flow both ways). + */ +void board_enable_base_power(int enable); + +/** + * Board-specific routine to reset the base (in case it is unresponsive, e.g. + * if we told it to hibernate). + */ +void board_base_reset(void); + +/** + * Callback with which boards determine action on critical low battery + * + * The default implementation is provided in charge_state_v2.c. Overwrite it + * to customize it. + * + * @param curr Pointer to struct charge_state_data + * @return Action to take. + */ +enum critical_shutdown +board_critical_shutdown_check(struct charge_state_data *curr); + +/** + * Callback to set battery level for shutdown + * + * A board can implement this to customize shutdown battery level at runtime. + * + * @return battery level for shutdown + */ +uint8_t board_set_battery_level_shutdown(void); + +/** + * Return system PLT power and battery's desired power. + * + * @return desired power in mW + */ +int charge_get_plt_plus_bat_desired_mw(void); + +/** + * Get the stable battery charging current. The current will be + * CHARGE_CURRENT_UNINITIALIZED if not yet stable. + * + * @return stable battery charging current in mA + */ +int charge_get_stable_current(void); + +/** + * Select which charger IC will actually be performing the charger switching. + * + * @param idx The index into the chg_chips table. + */ +void charge_set_active_chg_chip(int idx); + +/** + * Retrieve which charger IC is the active charger IC performing the charger + * switching. + */ +int charge_get_active_chg_chip(void); + +/** + * Set the stable current. + * + * @param ma: battery charging current in mA + */ +void charge_set_stable_current(int ma); + +/** + * Reset stable current counter stable_ts. Calling this function would set + * stable_current to CHARGE_CURRENT_UNINITIALIZED. + */ +void charge_reset_stable_current(void); + +/** + * Reset stable current counter stable_ts. Calling this function would set + * stable_current to CHARGE_CURRENT_UNINITIALIZED. + * + * @param us: sample stable current until us later. + */ +void charge_reset_stable_current_us(uint64_t us); + +/** + * Check if the battery charging current is stable by examining the timestamp. + * + * @return true if stable timestamp expired, false otherwise. + */ +bool charge_is_current_stable(void); + +/** + * Reset the OCPC internal state data and set the target VSYS to the current + * battery voltage for the auxiliary chargers. + */ +void trigger_ocpc_reset(void); + +/* Track problems in communicating with the battery or charger */ +enum problem_type { + PR_STATIC_UPDATE, + PR_SET_VOLTAGE, + PR_SET_CURRENT, + PR_SET_MODE, + PR_SET_INPUT_CURR, + PR_POST_INIT, + PR_CHG_FLAGS, + PR_BATT_FLAGS, + PR_CUSTOM, + PR_CFG_SEC_CHG, + + NUM_PROBLEM_TYPES +}; + +void charge_problem(enum problem_type p, int v); + +struct charge_state_data *charge_get_status(void); + +enum ec_charge_control_mode get_chg_ctrl_mode(void); + +__test_only void reset_prev_disp_charge(void); + +/** + * Whether or not the charging progress was shown. Note, calling this function + * will reset the value to false. + * + * @return Whether or not the charging progress was printed to the console + */ +__test_only bool charging_progress_displayed(void); + +/** + * Callback for boards to request charger to enable bypass mode on/off. + * + * @return True for requesting bypass on. False for requesting bypass off. + */ +int board_should_charger_bypass(void); + /* Config Charger */ -#include "charge_state_v2.h" +#include "charge_state.h" #endif /* __CROS_EC_CHARGE_STATE_H */ diff --git a/include/charge_state_v2.h b/include/charge_state_v2.h index cb46d92e1b..72fd8a88ff 100644 --- a/include/charge_state_v2.h +++ b/include/charge_state_v2.h @@ -3,235 +3,7 @@ * found in the LICENSE file. */ -#include "battery.h" -#include "battery_smart.h" -#include "charger.h" -#include "chipset.h" -#include "ec_ec_comm_client.h" -#include "ocpc.h" -#include "timer.h" - -#include <stdbool.h> - #ifndef __CROS_EC_CHARGE_STATE_V2_H #define __CROS_EC_CHARGE_STATE_V2_H -/* - * The values exported by led_pwr_get_state() and charge_get_flags() are used - * only to control the LEDs (with one not-quite-correct exception). For V2 - * we use a different set of states internally. - */ -enum charge_state_v2 { - ST_IDLE = 0, - ST_DISCHARGE, - ST_CHARGE, - ST_PRECHARGE, - - NUM_STATES_V2 -}; - -struct charge_state_data { - timestamp_t ts; - int ac; - int batt_is_charging; - struct charger_params chg; - struct batt_params batt; - enum charge_state_v2 state; - int requested_voltage; - int requested_current; - int desired_input_current; -#ifdef CONFIG_CHARGER_OTG - int output_current; -#endif -#ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT - int input_voltage; -#endif -#ifdef CONFIG_OCPC - struct ocpc_data ocpc; -#endif -}; - -struct sustain_soc { - int8_t lower; - int8_t upper; -}; - -/** - * Set the output current limit and voltage. This is used to provide power from - * the charger chip ("OTG" mode). - * - * @param chgnum Charger index to act upon - * @param ma Maximum current to provide in mA (0 to disable output). - * @param mv Voltage in mV (ignored if ma == 0). - * @return EC_SUCCESS or error - */ -int charge_set_output_current_limit(int chgnum, int ma, int mv); - -/** - * Set the charge input current limit. This value is stored and sent every - * time AC is applied. - * - * The input current limit is automatically derated by - * CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT (if configured), and is clamped to - * no less than CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT mA (if configured). - * - * @param ma New input current limit in mA - * @param mv Negotiated charge voltage in mV. - * @return EC_SUCCESS or error - */ -int charge_set_input_current_limit(int ma, int mv); - -/** - * Set the desired manual charge current when in idle mode. - * - * @param curr_ma: Charge current in mA. - */ -void chgstate_set_manual_current(int curr_ma); - -/** - * Set the desired manual charge voltage when in idle mode. - * - * @param volt_mv: Charge voltage in mV. - */ -void chgstate_set_manual_voltage(int volt_mv); - -/** - * Board-specific routine to indicate if the base is connected. - */ -int board_is_base_connected(void); - -/** - * Board-specific routine to enable power distribution between lid and base - * (current can flow both ways). - */ -void board_enable_base_power(int enable); - -/** - * Board-specific routine to reset the base (in case it is unresponsive, e.g. - * if we told it to hibernate). - */ -void board_base_reset(void); - -/** - * Callback with which boards determine action on critical low battery - * - * The default implementation is provided in charge_state_v2.c. Overwrite it - * to customize it. - * - * @param curr Pointer to struct charge_state_data - * @return Action to take. - */ -enum critical_shutdown -board_critical_shutdown_check(struct charge_state_data *curr); - -/** - * Callback to set battery level for shutdown - * - * A board can implement this to customize shutdown battery level at runtime. - * - * @return battery level for shutdown - */ -uint8_t board_set_battery_level_shutdown(void); - -/** - * Return system PLT power and battery's desired power. - * - * @return desired power in mW - */ -int charge_get_plt_plus_bat_desired_mw(void); - -/** - * Get the stable battery charging current. The current will be - * CHARGE_CURRENT_UNINITIALIZED if not yet stable. - * - * @return stable battery charging current in mA - */ -int charge_get_stable_current(void); - -/** - * Select which charger IC will actually be performing the charger switching. - * - * @param idx The index into the chg_chips table. - */ -void charge_set_active_chg_chip(int idx); - -/** - * Retrieve which charger IC is the active charger IC performing the charger - * switching. - */ -int charge_get_active_chg_chip(void); - -/** - * Set the stable current. - * - * @param ma: battery charging current in mA - */ -void charge_set_stable_current(int ma); - -/** - * Reset stable current counter stable_ts. Calling this function would set - * stable_current to CHARGE_CURRENT_UNINITIALIZED. - */ -void charge_reset_stable_current(void); - -/** - * Reset stable current counter stable_ts. Calling this function would set - * stable_current to CHARGE_CURRENT_UNINITIALIZED. - * - * @param us: sample stable current until us later. - */ -void charge_reset_stable_current_us(uint64_t us); - -/** - * Check if the battery charging current is stable by examining the timestamp. - * - * @return true if stable timestamp expired, false otherwise. - */ -bool charge_is_current_stable(void); - -/** - * Reset the OCPC internal state data and set the target VSYS to the current - * battery voltage for the auxiliary chargers. - */ -void trigger_ocpc_reset(void); - -/* Track problems in communicating with the battery or charger */ -enum problem_type { - PR_STATIC_UPDATE, - PR_SET_VOLTAGE, - PR_SET_CURRENT, - PR_SET_MODE, - PR_SET_INPUT_CURR, - PR_POST_INIT, - PR_CHG_FLAGS, - PR_BATT_FLAGS, - PR_CUSTOM, - PR_CFG_SEC_CHG, - - NUM_PROBLEM_TYPES -}; - -void charge_problem(enum problem_type p, int v); - -struct charge_state_data *charge_get_status(void); - -enum ec_charge_control_mode get_chg_ctrl_mode(void); - -__test_only void reset_prev_disp_charge(void); - -/** - * Whether or not the charging progress was shown. Note, calling this function - * will reset the value to false. - * - * @return Whether or not the charging progress was printed to the console - */ -__test_only bool charging_progress_displayed(void); - -/** - * Callback for boards to request charger to enable bypass mode on/off. - * - * @return True for requesting bypass on. False for requesting bypass off. - */ -int board_should_charger_bypass(void); - #endif /* __CROS_EC_CHARGE_STATE_V2_H */ diff --git a/include/charger_profile_override.h b/include/charger_profile_override.h index 24606d3c3d..4648fb0ced 100644 --- a/include/charger_profile_override.h +++ b/include/charger_profile_override.h @@ -8,7 +8,7 @@ #ifndef __CROS_EC_CHARGER_PROFILE_OVERRIDE_H #define __CROS_EC_CHARGER_PROFILE_OVERRIDE_H -#include "charge_state_v2.h" +#include "charge_state.h" #define TEMPC_TENTHS_OF_DEG(c) ((c)*10) diff --git a/zephyr/program/corsola/src/usbc.c b/zephyr/program/corsola/src/usbc.c index 181b3df141..71c02ff54f 100644 --- a/zephyr/program/corsola/src/usbc.c +++ b/zephyr/program/corsola/src/usbc.c @@ -6,7 +6,7 @@ /* Corsola baseboard-specific USB-C configuration */ #include "baseboard_usbc_config.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "ec_commands.h" #include "extpower.h" diff --git a/zephyr/program/geralt/src/usbc_config.c b/zephyr/program/geralt/src/usbc_config.c index 64a55ffb75..f0c56c5a8b 100644 --- a/zephyr/program/geralt/src/usbc_config.c +++ b/zephyr/program/geralt/src/usbc_config.c @@ -6,7 +6,7 @@ /* Geralt baseboard-specific USB-C configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "driver/tcpm/it83xx_pd.h" #include "gpio.h" diff --git a/zephyr/program/intelrvp/src/chg_usb_pd.c b/zephyr/program/intelrvp/src/chg_usb_pd.c index 084617cb98..1b2c1a8736 100644 --- a/zephyr/program/intelrvp/src/chg_usb_pd.c +++ b/zephyr/program/intelrvp/src/chg_usb_pd.c @@ -6,7 +6,7 @@ /* Common USB PD charge configuration */ #include "charge_manager.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "gpio.h" #include "hooks.h" #include "intelrvp.h" diff --git a/zephyr/program/myst/src/usbc_config.c b/zephyr/program/myst/src/usbc_config.c index 8167dec2f9..5d2401a6af 100644 --- a/zephyr/program/myst/src/usbc_config.c +++ b/zephyr/program/myst/src/usbc_config.c @@ -9,7 +9,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "cros_board_info.h" #include "cros_cbi.h" diff --git a/zephyr/program/nissa/craask/src/usbc.c b/zephyr/program/nissa/craask/src/usbc.c index 88fc54d3a3..5df3a09bb8 100644 --- a/zephyr/program/nissa/craask/src/usbc.c +++ b/zephyr/program/nissa/craask/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/joxer/src/usbc.c b/zephyr/program/nissa/joxer/src/usbc.c index e3e18e0f33..54fea2f663 100644 --- a/zephyr/program/nissa/joxer/src/usbc.c +++ b/zephyr/program/nissa/joxer/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/sm5803.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/zephyr/program/nissa/nereid/src/usbc.c b/zephyr/program/nissa/nereid/src/usbc.c index e3e18e0f33..54fea2f663 100644 --- a/zephyr/program/nissa/nereid/src/usbc.c +++ b/zephyr/program/nissa/nereid/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/sm5803.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/zephyr/program/nissa/nivviks/src/usbc.c b/zephyr/program/nissa/nivviks/src/usbc.c index 88fc54d3a3..5df3a09bb8 100644 --- a/zephyr/program/nissa/nivviks/src/usbc.c +++ b/zephyr/program/nissa/nivviks/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/pujjo/src/usbc.c b/zephyr/program/nissa/pujjo/src/usbc.c index 59d876c4db..0b5fe3b809 100644 --- a/zephyr/program/nissa/pujjo/src/usbc.c +++ b/zephyr/program/nissa/pujjo/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/src/common.c b/zephyr/program/nissa/src/common.c index def29ccd02..aaca2ecc6b 100644 --- a/zephyr/program/nissa/src/common.c +++ b/zephyr/program/nissa/src/common.c @@ -4,7 +4,7 @@ */ #include "battery.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "chipset.h" #include "hooks.h" diff --git a/zephyr/program/nissa/uldren/src/usbc.c b/zephyr/program/nissa/uldren/src/usbc.c index aaba5492dd..33c63472e8 100644 --- a/zephyr/program/nissa/uldren/src/usbc.c +++ b/zephyr/program/nissa/uldren/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/xivu/src/usbc.c b/zephyr/program/nissa/xivu/src/usbc.c index 6b95a3b1f4..d77abf37db 100644 --- a/zephyr/program/nissa/xivu/src/usbc.c +++ b/zephyr/program/nissa/xivu/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/xivur/src/usbc.c b/zephyr/program/nissa/xivur/src/usbc.c index 639bd3adbb..a0bd74b3a6 100644 --- a/zephyr/program/nissa/xivur/src/usbc.c +++ b/zephyr/program/nissa/xivur/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/isl923x_public.h" #include "driver/retimer/anx7483_public.h" diff --git a/zephyr/program/nissa/yaviks/src/usbc.c b/zephyr/program/nissa/yaviks/src/usbc.c index a4cb140059..307109fa9d 100644 --- a/zephyr/program/nissa/yaviks/src/usbc.c +++ b/zephyr/program/nissa/yaviks/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/sm5803.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/zephyr/program/nissa/yavilla/src/usbc.c b/zephyr/program/nissa/yavilla/src/usbc.c index e3b46d6daa..3cbdd23625 100644 --- a/zephyr/program/nissa/yavilla/src/usbc.c +++ b/zephyr/program/nissa/yavilla/src/usbc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "chipset.h" #include "driver/charger/sm5803.h" #include "driver/tcpm/it83xx_pd.h" diff --git a/zephyr/program/rex/src/usbc_config.c b/zephyr/program/rex/src/usbc_config.c index d2471c3daf..115d010ff5 100644 --- a/zephyr/program/rex/src/usbc_config.c +++ b/zephyr/program/rex/src/usbc_config.c @@ -7,7 +7,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "driver/charger/isl9241.h" #include "driver/ppc/nx20p348x.h" diff --git a/zephyr/program/skyrim/src/usbc_config.c b/zephyr/program/skyrim/src/usbc_config.c index ab1d444df8..922e863027 100644 --- a/zephyr/program/skyrim/src/usbc_config.c +++ b/zephyr/program/skyrim/src/usbc_config.c @@ -9,7 +9,6 @@ #include "charge_manager.h" #include "charge_ramp.h" #include "charge_state.h" -#include "charge_state_v2.h" #include "charger.h" #include "cros_board_info.h" #include "cros_cbi.h" diff --git a/zephyr/test/drivers/common/src/stubs.c b/zephyr/test/drivers/common/src/stubs.c index cdb1a0f6a4..c623b95a82 100644 --- a/zephyr/test/drivers/common/src/stubs.c +++ b/zephyr/test/drivers/common/src/stubs.c @@ -7,7 +7,7 @@ #include "battery_fuel_gauge.h" #include "bc12/pi3usb9201_public.h" #include "charge_ramp.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "charger.h" #include "charger/isl923x_public.h" #include "charger/isl9241_public.h" diff --git a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c index 9dfeb5e734..a62ec2b0ea 100644 --- a/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c +++ b/zephyr/test/drivers/common_charger/src/test_charge_state_v2.c @@ -4,7 +4,7 @@ */ #include "battery.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "math_util.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c index ce47ff8042..07e15ea1f6 100644 --- a/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c +++ b/zephyr/test/drivers/default/src/charge_state_prevent_power_on.c @@ -4,7 +4,6 @@ */ #include "charge_state.h" -#include "charge_state_v2.h" #include "test/drivers/test_state.h" #include <zephyr/ztest.h> diff --git a/zephyr/test/drivers/default/src/console_cmd/charge_state.c b/zephyr/test/drivers/default/src/console_cmd/charge_state.c index 8cfd11324f..851725af36 100644 --- a/zephyr/test/drivers/default/src/console_cmd/charge_state.c +++ b/zephyr/test/drivers/default/src/console_cmd/charge_state.c @@ -4,7 +4,6 @@ */ #include "charge_state.h" -#include "charge_state_v2.h" #include "console.h" #include "ec_commands.h" #include "test/drivers/test_state.h" diff --git a/zephyr/test/drivers/dps/src/dps_selection.c b/zephyr/test/drivers/dps/src/dps_selection.c index 4fd0175ffa..bc897ae0bb 100644 --- a/zephyr/test/drivers/dps/src/dps_selection.c +++ b/zephyr/test/drivers/dps/src/dps_selection.c @@ -4,7 +4,7 @@ */ #include "battery.h" -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "dps.h" #include "ec_commands.h" diff --git a/zephyr/test/ocpc/src/ocpc.c b/zephyr/test/ocpc/src/ocpc.c index dd7e2733e7..5d0da0c117 100644 --- a/zephyr/test/ocpc/src/ocpc.c +++ b/zephyr/test/ocpc/src/ocpc.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "charge_state_v2.h" +#include "charge_state.h" #include "console.h" #include "host_command.h" #include "ocpc.h" |