diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-11-14 13:13:50 +1100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-29 01:05:08 +0000 |
| commit | 57b32569630025bea009a13fc46d1354debe3fdc (patch) | |
| tree | 8ceba06e674bbbcd60575e392b109d122e379c68 /zephyr/test | |
| parent | 1497d466220fc32f5d857883c4902a43c394059c (diff) | |
| download | chrome-ec-57b32569630025bea009a13fc46d1354debe3fdc.tar.gz | |
Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
"Default input current" is not a very clear name, so rename this option to
better express its use as a default value that is set in the charger.
This is made possible by splitting other uses into
CHARGER_MIN_INPUT_CURRENT_LIMIT, making the only use for
CHARGER_INPUT_CURRENT be as a default.
BUG=b:163093572
TEST=make buildall; zmake build -a
BRANCH=none
LOW_COVERAGE_REASON=isl9241 and sm5803 currently lack emulators
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: Ia9c1df9061825b15477466e85343afeb2a371288
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4025404
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/test')
6 files changed, 11 insertions, 11 deletions
diff --git a/zephyr/test/drivers/bc12_pi3usb9201/src/pi3usb9201.c b/zephyr/test/drivers/bc12_pi3usb9201/src/pi3usb9201.c index a384fb1e0a..0f9e7cbbeb 100644 --- a/zephyr/test/drivers/bc12_pi3usb9201/src/pi3usb9201.c +++ b/zephyr/test/drivers/bc12_pi3usb9201/src/pi3usb9201.c @@ -75,7 +75,7 @@ static const struct bc12_status bc12_chg_limits[] = { [CHG_RESERVED] = { .supplier = CHARGE_SUPPLIER_NONE, /* Not charging, limit is set to default */ .current_limit = - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT }, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT }, [CHG_CDP] = { .supplier = CHARGE_SUPPLIER_BC12_CDP, .current_limit = USB_CHARGER_MAX_CURR_MA }, [CHG_SDP] = { .supplier = CHARGE_SUPPLIER_BC12_SDP, @@ -212,7 +212,7 @@ test_bc12_pi3usb9201_client_mode(enum pi3usb9201_client_sts detect_result, zassert_equal(charge_manager_get_supplier(), CHARGE_SUPPLIER_NONE, NULL); zassert_equal(charge_manager_get_charger_current(), - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT); + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT); zassert_equal(charge_manager_get_charger_voltage(), 0); } diff --git a/zephyr/test/drivers/common_charger/src/test_common_charger.c b/zephyr/test/drivers/common_charger/src/test_common_charger.c index eb7d6f1f08..46403636d6 100644 --- a/zephyr/test/drivers/common_charger/src/test_common_charger.c +++ b/zephyr/test/drivers/common_charger/src/test_common_charger.c @@ -50,7 +50,7 @@ ZTEST(common_charger, test_chg_ramp_is_detected) ZTEST(common_charger, test_chg_ramp_get_current_limit) { zassert_equal(chg_ramp_get_current_limit(), - CONFIG_CHARGER_INPUT_CURRENT); + CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT); } ZTEST(common_charger, test_charger_get_min_bat_pct_for_power_on) diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c index 10ade25222..f2afa5be9a 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -176,9 +176,9 @@ ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_charge_state) "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, charge_state.get_state.chg_input_current); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c index 218ef9550e..6795e72c11 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_sink.c @@ -159,9 +159,9 @@ ZTEST_F(usb_attach_5v_3a_pd_sink, test_disconnect_charge_state) "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, charge_state.get_state.chg_input_current); } diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c index 325b8aee8c..c57054881d 100644 --- a/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_5v_3a_pd_source.c @@ -172,9 +172,9 @@ ZTEST_F(usb_attach_5v_3a_pd_source, test_disconnect_charge_state) "Max charge current expected 0mA, but was %dmA", charge_state.get_state.chg_current); zassert_equal(charge_state.get_state.chg_input_current, - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, "Charge input current limit expected %dmA, but was %dmA", - CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + CONFIG_PLATFORM_EC_CHARGER_DEFAULT_CURRENT_LIMIT, charge_state.get_state.chg_input_current); } diff --git a/zephyr/test/drivers/default/src/isl923x.c b/zephyr/test/drivers/default/src/isl923x.c index 72aad72cd9..1393466c76 100644 --- a/zephyr/test/drivers/default/src/isl923x.c +++ b/zephyr/test/drivers/default/src/isl923x.c @@ -681,9 +681,9 @@ ZTEST(isl923x, test_init_late_jump) isl923x_drv.get_input_current_limit(CHARGER_NUM, &input_current), "Could not read input current limit."); - zassert_equal(CONFIG_CHARGER_INPUT_CURRENT, input_current, + zassert_equal(CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT, input_current, "Input current (%d) not at (%d)", input_current, - CONFIG_CHARGER_INPUT_CURRENT); + CONFIG_CHARGER_DEFAULT_CURRENT_LIMIT); } ZTEST(isl923x, test_isl923x_is_acok) |