zephyr:test: Rename/refactor partner connect functions.

Clean up the naming of the partner connect/disconnect
functions.

BUG=b:223449451
BRANCH=none
TEST=zmake test test-drivers

Signed-off-by: Al Semjonovs <asemjonovs@google.com>
Change-Id: I575e30ee98206160e6fefa5369f1512daf8749a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3584686
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>

1 files changed, 31 insertions, 33 deletions

diff --git a/zephyr/test/drivers/src/integration/usbc/usb_pd_ctrl_msg.c b/zephyr/test/drivers/src/integration/usbc/usb_pd_ctrl_msg.c
index 502df3a61a..ea8a84117a 100644
--- a/zephyr/test/drivers/src/integration/usbc/usb_pd_ctrl_msg.c
+++ b/zephyr/test/drivers/src/integration/usbc/usb_pd_ctrl_msg.c
@@ -16,7 +16,7 @@
 #include "test/drivers/utils.h"
 #include "usb_pd.h"
 
-#define SNK_PORT USBC_PORT_C0
+#define TEST_USB_PORT USBC_PORT_C0
 
 #define TCPCI_EMUL_LABEL DT_NODELABEL(tcpci_emul)
 
@@ -35,35 +35,32 @@ struct usb_pd_ctrl_msg_test_source_fixture {
 	struct usb_pd_ctrl_msg_test_fixture fixture;
 };
 
-static void connect_sink_to_port(struct usb_pd_ctrl_msg_test_fixture *fixture)
+static void tcpci_drp_emul_connect_partner(struct tcpci_drp_emul *partner_emul,
+					   const struct emul *tcpci_emul,
+					   const struct emul *charger_emul)
 {
 	/*
 	 * TODO(b/221439302) Updating the TCPCI emulator registers, updating the
 	 *   vbus, as well as alerting should all be a part of the connect
 	 *   function.
 	 */
-	isl923x_emul_set_adc_vbus(fixture->charger_emul, 0);
-	zassume_ok(tcpci_emul_set_reg(fixture->tcpci_emul,
-				      TCPC_REG_POWER_STATUS,
-				      TCPC_REG_POWER_STATUS_VBUS_DET),
-		   NULL);
-	zassume_ok(tcpci_emul_set_reg(fixture->tcpci_emul, TCPC_REG_EXT_STATUS,
-				      TCPC_REG_EXT_STATUS_SAFE0V),
-		   NULL);
+	isl923x_emul_set_adc_vbus(charger_emul, 0);
+	tcpci_emul_set_reg(tcpci_emul, TCPC_REG_POWER_STATUS,
+			   TCPC_REG_POWER_STATUS_VBUS_DET);
+
+	tcpci_emul_set_reg(tcpci_emul, TCPC_REG_EXT_STATUS,
+			   TCPC_REG_EXT_STATUS_SAFE0V);
 
-	tcpci_tcpc_alert(USBC_PORT_C0);
+	tcpci_tcpc_alert(TEST_USB_PORT);
 
 	zassume_ok(tcpci_drp_emul_connect_to_tcpci(
-			   &fixture->partner_emul.data,
-			   &fixture->partner_emul.src_data,
-			   &fixture->partner_emul.snk_data,
-			   &fixture->partner_emul.common_data,
-			   &fixture->partner_emul.ops, fixture->tcpci_emul),
+			   &partner_emul->data, &partner_emul->src_data,
+			   &partner_emul->snk_data, &partner_emul->common_data,
+			   &partner_emul->ops, tcpci_emul),
 		   NULL);
 }
 
-static void
-disconnect_sink_from_port(struct usb_pd_ctrl_msg_test_fixture *fixture)
+static void disconnect_partner(struct usb_pd_ctrl_msg_test_fixture *fixture)
 {
 	zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul), NULL);
 	k_sleep(K_SECONDS(1));
@@ -119,18 +116,19 @@ static void usb_pd_ctrl_msg_before(void *data)
 	/* TODO(b/214401892): Check why need to give time TCPM to spin */
 	k_sleep(K_SECONDS(1));
 
-	/* Initialized the sink to request 5V and 3A */
 	tcpci_drp_emul_init(&fixture->partner_emul);
 
 	fixture->partner_emul.data.sink = fixture->drp_partner_is_sink;
 
 	/* Turn TCPCI rev 2 ON */
-	tcpc_config[SNK_PORT].flags |= TCPC_FLAGS_TCPCI_REV2_0;
+	tcpc_config[TEST_USB_PORT].flags |= TCPC_FLAGS_TCPCI_REV2_0;
 
 	/* Reset to disconnected state */
-	disconnect_sink_from_port(fixture);
+	disconnect_partner(fixture);
 
-	connect_sink_to_port(fixture);
+	tcpci_drp_emul_connect_partner(&fixture->partner_emul,
+				       fixture->tcpci_emul,
+				       fixture->charger_emul);
 
 	k_sleep(K_SECONDS(10));
 }
@@ -139,7 +137,7 @@ static void usb_pd_ctrl_msg_after(void *data)
 {
 	struct usb_pd_ctrl_msg_test_fixture *fixture = data;
 
-	disconnect_sink_from_port(fixture);
+	disconnect_partner(fixture);
 }
 
 /** ZTEST_SUITE to setup DRP partner_emul as SINK */
@@ -158,7 +156,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_vconn_swap)
 	struct ec_response_typec_status snk_resp = { 0 };
 	int rv = 0;
 
-	snk_resp = host_cmd_typec_status(SNK_PORT);
+	snk_resp = host_cmd_typec_status(TEST_USB_PORT);
 
 	zassert_equal(PD_ROLE_VCONN_SRC, snk_resp.vconn_role,
 		      "SNK Returned vconn_role=%u", snk_resp.vconn_role);
@@ -170,7 +168,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_vconn_swap)
 
 	k_sleep(K_SECONDS(1));
 
-	snk_resp = host_cmd_typec_status(SNK_PORT);
+	snk_resp = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_VCONN_OFF, snk_resp.vconn_role,
 		      "SNK Returned vconn_role=%u", snk_resp.vconn_role);
 }
@@ -181,7 +179,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_pr_swap)
 	struct ec_response_typec_status snk_resp = { 0 };
 	int rv = 0;
 
-	snk_resp = host_cmd_typec_status(SNK_PORT);
+	snk_resp = host_cmd_typec_status(TEST_USB_PORT);
 
 	zassert_equal(PD_ROLE_SINK, snk_resp.power_role,
 		      "SNK Returned power_role=%u", snk_resp.power_role);
@@ -204,7 +202,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_pr_swap)
 
 	k_sleep(K_MSEC(20));
 
-	snk_resp = host_cmd_typec_status(SNK_PORT);
+	snk_resp = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_SOURCE, snk_resp.power_role,
 		      "SNK Returned power_role=%u", snk_resp.power_role);
 }
@@ -222,7 +220,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_pr_swap)
 ZTEST_F(usb_pd_ctrl_msg_test_sink, verify_dr_swap)
 {
 	struct ec_response_typec_status typec_status =
-		host_cmd_typec_status(SNK_PORT);
+		host_cmd_typec_status(TEST_USB_PORT);
 
 	zassert_equal(PD_ROLE_DFP, typec_status.data_role,
 		      "Returned data_role=%u", typec_status.data_role);
@@ -247,7 +245,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dr_swap_rejected)
 	struct ec_response_typec_status typec_status = { 0 };
 	int rv = 0;
 
-	typec_status = host_cmd_typec_status(SNK_PORT);
+	typec_status = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_DFP, typec_status.data_role,
 		      "Returned data_role=%u", typec_status.data_role);
 
@@ -259,7 +257,7 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dr_swap_rejected)
 	k_sleep(K_MSEC(20));
 
 	/* Verify DR_Swap request is REJECTED */
-	typec_status = host_cmd_typec_status(SNK_PORT);
+	typec_status = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_DFP, typec_status.data_role,
 		      "Returned data_role=%u", typec_status.data_role);
 }
@@ -281,14 +279,14 @@ ZTEST_F(usb_pd_ctrl_msg_test_source, verify_dpm_dr_swap)
 {
 	struct ec_response_typec_status typec_status = { 0 };
 
-	typec_status = host_cmd_typec_status(SNK_PORT);
+	typec_status = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_DFP, typec_status.data_role,
 		      "Returned data_role=%u", typec_status.data_role);
 
-	pd_dpm_request(SNK_PORT, DPM_REQUEST_DR_SWAP);
+	pd_dpm_request(TEST_USB_PORT, DPM_REQUEST_DR_SWAP);
 	k_sleep(K_SECONDS(1));
 
-	typec_status = host_cmd_typec_status(SNK_PORT);
+	typec_status = host_cmd_typec_status(TEST_USB_PORT);
 	zassert_equal(PD_ROLE_UFP, typec_status.data_role,
 		      "Returned data_role=%u", typec_status.data_role);
 }