TCPMv1/v2: Move "pdcable" console command to common file

BUG=b:148528713
BRANCH=none
TEST=make buildall -j

Change-Id: I7f78efeb74536d5d6c5dd0b4bd5f32325c1500ec
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2036604
Reviewed-by: Keith Short <keithshort@chromium.org>

1 files changed, 8 insertions, 96 deletions

diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 74809057d7..a9beba9f1b 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -254,11 +254,9 @@ enum pd_msg_type pd_msg_tx_type(int port, enum pd_data_role data_role,
 
 void reset_pd_cable(int port)
 {
-	if (IS_ENABLED(CONFIG_USB_PD_DECODE_SOP)) {
-		memset(&cable[port], 0, sizeof(cable[port]));
-		cable[port].last_sop_p_msg_id = INVALID_MSG_ID_COUNTER;
-		cable[port].last_sop_p_p_msg_id = INVALID_MSG_ID_COUNTER;
-	}
+	memset(&cable[port], 0, sizeof(cable[port]));
+	cable[port].last_sop_p_msg_id = INVALID_MSG_ID_COUNTER;
+	cable[port].last_sop_p_p_msg_id = INVALID_MSG_ID_COUNTER;
 }
 
 enum idh_ptype get_usb_pd_cable_type(int port)
@@ -696,6 +694,11 @@ void pd_set_dfp_enter_mode_flag(int port, bool set)
 {
 }
 
+struct pd_cable *pd_get_cable_attributes(int port)
+{
+	return &cable[port];
+}
+
 /*
  * Enter Thunderbolt-compatible mode
  * Reference: USB Type-C cable and connector specification, Release 2.0
@@ -1180,97 +1183,6 @@ int pd_svdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload,
 
 #endif /* CONFIG_USB_PD_ALT_MODE */
 
-#ifdef CONFIG_CMD_USB_PD_CABLE
-static const char * const cable_type[] = {
-	[IDH_PTYPE_PCABLE] = "Passive",
-	[IDH_PTYPE_ACABLE] = "Active",
-};
-
-static const char * const cable_curr[] = {
-	[USB_VBUS_CUR_3A] = "3A",
-	[USB_VBUS_CUR_5A] = "5A",
-};
-
-static int command_cable(int argc, char **argv)
-{
-	int port;
-	char *e;
-
-	if (argc < 2)
-		return EC_ERROR_PARAM_COUNT;
-	port = strtoi(argv[1], &e, 0);
-	if (*e || port >= board_get_usb_pd_port_count())
-		return EC_ERROR_PARAM2;
-
-	if (!cable[port].is_identified) {
-		ccprintf("Cable not identified.\n");
-		return EC_SUCCESS;
-	}
-
-	ccprintf("Cable Type: ");
-	if (cable[port].type != IDH_PTYPE_PCABLE &&
-		cable[port].type != IDH_PTYPE_ACABLE) {
-		ccprintf("Not Emark Cable\n");
-		return EC_SUCCESS;
-	}
-	ccprintf("%s\n", cable_type[cable[port].type]);
-
-	/* Cable revision */
-	ccprintf("Cable Rev: %d.0\n", cable[port].rev + 1);
-
-	/*
-	 * For rev 2.0, rev 3.0 active and passive cables have same bits for
-	 * connector type (Bit 19:18) and current handling capability bit 6:5
-	 */
-	ccprintf("Connector Type: %d\n", cable[port].attr.p_rev20.connector);
-
-	if (cable[port].attr.p_rev20.vbus_cur) {
-		ccprintf("Cable Current: %s\n",
-		   cable[port].attr.p_rev20.vbus_cur > ARRAY_SIZE(cable_curr) ?
-		   "Invalid" : cable_curr[cable[port].attr.p_rev20.vbus_cur]);
-	} else
-		ccprintf("Cable Current: Invalid\n");
-
-	/*
-	 * For Rev 3.0 passive cables and Rev 2.0 active and passive cables,
-	 * USB Superspeed Signaling support have same bits 2:0
-	 */
-	if (cable[port].type == IDH_PTYPE_PCABLE)
-		ccprintf("USB Superspeed Signaling support: %d\n",
-			cable[port].attr.p_rev20.ss);
-
-	/*
-	 * For Rev 3.0 active cables and Rev 2.0 active and passive cables,
-	 * SOP" controller preset have same bit 3
-	 */
-	if (cable[port].type == IDH_PTYPE_ACABLE)
-		ccprintf("SOP'' Controller: %s present\n",
-			cable[port].attr.a_rev20.sop_p_p ? "" : "Not");
-
-	if (cable[port].rev == PD_REV30) {
-		/*
-		 * For Rev 3.0 active and passive cables, Max Vbus vtg have
-		 * same bits 10:9.
-		 */
-		ccprintf("Max vbus voltage: %d\n",
-			20 + 10 * cable[port].attr.p_rev30.vbus_max);
-
-		/* For Rev 3.0 Active cables */
-		if (cable[port].type == IDH_PTYPE_ACABLE) {
-			ccprintf("SS signaling: USB_SS_GEN%u\n",
-				cable[port].attr2.a2_rev30.usb_gen ? 2 : 1);
-			ccprintf("Number of SS lanes supported: %u\n",
-				cable[port].attr2.a2_rev30.usb_lanes);
-		}
-	}
-	return EC_SUCCESS;
-}
-
-DECLARE_CONSOLE_COMMAND(pdcable, command_cable,
-			"<port>",
-			"Cable Characteristics");
-#endif /* CONFIG_CMD_USB_PD_CABLE */
-
 static void pd_usb_billboard_deferred(void)
 {
 #if defined(CONFIG_USB_PD_ALT_MODE) && !defined(CONFIG_USB_PD_ALT_MODE_DFP) \