diff options
author | Denis Brockus <dbrockus@chromium.org> | 2020-01-08 06:54:30 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-01-09 19:24:10 +0000 |
commit | d3a1820df21b12842232ab88a5c1a0490640bb25 (patch) | |
tree | b0855ad62d8c5f42178cec6cf9038563c9253fb1 /test | |
parent | a6591e9d5c7caa04f94e604d8a649d9f8e6d5b5b (diff) | |
download | chrome-ec-d3a1820df21b12842232ab88a5c1a0490640bb25.tar.gz |
pd: cleanup pd_get_role
pd_get_role in the TCPMv1 stack meant pd_get_power_role.
pd_get_role in the TCPMv2 stack meant pd_get_data_role.
This CL will clean that up and make them the correct naming.
pd_get_power_role will also return an enum pd_power_role
type instead of an int.
BUG=b:147290482
BRANCH=none
TEST=make buildall -j
Change-Id: I73ee465401ccd050c2bd151f2fc043a59d95e079
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1991844
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/charge_manager.c | 32 | ||||
-rw-r--r-- | test/fake_usbc.c | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/test/charge_manager.c b/test/charge_manager.c index 9ac87aa11d..08d640cbb0 100644 --- a/test/charge_manager.c +++ b/test/charge_manager.c @@ -36,7 +36,7 @@ static unsigned int active_charge_limit = CHARGE_SUPPLIER_NONE; static unsigned int active_charge_port = CHARGE_PORT_NONE; static unsigned int charge_port_to_reject = CHARGE_PORT_NONE; static int new_power_request[CONFIG_USB_PD_PORT_MAX_COUNT]; -static int power_role[CONFIG_USB_PD_PORT_MAX_COUNT]; +static enum pd_power_role power_role[CONFIG_USB_PD_PORT_MAX_COUNT]; /* Callback functions called by CM on state change */ void board_set_charge_limit(int port, int supplier, int charge_ma, @@ -82,7 +82,7 @@ static void pd_set_role(int port, int role) power_role[port] = role; } -int pd_get_role(int port) +enum pd_power_role pd_get_power_role(int port) { return power_role[port]; } @@ -465,7 +465,7 @@ static int test_override(void) charge_manager_update_dualrole(0, CAP_DUALROLE); charge_manager_set_override(OVERRIDE_DONT_CHARGE); wait_for_charge_manager_refresh(); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); /* * Verify that an override request to a dual-role source port @@ -478,14 +478,14 @@ static int test_override(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 200); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SINK); /* Set override to "don't charge", then verify we're not charging */ charge_manager_set_override(OVERRIDE_DONT_CHARGE); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); /* Update a charge supplier, verify that we still aren't charging */ charge.current = 200; @@ -493,14 +493,14 @@ static int test_override(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); /* Turn override off, verify that we go back to the correct charge */ charge_manager_set_override(OVERRIDE_OFF); wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 500); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); return EC_SUCCESS; } @@ -533,7 +533,7 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 500); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SINK); /* Remove override and verify we go back to previous state */ charge_manager_set_override(OVERRIDE_OFF); @@ -544,7 +544,7 @@ static int test_dual_role(void) #else TEST_ASSERT(active_charge_port == CHARGE_PORT_NONE); TEST_ASSERT(active_charge_limit == 0); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); #endif /* Mark P0 as the override port, verify that we again charge. */ @@ -554,7 +554,7 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 550); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SINK); /* * Insert a dual-role charger into P1 and set the override. Verify @@ -567,8 +567,8 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 500); - TEST_ASSERT(pd_get_role(1) == PD_ROLE_SINK); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(1) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); /* Set override back to P0 and verify switch */ charge_manager_set_override(0); @@ -577,8 +577,8 @@ static int test_dual_role(void) wait_for_charge_manager_refresh(); TEST_ASSERT(active_charge_port == 0); TEST_ASSERT(active_charge_limit == 600); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SINK); - TEST_ASSERT(pd_get_role(1) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SINK); + TEST_ASSERT(pd_get_power_role(1) == PD_ROLE_SOURCE); /* Insert a dedicated charger and verify override is removed */ charge.current = 0; @@ -594,7 +594,7 @@ static int test_dual_role(void) #else TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 400); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); #endif /* @@ -633,7 +633,7 @@ static int test_dual_role(void) */ TEST_ASSERT(active_charge_port == 1); TEST_ASSERT(active_charge_limit == 200); - TEST_ASSERT(pd_get_role(0) == PD_ROLE_SOURCE); + TEST_ASSERT(pd_get_power_role(0) == PD_ROLE_SOURCE); #endif return EC_SUCCESS; diff --git a/test/fake_usbc.c b/test/fake_usbc.c index aab7f0a7ed..ef32e60d91 100644 --- a/test/fake_usbc.c +++ b/test/fake_usbc.c @@ -132,7 +132,7 @@ enum pd_dual_role_states pd_get_dual_role(int port) return PD_DRP_TOGGLE_ON; } -__overridable int pd_get_role(int port) +__overridable enum pd_power_role pd_get_power_role(int port) { return PD_ROLE_SINK; } |