From 67debcce5555daf1c24e1eada34f7607bf041308 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 8 May 2023 15:20:07 -0600 Subject: charger: Rename enum charge_state to led_pwr_state This name is confusing, since its members start with PWR_ and the comment for enum charge_state_v2 says that these values are only used to control the LEDs, with one not-quite-correct exception, whatever that might be. We could rename it to power_state, but that is already fairly widely used as a variable in the code base. Also it seems better to match the enum PWR_ prefix. Future work may rename the members too. Rename the charge_state enum. This makes no functional change. BUG=b:218332694 TEST=make buildall Change-Id: If8a7cc73dcfb4c1e89984e57fc55e432416e8aec Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516187 Commit-Queue: Simon Glass Reviewed-by: Paul Fagerburg Reviewed-by: Daisuke Nojiri Tested-by: Simon Glass --- test/sbs_charging_v2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/sbs_charging_v2.c') diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index f47e349672..0b12aea739 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -124,7 +124,7 @@ 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(); @@ -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 */ @@ -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; -- cgit v1.2.1 From 47acf64182ccc833bb590c6d307d6e7c66a93360 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 8 May 2023 16:01:39 -0600 Subject: charger: Rename charge_get_state() to led_pwr_get_state() We have a new 'charge state' in struct charge_state_data as part of the charge_state_v2.h file. This is confusing. Rename this function to match the enum it is referencing. This makes no functional change. BUG=b:218332694 TEST=make buildall Change-Id: I7f08dd4fb11e2939e0ef779018c1e3206ebc8d20 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4516188 Commit-Queue: Simon Glass Tested-by: Simon Glass Reviewed-by: Aaron Massey --- test/sbs_charging_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/sbs_charging_v2.c') diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index 0b12aea739..482770ff1c 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -127,7 +127,7 @@ test_static int wait_charging_state(void) 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; } @@ -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; -- cgit v1.2.1