ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 85 deletions

diff --git a/test/usb_tcpmv2_td_pd_src_e5.c b/test/usb_tcpmv2_td_pd_src_e5.c
deleted file mode 100644
index eac1b93e8f..0000000000
--- a/test/usb_tcpmv2_td_pd_src_e5.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "mock/tcpci_i2c_mock.h"
-#include "task.h"
-#include "tcpm/tcpci.h"
-#include "test_util.h"
-#include "timer.h"
-#include "usb_tcpmv2_compliance.h"
-#include "usb_tc_sm.h"
-
-/*****************************************************************************
- * TD.PD.SRC.E5 SenderResponseTimer Timeout - Request
- *
- * Description:
- *	As Consumer (UFP), the Tester intentionally does not send the Request
- *	message, which is intended to cause a SenderResponseTimer timeout on
- *	the Provider (DFP, UUT). The Tester verifies correct implementation
- *	of this timer
- */
-int test_td_pd_src_e5(void)
-{
-	uint64_t end_time;
-
-	partner_set_pd_rev(PD_REV20);
-
-	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
-
-	/*
-	 * a) Run PROC.PD.E1 Bring-up according to the UUT role.
-	 *
-	 * NOTE: Calling PROC.PD.E1 with INITIAL_ATTACH will stop just before
-	 * the PD_DATA_SOURCE_CAP is verified.  We need to stop the process
-	 * there to stop the REQUEST message.
-	 */
-	TEST_EQ(proc_pd_e1(PD_ROLE_DFP, INITIAL_ATTACH), EC_SUCCESS, "%d");
-
-	/*
-	 * b) Upon receipt of the Source Capabilities message from the
-	 *    Provider, the Tester replies with a GoodCRC message.
-	 */
-	TEST_EQ(verify_tcpci_transmit(TCPCI_MSG_SOP, 0, PD_DATA_SOURCE_CAP),
-		EC_SUCCESS, "%d");
-	mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-
-	/* Save time GoodCRC was sent */
-	end_time = get_time().val;
-
-	/*
-	 * c) The Tester intentionally does not send a Request message and
-	 *    waits for a Hard Reset.
-	 */
-
-	/*
-	 * d) If a Hard Reset is not detected within 30 ms from the time the
-	 *    last bit of the GoodCRC message EOP has been sent, the test
-	 *    fails.
-	 * e) If a Hard Reset is detected before 24 ms from the time the
-	 *    last bit of the GoodCRC message EOP has been sent, the test
-	 *    fails.
-	 */
-	end_time += 24 * MSEC;
-	while (get_time().val < end_time) {
-		TEST_NE(mock_tcpci_get_reg(TCPC_REG_TRANSMIT),
-			TCPCI_MSG_TX_HARD_RESET, "%d");
-		task_wait_event(1 * MSEC);
-	}
-
-	end_time += 6 * MSEC;
-	while (get_time().val < end_time) {
-		if (mock_tcpci_get_reg(TCPC_REG_TRANSMIT) ==
-						TCPCI_MSG_TX_HARD_RESET)
-			break;
-		task_wait_event(1 * MSEC);
-	}
-	TEST_EQ(mock_tcpci_get_reg(TCPC_REG_TRANSMIT),
-		TCPCI_MSG_TX_HARD_RESET, "%d");
-	mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS | TCPC_REG_ALERT_TX_FAILED);
-	mock_tcpci_set_reg(TCPC_REG_TRANSMIT, 0);
-	task_wait_event(1 * MSEC);
-
-	return EC_SUCCESS;
-}