TCPM: Rename enum tcpm_sop_type and its constants

As a followup to CL:3104290, give the TCPCI TRANSMIT and
RX_BUF_FRAME_TYPE types more consistent names. Most of them can be used
for receiving, not just transmitting. Fix lint errors thus revealed.

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

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

1 files changed, 42 insertions, 40 deletions

diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index e91b99393b..959feb4728 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -247,7 +247,7 @@ static inline bool is_limit_tbt_cable_speed(int port)
 	return !!(cable[port].flags & CABLE_FLAGS_TBT_COMPAT_LIMIT_SPEED);
 }
 
-static bool is_intel_svid(int port, enum tcpm_sop_type type)
+static bool is_intel_svid(int port, enum tcpci_msg_type type)
 {
 	int i;
 
@@ -314,7 +314,7 @@ static inline void disable_usb4_mode(int port)
 static bool is_cable_ready_to_enter_usb4(int port, int cnt)
 {
 	/* TODO: USB4 enter mode for Active cables */
-	struct pd_discovery *disc = &discovery[port][TCPC_TX_SOP_PRIME];
+	struct pd_discovery *disc = &discovery[port][TCPCI_MSG_SOP_PRIME];
 	if (IS_ENABLED(CONFIG_USB_PD_USB4) &&
 	    (get_usb_pd_cable_type(port) == IDH_PTYPE_PCABLE) &&
 	    is_vdo_present(cnt, VDO_INDEX_PTYPE_CABLE1)) {
@@ -369,13 +369,13 @@ static int dfp_discover_svids(uint32_t *payload)
 	return 1;
 }
 
-struct pd_discovery *pd_get_am_discovery(int port, enum tcpm_sop_type type)
+struct pd_discovery *pd_get_am_discovery(int port, enum tcpci_msg_type type)
 {
 	return &discovery[port][type];
 }
 
 struct partner_active_modes *
-pd_get_partner_active_modes(int port, enum tcpm_sop_type type)
+pd_get_partner_active_modes(int port, enum tcpci_msg_type type)
 {
 	assert(type < AMODE_TYPE_COUNT);
 	return &partner_amodes[port][type];
@@ -395,7 +395,7 @@ void pd_set_dfp_enter_mode_flag(int port, bool set)
  */
 static int dfp_discover_modes(int port, uint32_t *payload)
 {
-	struct pd_discovery *disc = pd_get_am_discovery(port, TCPC_TX_SOP);
+	struct pd_discovery *disc = pd_get_am_discovery(port, TCPCI_MSG_SOP);
 	uint16_t svid = disc->svids[disc->svid_idx].svid;
 
 	if (disc->svid_idx >= disc->svid_cnt)
@@ -425,10 +425,10 @@ static bool is_usb4_vdo(int port, int cnt, uint32_t *payload)
 
 static int process_am_discover_ident_sop(int port, int cnt, uint32_t head,
 					 uint32_t *payload,
-					 enum tcpm_sop_type *rtype)
+					 enum tcpci_msg_type *rtype)
 {
 	pd_dfp_discovery_init(port);
-	dfp_consume_identity(port, TCPC_TX_SOP, cnt, payload);
+	dfp_consume_identity(port, TCPCI_MSG_SOP, cnt, payload);
 
 	if (IS_ENABLED(CONFIG_USB_PD_DECODE_SOP) && is_sop_prime_ready(port) &&
 	    board_is_tbt_usb4_port(port)) {
@@ -448,7 +448,7 @@ static int process_am_discover_ident_sop(int port, int cnt, uint32_t head,
 
 		if (is_modal(port, cnt, payload) ||
 		    is_usb4_vdo(port, cnt, payload)) {
-			*rtype = TCPC_TX_SOP_PRIME;
+			*rtype = TCPCI_MSG_SOP_PRIME;
 			return dfp_discover_ident(payload);
 		}
 	}
@@ -459,7 +459,7 @@ static int process_am_discover_ident_sop(int port, int cnt, uint32_t head,
 static int process_am_discover_ident_sop_prime(int port, int cnt, uint32_t head,
 					       uint32_t *payload)
 {
-	dfp_consume_identity(port, TCPC_TX_SOP_PRIME, cnt, payload);
+	dfp_consume_identity(port, TCPCI_MSG_SOP_PRIME, cnt, payload);
 	cable[port].rev = PD_HEADER_REV(head);
 
 	/*
@@ -491,13 +491,13 @@ static int process_am_discover_ident_sop_prime(int port, int cnt, uint32_t head,
 }
 
 static int process_am_discover_svids(int port, int cnt, uint32_t *payload,
-				     enum tcpm_sop_type sop,
-				     enum tcpm_sop_type *rtype)
+				     enum tcpci_msg_type sop,
+				     enum tcpci_msg_type *rtype)
 {
 	/*
 	 * The pd_discovery structure stores SOP and SOP' discovery results
 	 * separately, but TCPMv1 depends on one-dimensional storage of SVIDs
-	 * and modes. Therefore, always use TCPC_TX_SOP in TCPMv1.
+	 * and modes. Therefore, always use TCPCI_MSG_SOP in TCPMv1.
 	 */
 	dfp_consume_svids(port, sop, cnt, payload);
 
@@ -527,12 +527,12 @@ static int process_am_discover_svids(int port, int cnt, uint32_t *payload,
 				return 0;
 			}
 
-			if (sop == TCPC_TX_SOP_PRIME)
+			if (sop == TCPCI_MSG_SOP_PRIME)
 				limit_tbt_cable_speed(port);
 			else
 				disable_tbt_compat_mode(port);
-		} else if (sop == TCPC_TX_SOP) {
-			*rtype = TCPC_TX_SOP_PRIME;
+		} else if (sop == TCPCI_MSG_SOP) {
+			*rtype = TCPCI_MSG_SOP_PRIME;
 			return dfp_discover_svids(payload);
 		}
 	}
@@ -541,21 +541,21 @@ static int process_am_discover_svids(int port, int cnt, uint32_t *payload,
 }
 
 static int process_tbt_compat_discover_modes(int port,
-					     enum tcpm_sop_type sop,
+					     enum tcpci_msg_type sop,
 					     uint32_t *payload,
-					     enum tcpm_sop_type *rtype)
+					     enum tcpci_msg_type *rtype)
 {
 	int rsize;
 
 	/* Initialize transmit type to SOP */
-	*rtype = TCPC_TX_SOP;
+	*rtype = TCPCI_MSG_SOP;
 
 	/*
 	 * For active cables, Enter mode: SOP', SOP'', SOP
 	 * Ref: USB Type-C Cable and Connector Specification, figure F-1: TBT3
 	 * Discovery Flow and Section F.2.7 TBT3 Cable Enter Mode Command.
 	 */
-	if (sop == TCPC_TX_SOP_PRIME) {
+	if (sop == TCPCI_MSG_SOP_PRIME) {
 		/* Store Discover Mode SOP' response */
 		cable[port].cable_mode_resp.raw_value = payload[1];
 
@@ -580,7 +580,7 @@ static int process_tbt_compat_discover_modes(int port,
 		 * otherwise send TBT3 Device Enter Mode (SOP).
 		 */
 		if (get_usb_pd_cable_type(port) == IDH_PTYPE_ACABLE)
-			*rtype = TCPC_TX_SOP_PRIME;
+			*rtype = TCPCI_MSG_SOP_PRIME;
 
 		rsize = enter_tbt_compat_mode(port, *rtype, payload);
 	} else {
@@ -596,31 +596,31 @@ static int process_tbt_compat_discover_modes(int port,
 			rsize = enter_tbt_compat_mode(port, *rtype, payload);
 		} else {
 			/* Discover modes for SOP' */
-			discovery[port][TCPC_TX_SOP].svid_idx--;
+			discovery[port][TCPCI_MSG_SOP].svid_idx--;
 			rsize = dfp_discover_modes(port, payload);
-			*rtype = TCPC_TX_SOP_PRIME;
+			*rtype = TCPCI_MSG_SOP_PRIME;
 		}
 	}
 
 	return rsize;
 }
 
-static int obj_cnt_enter_tbt_compat_mode(int port, enum tcpm_sop_type sop,
+static int obj_cnt_enter_tbt_compat_mode(int port, enum tcpci_msg_type sop,
 					 uint32_t *payload,
-					 enum tcpm_sop_type *rtype)
+					 enum tcpci_msg_type *rtype)
 {
-	struct pd_discovery *disc = &discovery[port][TCPC_TX_SOP_PRIME];
+	struct pd_discovery *disc = &discovery[port][TCPCI_MSG_SOP_PRIME];
 
 	/* Enter mode SOP' for active cables */
-	if (sop == TCPC_TX_SOP_PRIME) {
+	if (sop == TCPCI_MSG_SOP_PRIME) {
 		/* Check if the cable has a SOP'' controller */
 		if (disc->identity.product_t1.a_rev20.sop_p_p)
-			*rtype = TCPC_TX_SOP_PRIME_PRIME;
+			*rtype = TCPCI_MSG_SOP_PRIME_PRIME;
 		return enter_tbt_compat_mode(port, *rtype, payload);
 	}
 
 	/* Enter Mode SOP'' for active cables with SOP'' controller */
-	if (sop == TCPC_TX_SOP_PRIME_PRIME)
+	if (sop == TCPCI_MSG_SOP_PRIME_PRIME)
 		return enter_tbt_compat_mode(port, *rtype, payload);
 
 	/* Update Mux state to Thunderbolt-compatible mode. */
@@ -631,7 +631,7 @@ static int obj_cnt_enter_tbt_compat_mode(int port, enum tcpm_sop_type sop,
 #endif /* CONFIG_USB_PD_ALT_MODE_DFP */
 
 int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
-	    uint32_t head, enum tcpm_sop_type *rtype)
+	    uint32_t head, enum tcpci_msg_type *rtype)
 {
 	int cmd = PD_VDO_CMD(payload[0]);
 	int cmd_type = PD_VDO_CMDT(payload[0]);
@@ -640,11 +640,11 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 	int rsize = 1; /* VDM header at a minimum */
 
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
-	enum tcpm_sop_type sop = PD_HEADER_GET_SOP(head);
+	enum tcpci_msg_type sop = PD_HEADER_GET_SOP(head);
 #endif
 
 	/* Transmit SOP messages by default */
-	*rtype = TCPC_TX_SOP;
+	*rtype = TCPCI_MSG_SOP;
 
 	payload[0] &= ~VDO_CMDT_MASK;
 	*rpayload = payload;
@@ -700,19 +700,20 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 			payload[0] |= VDO_CMDT(CMDT_RSP_BUSY);
 			rsize = 1;
 		}
-		payload[0] |= VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPC_TX_SOP));
+		payload[0] |=
+			VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPCI_MSG_SOP));
 	} else if (cmd_type == CMDT_RSP_ACK) {
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
 		struct svdm_amode_data *modep;
 
-		modep = pd_get_amode_data(port, TCPC_TX_SOP,
+		modep = pd_get_amode_data(port, TCPCI_MSG_SOP,
 					  PD_VDO_VID(payload[0]));
 #endif
 		switch (cmd) {
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
 		case CMD_DISCOVER_IDENT:
 			/* Received a SOP' Discover Ident msg */
-			if (sop == TCPC_TX_SOP_PRIME) {
+			if (sop == TCPCI_MSG_SOP_PRIME) {
 				rsize = process_am_discover_ident_sop_prime(
 					port, cnt, head, payload);
 				/* Received a SOP Discover Ident Message */
@@ -744,7 +745,7 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 				 */
 				disable_tbt_compat_mode(port);
 				payload[0] = pd_dfp_enter_mode(
-					port, TCPC_TX_SOP, 0, 0);
+					port, TCPCI_MSG_SOP, 0, 0);
 				if (payload[0])
 					rsize = 1;
 			}
@@ -761,8 +762,8 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 				rsize = 0;
 			} else {
 				if (!modep->opos)
-					pd_dfp_enter_mode(port, TCPC_TX_SOP, 0,
-							  0);
+					pd_dfp_enter_mode(port, TCPCI_MSG_SOP,
+							0, 0);
 
 				if (modep->opos) {
 					rsize = modep->fx->status(port,
@@ -801,7 +802,8 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 		}
 
 		payload[0] |= VDO_CMDT(CMDT_INIT);
-		payload[0] |= VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPC_TX_SOP));
+		payload[0] |=
+			VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPCI_MSG_SOP));
 #ifdef CONFIG_USB_PD_ALT_MODE_DFP
 	} else if (cmd_type == CMDT_RSP_BUSY) {
 		switch (cmd) {
@@ -825,7 +827,7 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 	} else if (cmd_type == CMDT_RSP_NAK) {
 		/* Passive cable Nacked for Discover SVID */
 		if (cmd == CMD_DISCOVER_SVID && is_tbt_compat_enabled(port) &&
-		    sop == TCPC_TX_SOP_PRIME &&
+		    sop == TCPCI_MSG_SOP_PRIME &&
 		    get_usb_pd_cable_type(port) == IDH_PTYPE_PCABLE) {
 			limit_tbt_cable_speed(port);
 			rsize = dfp_discover_modes(port, payload);
@@ -844,7 +846,7 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 #else
 
 int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
-	    uint32_t head, enum tcpm_sop_type *rtype)
+	    uint32_t head, enum tcpci_msg_type *rtype)
 {
 	return 0;
 }