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, 226 deletions

diff --git a/test/usb_tcpmv2_td_pd_src3_e9.c b/test/usb_tcpmv2_td_pd_src3_e9.c
deleted file mode 100644
index faeed0922d..0000000000
--- a/test/usb_tcpmv2_td_pd_src3_e9.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Copyright 2021 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 "battery.h"
-#include "mock/tcpci_i2c_mock.h"
-#include "task.h"
-#include "driver/tcpm/tcpci.h"
-#include "test_util.h"
-#include "timer.h"
-#include "usb_tcpmv2_compliance.h"
-#include "usb_tc_sm.h"
-
-#define BUFFER_SIZE 100
-
-#define EXT_MSG_CHUNKED BIT(15)
-#define EXT_MSG_DATA_SIZE_1 1
-
-#define HEADER_BYTE_OFFSET 1
-#define HEADER_NUM_BYTES 2
-
-#define SCEDB_NUM_BATTERY_OFFSET 22
-#define SCEDB_NUM_BYTES 24
-
-#define BSDO_INV_BATTERY_REF(bsdo)	(((bsdo) >> 8) & 1)
-#define BSDO_BATTERY_INFO(bsdo)		(((bsdo) >> 8) & 0xFF)
-
-static int number_of_fixed_batteries(void)
-{
-	return CONFIG_NUM_FIXED_BATTERIES;
-}
-
-static int number_of_swappable_batteries(void)
-{
-	return 0;
-}
-
-/*****************************************************************************
- * TD.PD.SRC3.E9 Battery Status Fields Checks - Invalid Battery reference
- *
- * Description:
- *	As Consumer (UFP), the Tester sends a Get_Battery_Status message with
- *	an invalid battery reference to the UUT, waits for a Battery_Status
- *	message from the Provider (DFP, UUT) and verifies correct field values.
- */
-int test_td_pd_src3_e9(void)
-{
-	int msg_len;
-	uint8_t data[BUFFER_SIZE];
-	uint32_t ext_msg;
-	int num_fixed_batteries;
-	int num_swappable_battery_slots;
-
-	int ref;
-	int found_index;
-	struct possible_tx possible[2];
-
-	TEST_EQ(tcpci_startup(), EC_SUCCESS, "%d");
-
-	/*
-	 * a) Run PROC.PD.E1 Bring-up according to the UUT role.
-	 */
-	TEST_EQ(proc_pd_e1(PD_ROLE_DFP, INITIAL_AND_ALREADY_ATTACHED),
-		EC_SUCCESS, "%d");
-
-	/*
-	 * b) The Tester waits until it can start an AMS (Run PROC.PD.E3) and
-	 *    sends a Get_Source_Cap_Extended message to the UUT.
-	 */
-	TEST_EQ(proc_pd_e3(), EC_SUCCESS, "%d");
-
-	partner_send_msg(TCPCI_MSG_SOP, PD_CTRL_GET_SOURCE_CAP_EXT, 0, 0, NULL);
-
-	/*
-	 * c) If a Source_Capabilities_Extended message is received, the
-	 *    Tester record the Number of Batteries/Battery Slots field.
-	 */
-	possible[0].tx_type = TCPCI_MSG_SOP;
-	possible[0].ctrl_msg = PD_CTRL_NOT_SUPPORTED;
-	possible[0].data_msg = 0;
-
-	possible[1].tx_type = TCPCI_MSG_SOP;
-	possible[1].ctrl_msg = 0;
-	possible[1].data_msg = PD_EXT_SOURCE_CAP;
-
-	TEST_EQ(verify_tcpci_possible_tx(possible,
-					 2,
-					 &found_index,
-					 data,
-					 sizeof(data),
-					 &msg_len,
-					 0),
-		EC_SUCCESS, "%d");
-	if (found_index == 1) {
-		mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-		task_wait_event(10 * MSEC);
-
-		TEST_EQ(msg_len, HEADER_BYTE_OFFSET +
-				 HEADER_NUM_BYTES +
-				 SCEDB_NUM_BYTES,
-			"%d");
-
-		num_fixed_batteries =
-				data[HEADER_BYTE_OFFSET +
-				     HEADER_NUM_BYTES +
-				     SCEDB_NUM_BATTERY_OFFSET] &
-				0x0F;
-		num_swappable_battery_slots =
-				(data[HEADER_BYTE_OFFSET +
-				      HEADER_NUM_BYTES +
-				      SCEDB_NUM_BATTERY_OFFSET] >> 4) &
-				0x0F;
-	}
-	/*
-	 *    If a Not_Supported message is received, the Tester reads the
-	 *    Number of Batteries/Battery Slots field (combine
-	 *    Num_Fixed_Batteries and Num_Swappable_Battery_Slots) from the
-	 *    VIF.
-	 */
-	else {
-		TEST_EQ(found_index, 0, "%d");
-		mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-		task_wait_event(10 * MSEC);
-
-		num_fixed_batteries = number_of_fixed_batteries();
-		num_swappable_battery_slots = number_of_swappable_batteries();
-	}
-
-	/*
-	 * d) The Tester waits until it can start an AMS (Run PROC.PD.E3) and
-	 *    sends a Get_Battery_Status message, with Battery Status Ref set
-	 *    to 8, to the UUT.
-	 */
-	ref = 8;
-	ext_msg = EXT_MSG_CHUNKED | EXT_MSG_DATA_SIZE_1 |
-		  (ref << 16);
-	partner_send_msg(TCPCI_MSG_SOP, PD_EXT_GET_BATTERY_STATUS, 1, 1,
-			 &ext_msg);
-
-	/*
-	 * e) If a Not_Supported message is received, and
-	 *    1. If the recorded Number of Batteries/Battery Slots field is 0,
-	 *       the test passes and stops here.
-	 *    2. If the recorded Number of Batteries/Battery Slots field is
-	 *       not 0, the test fails.
-	 */
-	possible[0].tx_type = TCPCI_MSG_SOP;
-	possible[0].ctrl_msg = PD_CTRL_NOT_SUPPORTED;
-	possible[0].data_msg = 0;
-
-	possible[1].tx_type = TCPCI_MSG_SOP;
-	possible[1].ctrl_msg = 0;
-	possible[1].data_msg = PD_DATA_BATTERY_STATUS;
-
-	TEST_EQ(verify_tcpci_possible_tx(possible,
-					 2,
-					 &found_index,
-					 data,
-					 sizeof(data),
-					 &msg_len,
-					 0),
-		EC_SUCCESS, "%d");
-	if (found_index == 0) {
-		mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-		task_wait_event(10 * MSEC);
-
-		TEST_EQ(num_fixed_batteries, 0, "%d");
-		TEST_EQ(num_swappable_battery_slots, 0, "%d");
-		return EC_SUCCESS;
-	}
-	/*
-	 * f) Upon receipt of the Battery_Status message, the Tester verifies:
-	 */
-	else {
-		uint16_t header;
-		uint32_t bsdo;
-
-		TEST_EQ(found_index, 1, "%d");
-		mock_set_alert(TCPC_REG_ALERT_TX_SUCCESS);
-		task_wait_event(10 * MSEC);
-
-		/*
-		 *    1. Number of Data Objects field = 001b
-		 */
-		header = UINT16_FROM_BYTE_ARRAY_LE(data, HEADER_BYTE_OFFSET);
-		TEST_EQ(PD_HEADER_CNT(header), 1, "%d");
-
-		/*
-		 *    2. Port Power Role field = 1b (Source)
-		 */
-		TEST_EQ(PD_HEADER_PROLE(header), 1, "%d");
-
-		/*
-		 *    3. Specification Revision field = 10b (Rev 3.0)
-		 */
-		TEST_EQ(PD_HEADER_REV(header), PD_REV30, "%d");
-
-		/*
-		 *    4. Port Data Role field = 1b (DFP)
-		 */
-		TEST_EQ(PD_HEADER_DROLE(header), PD_ROLE_DFP, "%d");
-
-		/*
-		 *    5. Extended = 0b
-		 */
-		TEST_EQ(PD_HEADER_EXT(header), 0, "%d");
-
-		/*
-		 *    6. Invalid Battery Reference field (Bit 0) of the
-		 *       Battery Info field in the BSDO is 1
-		 */
-		bsdo = UINT32_FROM_BYTE_ARRAY_LE(data, HEADER_BYTE_OFFSET +
-						       HEADER_NUM_BYTES);
-		TEST_EQ(BSDO_INV_BATTERY_REF(bsdo), 1, "%d");
-
-		/*
-		 *    7. Bits 7..1 of Battery Info field in the BSDO are 0
-		 *    8. Bits 7..0 of the BSDO are 0
-		 */
-		TEST_EQ(BSDO_BATTERY_INFO(bsdo) & GENMASK(7, 1), 0, "%d");
-		TEST_EQ(bsdo & GENMASK(7, 0), 0, "%d");
-	}
-
-	return EC_SUCCESS;
-}