diff options
author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:17:55 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:18 +0000 |
commit | dd732876495ed4942d00b9f9ca8dd3b01bad7120 (patch) | |
tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/test/drivers/host_cmd/src/charge_manager.c | |
parent | 184d13e77614be3be5374d3fef9d1edf66ec8687 (diff) | |
download | chrome-ec-dd732876495ed4942d00b9f9ca8dd3b01bad7120.tar.gz |
Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main
This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'zephyr/test/drivers/host_cmd/src/charge_manager.c')
-rw-r--r-- | zephyr/test/drivers/host_cmd/src/charge_manager.c | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/zephyr/test/drivers/host_cmd/src/charge_manager.c b/zephyr/test/drivers/host_cmd/src/charge_manager.c index 6bbf7a3ae3..7298b8e135 100644 --- a/zephyr/test/drivers/host_cmd/src/charge_manager.c +++ b/zephyr/test/drivers/host_cmd/src/charge_manager.c @@ -3,12 +3,12 @@ * found in the LICENSE file. */ +#include <zephyr/ztest.h> + #include "charge_manager.h" #include "host_command.h" #include "test/drivers/test_state.h" -#include <zephyr/ztest.h> - ZTEST_USER(charge_manager, test_port_count) { struct ec_response_charge_port_count response = { 0 }; @@ -44,49 +44,5 @@ ZTEST_USER(charge_manager, test_port_override__0_from_off) zassert_ok(host_command_process(&args)); } -ZTEST_USER(charge_manager, test_charge_state_get_debug_params) -{ - struct ec_params_charge_state params = { - .cmd = CHARGE_STATE_CMD_GET_PARAM, - }; - struct ec_response_charge_state response = { 0 }; - struct host_cmd_handler_args args = - BUILD_HOST_COMMAND(EC_CMD_CHARGE_STATE, 0, response, params); - - /* Check that the following get commands work on these debug parameters. - * The values being asserted are the default values when nothing is - * plugged in. This should be enough since the test only needs to verify - * that the command gets the current value. Tests that verify the - * charging behavior exist elsewhere (under - * default/src/integration/usbc). - */ - params.get_param.param = CS_PARAM_DEBUG_CTL_MODE; - zassert_ok(host_command_process(&args)); - zassert_equal(0, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_MANUAL_CURRENT; - zassert_ok(host_command_process(&args)); - zassert_equal(0xffffffff, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_MANUAL_VOLTAGE; - zassert_ok(host_command_process(&args)); - zassert_equal(0xffffffff, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_SEEMS_DEAD; - zassert_ok(host_command_process(&args)); - zassert_equal(0, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_SEEMS_DISCONNECTED; - zassert_ok(host_command_process(&args)); - zassert_equal(0, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_BATT_REMOVED; - zassert_ok(host_command_process(&args)); - zassert_equal(0, response.get_param.value); - - params.get_param.param = CS_PARAM_DEBUG_MAX; - zassert_equal(EC_ERROR_INVAL, host_command_process(&args)); -} - ZTEST_SUITE(charge_manager, drivers_predicate_post_main, NULL, NULL, NULL, NULL); |