diff options
| author | YH Lin <yueherngl@google.com> | 2023-05-11 20:47:00 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2023-05-11 20:47:00 +0000 |
| commit | 8641442366bd7c2c133e302a57f904dfac3c896b (patch) | |
| tree | d0dca100ca02a89210decc54b7124d26bb75ef6a /test/sbs_charging_v2.c | |
| parent | e79a9dab1721c3d7da1475f3f802c4ea871a48ec (diff) | |
| parent | 5df400b0377c9e1b5bb6cfc53ba7dfedde91f944 (diff) | |
| download | chrome-ec-8641442366bd7c2c133e302a57f904dfac3c896b.tar.gz | |
Merge remote-tracking branch cros/main into firmware-brya-14505.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt firmware-brya-14505.B-main
Relevant changes:
git log --oneline e79a9dab17..5df400b037 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/hades board/kano board/marasov board/mithrax
board/omnigul 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
76d2b9b1e4 battery: Deprecate CONFIG_BATTERY_LEVEL_NEAR_FULL
3d5b996f73 Hades: Fast forward DSW_PWROK to PCH_PWROK
56af450c1a Agah: Fast forward DSW_PWROK to PCH_PWROK
b729eab7c7 charger: Move charger_state_v2.h into charge_state.h
47acf64182 charger: Rename charge_get_state() to led_pwr_get_state()
632c7c935a power/x86: Add dedicated interrupt handler for pwrok
0fff3a0bd4 omnigul: Add condition use Accel and Gyro by FWCONFIG.
7540daff3f driver/tcpm/nct38xx: Remove write to RO register
3f279f30d4 GPU: Rename DC_ATLEAST_SOC to DC_ATMOST_SOC
BRANCH=None
BUG=b:218332694 b:216485035 b:280818345 b:280351196 b:280001153
BUG=b:279918234
TEST=`emerge-[brya,hades,draco] chromeos-ec`
Force-Relevant-Builds: all
Change-Id: I19f2f6c5573d8c748ac63b488a808f10de352b1d
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'test/sbs_charging_v2.c')
| -rw-r--r-- | test/sbs_charging_v2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index f47e349672..482770ff1c 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -124,10 +124,10 @@ enum ec_status charger_profile_override_set_param(uint32_t param, test_static int wait_charging_state(void) { - enum charge_state state; + enum led_pwr_state state; task_wake(TASK_ID_CHARGER); msleep(WAIT_CHARGER_TASK); - state = charge_get_state(); + state = led_pwr_get_state(); ccprintf("[CHARGING TEST] state = %d\n", state); return state; } @@ -206,7 +206,7 @@ test_static void ev_clear(int event) test_static int test_charge_state(void) { - enum charge_state state; + enum led_pwr_state state; uint32_t flags; /* On AC */ @@ -504,7 +504,7 @@ test_static int test_external_funcs(void) TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE)); /* and the rest */ - TEST_ASSERT(charge_get_state() == PWR_STATE_CHARGE); + TEST_ASSERT(led_pwr_get_state() == PWR_STATE_CHARGE); TEST_ASSERT(!charge_want_shutdown()); TEST_ASSERT(charge_get_percent() == 50); temp = 0; @@ -519,7 +519,7 @@ test_static int test_external_funcs(void) #define CHG_OPT2 0x4000 test_static int test_hc_charge_state(void) { - enum charge_state state; + enum led_pwr_state state; int i, rv, tmp; struct ec_params_charge_state params; struct ec_response_charge_state resp; |