TCPM: Remove enum pd_msg_type

Convert usages of this enum to tcpm_sop_type.

BUG=b:155476419
TEST=make buildall
BRANCH=none

Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: I5fed273d72e7ad0e191db0cb0d121b70bdd9ecdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3104291
Reviewed-by: Keith Short <keithshort@chromium.org>

21 files changed, 57 insertions, 65 deletions

diff --git a/common/mock/tcpci_i2c_mock.c b/common/mock/tcpci_i2c_mock.c
index f11d12c7d6..2df24586af 100644
--- a/common/mock/tcpci_i2c_mock.c
+++ b/common/mock/tcpci_i2c_mock.c
@@ -362,7 +362,7 @@ int verify_tcpci_possible_tx(struct possible_tx possible[],
 	return EC_ERROR_TIMEOUT;
 }
 
-void mock_tcpci_receive(enum pd_msg_type sop, uint16_t header,
+void mock_tcpci_receive(enum tcpm_sop_type sop, uint16_t header,
 			uint32_t *payload)
 {
 	int i;
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c
index 325af57af8..fd933d655e 100644
--- a/common/usb_pd_tcpc.c
+++ b/common/usb_pd_tcpc.c
@@ -721,11 +721,11 @@ int pd_analyze_rx(int port, uint32_t *payload)
 #ifdef CONFIG_USB_PD_DECODE_SOP
 	/* Encode message address */
 	if (val == PD_SOP) {
-		phs.head |= PD_HEADER_SOP(PD_MSG_SOP);
+		phs.head |= PD_HEADER_SOP(TCPC_TX_SOP);
 	} else if (val == PD_SOP_PRIME) {
-		phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME);
+		phs.head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME);
 	} else if (val == PD_SOP_PRIME_PRIME) {
-		phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME_PRIME);
+		phs.head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME_PRIME);
 	} else {
 		msg = "SOP*";
 		goto packet_err;
diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c
index c09854bb46..f36248e8ac 100644
--- a/common/usbc/usb_prl_sm.c
+++ b/common/usbc/usb_prl_sm.c
@@ -2183,7 +2183,7 @@ static void prl_rx_wait_for_phy_message(const int port, int evt)
 	 */
 	if (!IS_ENABLED(CONFIG_USB_CTVPD) &&
 	    !IS_ENABLED(CONFIG_USB_VPD) &&
-	    PD_HEADER_GET_SOP(header) != PD_MSG_SOP &&
+	    PD_HEADER_GET_SOP(header) != TCPC_TX_SOP &&
 	    PD_HEADER_PROLE(header) == PD_PLUG_FROM_DFP_UFP)
 		return;
 
diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c
index 3653866673..34e7800daf 100644
--- a/driver/tcpm/anx74xx.c
+++ b/driver/tcpm/anx74xx.c
@@ -1026,9 +1026,9 @@ void anx74xx_tcpc_alert(int port)
 
 #ifdef CONFIG_USB_PD_DECODE_SOP
 	if (reg & ANX74XX_REG_EXT_SOP)
-		msg_sop[port] = PD_MSG_SOP;
+		msg_sop[port] = TCPC_TX_SOP;
 	else if (reg & ANX74XX_REG_EXT_SOP_PRIME)
-		msg_sop[port] = PD_MSG_SOP_PRIME;
+		msg_sop[port] = TCPC_TX_SOP_PRIME;
 #endif
 
 	/* Check for Hard Reset done bit */
@@ -1043,7 +1043,7 @@ void anx74xx_tcpc_alert(int port)
 
 #ifdef CONFIG_USB_PD_DECODE_SOP
 	if (reg & ANX74XX_REG_EXT_SOP_PRIME_PRIME)
-		msg_sop[port] = PD_MSG_SOP_PRIME_PRIME;
+		msg_sop[port] = TCPC_TX_SOP_PRIME_PRIME;
 #endif
 
 	if (reg & ANX74XX_REG_EXT_HARD_RST) {
diff --git a/driver/tcpm/fusb302.c b/driver/tcpm/fusb302.c
index 370e10b713..13df515041 100644
--- a/driver/tcpm/fusb302.c
+++ b/driver/tcpm/fusb302.c
@@ -836,9 +836,9 @@ static int fusb302_tcpm_get_message_raw(int port, uint32_t *payload, int *head)
 			return EC_ERROR_UNKNOWN;
 
 		if (reg & TCPC_REG_STATUS1_RXSOP1)
-			*head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME);
+			*head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME);
 		else if (reg & TCPC_REG_STATUS1_RXSOP2)
-			*head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME_PRIME);
+			*head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME_PRIME);
 	}
 #endif
 
diff --git a/driver/tcpm/it8xxx2.c b/driver/tcpm/it8xxx2.c
index 9f34442bd9..bdf7de0b9f 100644
--- a/driver/tcpm/it8xxx2.c
+++ b/driver/tcpm/it8xxx2.c
@@ -170,7 +170,7 @@ static int it8xxx2_tcpm_get_message_raw(int port, uint32_t *buf, int *head)
 	 * BIT[6:4] SOP type of Rx message
 	 * 000b=SOP, 001b=SOP', 010b=SOP", 011b=Debug SOP', 100b=Debug SOP"
 	 * 101b=HRDRST, 110b=CBLRST
-	 * 000b~100b is aligned to enum pd_msg_type.
+	 * 000b~100b is aligned to enum tcpm_sop_type.
 	 *
 	 */
 	if (IS_ENABLED(CONFIG_USB_PD_DECODE_SOP))
diff --git a/include/mock/tcpci_i2c_mock.h b/include/mock/tcpci_i2c_mock.h
index de813e392c..17dba6dddd 100644
--- a/include/mock/tcpci_i2c_mock.h
+++ b/include/mock/tcpci_i2c_mock.h
@@ -52,7 +52,7 @@ int verify_tcpci_possible_tx(struct possible_tx possible[],
 			     int *msg_len,
 			     int timeout);
 
-void mock_tcpci_receive(enum pd_msg_type sop, uint16_t header,
+void mock_tcpci_receive(enum tcpm_sop_type sop, uint16_t header,
 			uint32_t *payload);
 
 void tcpci_register_dump(void);
diff --git a/include/usb_pd.h b/include/usb_pd.h
index 5200ef4e1c..ae30f75742 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -1305,15 +1305,6 @@ enum cable_outlet {
 #define PD_HEADER_GET_SOP(header) (((header) >> 28) & 0xf)
 #define PD_HEADER_SOP(sop) (((sop) & 0xf) << 28)
 
-enum pd_msg_type {
-	PD_MSG_SOP,
-	PD_MSG_SOP_PRIME,
-	PD_MSG_SOP_PRIME_PRIME,
-	PD_MSG_SOP_DBG_PRIME,
-	PD_MSG_SOP_DBG_PRIME_PRIME,
-	PD_MSG_SOP_CBL_RST,
-};
-
 /* Used for processing pd extended header */
 #define PD_EXT_HEADER_CHUNKED(header)   (((header) >> 15) & 1)
 #define PD_EXT_HEADER_CHUNK_NUM(header) (((header) >> 11) & 0xf)
diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp.c
index 85f2bb7358..84a13a73de 100644
--- a/test/usb_pe_drp.c
+++ b/test/usb_pe_drp.c
@@ -54,7 +54,7 @@ void before_test(void)
  * TODO: Add support for multiple data objects (when a test is added here that
  * needs it).
  */
-test_static void rx_message(enum pd_msg_type sop,
+test_static void rx_message(enum tcpm_sop_type sop,
 			    enum pd_ctrl_msg_type ctrl_msg,
 			    enum pd_data_msg_type data_msg,
 			    enum pd_power_role prole,
@@ -94,7 +94,7 @@ test_static int finish_src_discovery(int startup_cable_probes)
 		EC_SUCCESS, "%d");
 	mock_prl_message_sent(PORT0);
 	task_wait_event(10 * MSEC);
-	rx_message(PD_MSG_SOP, PD_CTRL_NOT_SUPPORTED, 0,
+	rx_message(TCPC_TX_SOP, PD_CTRL_NOT_SUPPORTED, 0,
 		   PD_ROLE_SINK, PD_ROLE_UFP, 0);
 
 	/*
@@ -115,7 +115,7 @@ test_static int finish_src_discovery(int startup_cable_probes)
 		EC_SUCCESS, "%d");
 	mock_prl_message_sent(PORT0);
 	task_wait_event(10 * MSEC);
-	rx_message(PD_MSG_SOP, PD_CTRL_NOT_SUPPORTED, 0,
+	rx_message(TCPC_TX_SOP, PD_CTRL_NOT_SUPPORTED, 0,
 		   PD_ROLE_SINK, PD_ROLE_UFP, 0);
 
 	return EC_SUCCESS;
@@ -170,7 +170,7 @@ test_static int test_send_caps_error_before_connected(void)
 	 */
 
 	/* REQUEST 5V, expect ACCEPT, PS_RDY. */
-	rx_message(PD_MSG_SOP, 0, PD_DATA_REQUEST,
+	rx_message(TCPC_TX_SOP, 0, PD_DATA_REQUEST,
 		   PD_ROLE_SINK, PD_ROLE_UFP, RDO_FIXED(1, 500, 500, 0));
 	TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP,
 					 PD_CTRL_ACCEPT, 0, 10 * MSEC),
@@ -205,7 +205,7 @@ test_static int test_send_caps_error_when_connected(void)
 	task_wait_event(10 * MSEC);
 
 	/* REQUEST 5V, expect ACCEPT, PS_RDY. */
-	rx_message(PD_MSG_SOP, 0, PD_DATA_REQUEST,
+	rx_message(TCPC_TX_SOP, 0, PD_DATA_REQUEST,
 		   PD_ROLE_SINK, PD_ROLE_UFP, RDO_FIXED(1, 500, 500, 0));
 	TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP,
 					 PD_CTRL_ACCEPT, 0, 10 * MSEC),
@@ -224,7 +224,7 @@ test_static int test_send_caps_error_when_connected(void)
 	 * Now connected. Send GET_SOURCE_CAP, to check how error sending
 	 * SOURCE_CAP is handled.
 	 */
-	rx_message(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP, 0,
+	rx_message(TCPC_TX_SOP, PD_CTRL_GET_SOURCE_CAP, 0,
 		   PD_ROLE_SINK, PD_ROLE_UFP, 0);
 	TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP,
 					 0, PD_DATA_SOURCE_CAP, 10 * MSEC),
@@ -267,7 +267,7 @@ test_static int test_interrupting_pr_swap(void)
 	task_wait_event(10 * MSEC);
 
 	/* REQUEST 5V, expect ACCEPT, PS_RDY. */
-	rx_message(PD_MSG_SOP, 0, PD_DATA_REQUEST,
+	rx_message(TCPC_TX_SOP, 0, PD_DATA_REQUEST,
 		   PD_ROLE_SINK, PD_ROLE_UFP, RDO_FIXED(1, 500, 500, 0));
 	TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP,
 					 PD_CTRL_ACCEPT, 0, 10 * MSEC),
@@ -286,7 +286,7 @@ test_static int test_interrupting_pr_swap(void)
 	 * Now connected.  Initiate a PR swap and then interrupt it after the
 	 * Accept, when power is transitioning to off.
 	 */
-	rx_message(PD_MSG_SOP, PD_CTRL_PR_SWAP, 0,
+	rx_message(TCPC_TX_SOP, PD_CTRL_PR_SWAP, 0,
 		   PD_ROLE_SINK, PD_ROLE_UFP, 0);
 
 	TEST_EQ(mock_prl_wait_for_tx_msg(PORT0, TCPC_TX_SOP,
@@ -297,7 +297,7 @@ test_static int test_interrupting_pr_swap(void)
 	task_wait_event(5 * SECOND);
 
 	/* Interrupt the non-interruptible AMS */
-	rx_message(PD_MSG_SOP, PD_CTRL_PR_SWAP, 0,
+	rx_message(TCPC_TX_SOP, PD_CTRL_PR_SWAP, 0,
 		   PD_ROLE_SINK, PD_ROLE_UFP, 0);
 
 	/*
diff --git a/test/usb_tcpmv2_compliance.h b/test/usb_tcpmv2_compliance.h
index a6457eb23d..6566a54e51 100644
--- a/test/usb_tcpmv2_compliance.h
+++ b/test/usb_tcpmv2_compliance.h
@@ -54,7 +54,7 @@ enum pd_rev_type partner_get_pd_rev(void);
 #define TCPC_TX_SOP_ALL -1
 void partner_tx_msg_id_reset(int sop);
 
-void partner_send_msg(enum pd_msg_type sop,
+void partner_send_msg(enum tcpm_sop_type sop,
 		      uint16_t type,
 		      uint16_t cnt,
 		      uint16_t ext,
diff --git a/test/usb_tcpmv2_compliance_common.c b/test/usb_tcpmv2_compliance_common.c
index 965bafacc6..8f2c2f60e1 100644
--- a/test/usb_tcpmv2_compliance_common.c
+++ b/test/usb_tcpmv2_compliance_common.c
@@ -125,7 +125,7 @@ void partner_tx_msg_id_reset(int sop)
 		partner_tx_id[sop] = 0;
 }
 
-void partner_send_msg(enum pd_msg_type sop,
+void partner_send_msg(enum tcpm_sop_type sop,
 		      uint16_t type,
 		      uint16_t cnt,
 		      uint16_t ext,
@@ -135,7 +135,7 @@ void partner_send_msg(enum pd_msg_type sop,
 
 	partner_tx_id[sop] &= 7;
 	header = PD_HEADER(type,
-			sop == PD_MSG_SOP ? partner_get_power_role()
+			sop == TCPC_TX_SOP ? partner_get_power_role()
 			: PD_PLUG_FROM_CABLE,
 			partner_get_data_role(),
 			partner_tx_id[sop],
@@ -259,7 +259,7 @@ int proc_pd_e1(enum pd_data_role data_role, enum proc_pd_e1_attach attach)
 			 *    The Source Capabilities includes Fixed 5V 3A PDO.
 			 */
 			task_wait_event(1 * MSEC);
-			partner_send_msg(PD_MSG_SOP, PD_DATA_SOURCE_CAP, 1, 0,
+			partner_send_msg(TCPC_TX_SOP, PD_DATA_SOURCE_CAP, 1, 0,
 					 &pdo);
 
 			/*
@@ -275,10 +275,10 @@ int proc_pd_e1(enum pd_data_role data_role, enum proc_pd_e1_attach attach)
 			 * g) The tester sends Accept, and when Vbus is stable
 			 *    at the target voltage, sends PS_RDY.
 			 */
-			partner_send_msg(PD_MSG_SOP, PD_CTRL_ACCEPT, 0, 0,
+			partner_send_msg(TCPC_TX_SOP, PD_CTRL_ACCEPT, 0, 0,
 					 NULL);
 			task_wait_event(10 * MSEC);
-			partner_send_msg(PD_MSG_SOP, PD_CTRL_PS_RDY, 0, 0,
+			partner_send_msg(TCPC_TX_SOP, PD_CTRL_PS_RDY, 0, 0,
 					 NULL);
 			task_wait_event(1 * MSEC);
 
@@ -304,7 +304,7 @@ int proc_pd_e1(enum pd_data_role data_role, enum proc_pd_e1_attach attach)
 			/*
 			 * e) The tester requests 5V 0.5A.
 			 */
-			partner_send_msg(PD_MSG_SOP, PD_DATA_REQUEST, 1, 0,
+			partner_send_msg(TCPC_TX_SOP, PD_DATA_REQUEST, 1, 0,
 					 &rdo);
 
 			TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP,
@@ -402,23 +402,23 @@ int handle_attach_expected_msgs(enum pd_data_role data_role)
 			task_wait_event(10 * MSEC);
 
 			switch (found_index) {
-			case 0:	/* PD_MSG_SOP PD_CTRL_GET_SOURCE_CAP */
-				partner_send_msg(PD_MSG_SOP,
+			case 0:	/* TCPC_TX_SOP PD_CTRL_GET_SOURCE_CAP */
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_DATA_SOURCE_CAP,
 						 1, 0, &pdo);
 				break;
-			case 1: /* PD_MSG_SOP PD_CTRL_GET_SINK_CAP */
-				partner_send_msg(PD_MSG_SOP,
+			case 1: /* TCPC_TX_SOP PD_CTRL_GET_SINK_CAP */
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_DATA_SINK_CAP,
 						 1, 0, &pdo);
 				break;
 			case 2: /* TCPC_TX_SOP_PRIME PD_DATA_VENDOR_DEF */
-				partner_send_msg(PD_MSG_SOP_PRIME,
+				partner_send_msg(TCPC_TX_SOP_PRIME,
 						 PD_CTRL_NOT_SUPPORTED,
 						 0, 0, NULL);
 				break;
 			case 3: /* TCPC_TX_SOP PD_DATA_VENDOR_DEF */
-				partner_send_msg(PD_MSG_SOP,
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_CTRL_NOT_SUPPORTED,
 						 0, 0, NULL);
 				break;
@@ -463,24 +463,24 @@ int handle_attach_expected_msgs(enum pd_data_role data_role)
 			task_wait_event(10 * MSEC);
 
 			switch (found_index) {
-			case 0: /* PD_MSG_SOP PD_CTRL_GET_SINK_CAP */
-				partner_send_msg(PD_MSG_SOP,
+			case 0: /* TCPC_TX_SOP PD_CTRL_GET_SINK_CAP */
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_DATA_SINK_CAP,
 						 1, 0, &pdo);
 				break;
 			case 1: /* TCPC_TX_SOP PD_CTRL_DR_SWAP */
-				partner_send_msg(PD_MSG_SOP,
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_CTRL_REJECT,
 						 0, 0, NULL);
 				break;
-			case 2:	/* PD_MSG_SOP PD_CTRL_PR_SWAP */
-				partner_send_msg(PD_MSG_SOP,
+			case 2:	/* TCPC_TX_SOP PD_CTRL_PR_SWAP */
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_CTRL_REJECT,
 						 0, 0, NULL);
 				break;
 			case 3: /* TCPC_TX_SOP PD_CTRL_VCONN_SWAP */
 				TEST_LT(vcs++, 4, "%d");
-				partner_send_msg(PD_MSG_SOP,
+				partner_send_msg(TCPC_TX_SOP,
 						 PD_CTRL_REJECT,
 						 0, 0, NULL);
 				break;
diff --git a/test/usb_tcpmv2_td_pd_ll_e3.c b/test/usb_tcpmv2_td_pd_ll_e3.c
index 153f32dc4f..52ce100d1c 100644
--- a/test/usb_tcpmv2_td_pd_ll_e3.c
+++ b/test/usb_tcpmv2_td_pd_ll_e3.c
@@ -42,7 +42,7 @@ static int td_pd_ll_e3(enum pd_data_role data_role)
 	 *    and do not send GoodCrc for nRetryCount + 1 times
 	 *    (nRetryCount equals 3 since PD 2.1).
 	 */
-	partner_send_msg(PD_MSG_SOP,
+	partner_send_msg(TCPC_TX_SOP,
 			 PD_CTRL_GET_SINK_CAP,
 			 0, 0, NULL);
 
@@ -63,7 +63,7 @@ static int td_pd_ll_e3(enum pd_data_role data_role)
 	/*
 	 * d) Handle correctly the Soft Reset procedure.
 	 */
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_ACCEPT, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_ACCEPT, 0, 0, NULL);
 
 	/*
 	 * e) Continue the bring-up procedure and check that the link is
diff --git a/test/usb_tcpmv2_td_pd_ll_e4.c b/test/usb_tcpmv2_td_pd_ll_e4.c
index 24f4af862c..66eff67361 100644
--- a/test/usb_tcpmv2_td_pd_ll_e4.c
+++ b/test/usb_tcpmv2_td_pd_ll_e4.c
@@ -44,7 +44,7 @@ static int td_pd_ll_e4(enum pd_data_role data_role)
 	 *    and do not send GoodCrc for nRetryCount + 1 times
 	 *    (nRetryCount equals 3 since PD 2.1).
 	 */
-	partner_send_msg(PD_MSG_SOP,
+	partner_send_msg(TCPC_TX_SOP,
 			 PD_CTRL_GET_SINK_CAP,
 			 0, 0, NULL);
 
diff --git a/test/usb_tcpmv2_td_pd_ll_e5.c b/test/usb_tcpmv2_td_pd_ll_e5.c
index 991b044636..a1d431bed7 100644
--- a/test/usb_tcpmv2_td_pd_ll_e5.c
+++ b/test/usb_tcpmv2_td_pd_ll_e5.c
@@ -38,7 +38,7 @@ static int td_pd_ll_e5(enum pd_data_role data_role)
 	 * b) Initiate a Soft Reset and check that the procedure is completed
 	 *    successfully.
 	 */
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_SOFT_RESET, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_SOFT_RESET, 0, 0, NULL);
 
 	TEST_EQ(verify_tcpci_transmit(TCPC_TX_SOP, PD_CTRL_ACCEPT, 0),
 		EC_SUCCESS, "%d");
diff --git a/test/usb_tcpmv2_td_pd_snk3_e12.c b/test/usb_tcpmv2_td_pd_snk3_e12.c
index a55438d49a..096d101d65 100644
--- a/test/usb_tcpmv2_td_pd_snk3_e12.c
+++ b/test/usb_tcpmv2_td_pd_snk3_e12.c
@@ -32,7 +32,7 @@ int test_td_pd_snk3_e12(void)
 	 * b) The Tester keeps the Rp value as SinkTXNG and sends a
 	 * Get_Sink_Cap message to the UUT.
 	 */
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SINK_CAP, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_GET_SINK_CAP, 0, 0, NULL);
 
 	/*
 	 * c) Upon receipt of the Sink_Capabilities Message, the Tester doesn't
diff --git a/test/usb_tcpmv2_td_pd_src3_e26.c b/test/usb_tcpmv2_td_pd_src3_e26.c
index 5e899ef9b6..405e36f9e2 100644
--- a/test/usb_tcpmv2_td_pd_src3_e26.c
+++ b/test/usb_tcpmv2_td_pd_src3_e26.c
@@ -33,7 +33,7 @@ int test_td_pd_src3_e26(void)
 	/*
 	 * ...and sends a Get_Source_Cap message to the UUT.
 	 */
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_GET_SOURCE_CAP, 0, 0, NULL);
 
 	/*
 	 * c) Upon receipt of the Source_Capabilities Message, the Tester
diff --git a/test/usb_tcpmv2_td_pd_src3_e32.c b/test/usb_tcpmv2_td_pd_src3_e32.c
index 518cde6b25..dec17a67c3 100644
--- a/test/usb_tcpmv2_td_pd_src3_e32.c
+++ b/test/usb_tcpmv2_td_pd_src3_e32.c
@@ -67,7 +67,7 @@ int test_td_pd_src3_e32(void)
 	 * incrementing values (mod 256) starting at 0x00.
 	 */
 	setup_chunk_msg(0, data);
-	partner_send_msg(PD_MSG_SOP, 0x1F, 7, 1, (uint32_t *)data);
+	partner_send_msg(TCPC_TX_SOP, 0x1F, 7, 1, (uint32_t *)data);
 	start_time = get_time().val;
 
 	/*
@@ -128,7 +128,7 @@ int test_td_pd_src3_e32(void)
 		chunk = next_chunk;
 
 		setup_chunk_msg(chunk, data);
-		partner_send_msg(PD_MSG_SOP, 0x1F, 7, 1, (uint32_t *)data);
+		partner_send_msg(TCPC_TX_SOP, 0x1F, 7, 1, (uint32_t *)data);
 
 		TEST_EQ(verify_tcpci_tx_with_data(TCPC_TX_SOP,
 					0x1F,
@@ -153,7 +153,7 @@ int test_td_pd_src3_e32(void)
 	task_wait_event(PD_T_CHUNK_SENDER_RSP_MAX + (5 * MSEC));
 
 	setup_chunk_msg(0, data);
-	partner_send_msg(PD_MSG_SOP, 0x1F, 7, 1, (uint32_t *)data);
+	partner_send_msg(TCPC_TX_SOP, 0x1F, 7, 1, (uint32_t *)data);
 
 	/*
 	 * i) If a message is not received within tChunkReceiverRequest max,
diff --git a/test/usb_tcpmv2_td_pd_src3_e7.c b/test/usb_tcpmv2_td_pd_src3_e7.c
index 93c5079080..f018af849b 100644
--- a/test/usb_tcpmv2_td_pd_src3_e7.c
+++ b/test/usb_tcpmv2_td_pd_src3_e7.c
@@ -63,7 +63,7 @@ int test_td_pd_src3_e7(void)
 	 */
 	TEST_EQ(proc_pd_e3(), EC_SUCCESS, "%d");
 
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
 
 	/*
 	 * c) If a Not_Supported message is received, and Num_Fixed_Batteries
@@ -117,7 +117,8 @@ int test_td_pd_src3_e7(void)
 	ext_msg = EXT_MSG_CHUNKED |
 		  EXT_MSG_DATA_SIZE_1 |
 		  GBSDB_FIXED_BATTERY_0;
-	partner_send_msg(PD_MSG_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1, &ext_msg);
+	partner_send_msg(TCPC_TX_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
+			&ext_msg);
 
 	/*
 	 * f) If a Battery_Status message is not received within
diff --git a/test/usb_tcpmv2_td_pd_src3_e8.c b/test/usb_tcpmv2_td_pd_src3_e8.c
index cc07133043..5dfc551cba 100644
--- a/test/usb_tcpmv2_td_pd_src3_e8.c
+++ b/test/usb_tcpmv2_td_pd_src3_e8.c
@@ -74,7 +74,7 @@ int test_td_pd_src3_e8(void)
 	 */
 	TEST_EQ(proc_pd_e3(), EC_SUCCESS, "%d");
 
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
 
 	/*
 	 * c) If a Source_Capabilities_Extended message is received, the
@@ -143,7 +143,7 @@ int test_td_pd_src3_e8(void)
 
 		ext_msg = EXT_MSG_CHUNKED | EXT_MSG_DATA_SIZE_1 |
 			  (ref << 16);
-		partner_send_msg(PD_MSG_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
+		partner_send_msg(TCPC_TX_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
 				 &ext_msg);
 
 		/*
diff --git a/test/usb_tcpmv2_td_pd_src3_e9.c b/test/usb_tcpmv2_td_pd_src3_e9.c
index 42295b3dab..ecf0c745ff 100644
--- a/test/usb_tcpmv2_td_pd_src3_e9.c
+++ b/test/usb_tcpmv2_td_pd_src3_e9.c
@@ -70,7 +70,7 @@ int test_td_pd_src3_e9(void)
 	 */
 	TEST_EQ(proc_pd_e3(), EC_SUCCESS, "%d");
 
-	partner_send_msg(PD_MSG_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
+	partner_send_msg(TCPC_TX_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
 
 	/*
 	 * c) If a Source_Capabilities_Extended message is received, the
@@ -135,7 +135,7 @@ int test_td_pd_src3_e9(void)
 	ref = 8;
 	ext_msg = EXT_MSG_CHUNKED | EXT_MSG_DATA_SIZE_1 |
 		  (ref << 16);
-	partner_send_msg(PD_MSG_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
+	partner_send_msg(TCPC_TX_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
 			 &ext_msg);
 
 	/*
diff --git a/test/usb_tcpmv2_td_pd_vndi3_e3.c b/test/usb_tcpmv2_td_pd_vndi3_e3.c
index 93e01ffcd0..ef16128934 100644
--- a/test/usb_tcpmv2_td_pd_vndi3_e3.c
+++ b/test/usb_tcpmv2_td_pd_vndi3_e3.c
@@ -43,7 +43,7 @@ static int td_pd_vndi3_e3(enum pd_data_role data_role)
 	/*
 	 * b) Tester executes a Discover Identity exchange
 	 */
-	partner_send_msg(PD_MSG_SOP, PD_DATA_VENDOR_DEF,
+	partner_send_msg(TCPC_TX_SOP, PD_DATA_VENDOR_DEF,
 			 1, 0, &vdo);
 
 	/*