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

diff --git a/test/usb_common_test.c b/test/usb_common_test.c
deleted file mode 100644
index 620e061f74..0000000000
--- a/test/usb_common_test.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright 2019 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.
- *
- * Test USB common module.
- */
-#include "test_util.h"
-#include "usb_common.h"
-
-int test_pd_get_cc_state(void)
-{
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_3_0, TYPEC_CC_VOLT_RP_3_0),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_3_0, TYPEC_CC_VOLT_RP_1_5),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_3_0, TYPEC_CC_VOLT_RP_DEF),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_1_5, TYPEC_CC_VOLT_RP_3_0),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_1_5, TYPEC_CC_VOLT_RP_1_5),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_1_5, TYPEC_CC_VOLT_RP_DEF),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_DEF, TYPEC_CC_VOLT_RP_3_0),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_DEF, TYPEC_CC_VOLT_RP_1_5),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_DEF, TYPEC_CC_VOLT_RP_DEF),
-		PD_CC_DFP_DEBUG_ACC, "%d");
-
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_3_0, TYPEC_CC_VOLT_OPEN),
-		PD_CC_DFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_1_5, TYPEC_CC_VOLT_OPEN),
-		PD_CC_DFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RP_DEF, TYPEC_CC_VOLT_OPEN),
-		PD_CC_DFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_RP_3_0),
-		PD_CC_DFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_RP_1_5),
-		PD_CC_DFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_RP_DEF),
-		PD_CC_DFP_ATTACHED, "%d");
-
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RD, TYPEC_CC_VOLT_RD),
-		PD_CC_UFP_DEBUG_ACC, "%d");
-
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RD, TYPEC_CC_VOLT_RA),
-		PD_CC_UFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RD, TYPEC_CC_VOLT_OPEN),
-		PD_CC_UFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RA, TYPEC_CC_VOLT_RD),
-		PD_CC_UFP_ATTACHED, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_RD),
-		PD_CC_UFP_ATTACHED, "%d");
-
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RA, TYPEC_CC_VOLT_RA),
-		PD_CC_UFP_AUDIO_ACC, "%d");
-
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_OPEN),
-		PD_CC_NONE, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_OPEN, TYPEC_CC_VOLT_RA),
-		PD_CC_NONE, "%d");
-	TEST_EQ(pd_get_cc_state(TYPEC_CC_VOLT_RA, TYPEC_CC_VOLT_OPEN),
-		PD_CC_NONE, "%d");
-
-	return EC_SUCCESS;
-}
-
-/*
- * From USB Power Delivery Specification Revision 3.0, Version 2.0
- * Table 6-7 Power Data Object
- */
-#define MAKE_FIXED(v, c) (0 << 30 | (v / 50) << 10 | (c / 10))
-#define MAKE_BATT(v_max, v_min, p) \
-	(1 << 30 | (v_max / 50) << 20 | (v_min / 50) << 10 | (p / 250))
-#define MAKE_VAR(v_max, v_min, c) \
-	(2 << 30 | (v_max / 50) << 20 | (v_min / 50) << 10 | (c / 10))
-#define MAKE_AUG(v_max, v_min, c) \
-	(3 << 30 | (v_max / 100) << 17 | (v_min / 100) << 8 | (c / 50))
-
-/*
- * Tests various cases for pd_extract_pdo_power. It takes a very high voltage to
- * exceed PD_MAX_POWER_MW without also exceeding PD_MAX_CURRENT_MA, so those
- * tests are not particularly realistic.
- */
-int test_pd_extract_pdo_power(void)
-{
-	uint32_t ma;
-	uint32_t max_mv;
-	uint32_t min_mv;
-
-	pd_extract_pdo_power(MAKE_FIXED(/*v=*/5000, /*c=*/3000), &ma, &max_mv,
-			     &min_mv);
-	TEST_EQ(max_mv, 5000, "%d");
-	TEST_EQ(min_mv, 5000, "%d");
-	TEST_EQ(ma, 3000, "%d");
-	pd_extract_pdo_power(MAKE_FIXED(/*v=*/20000, /*c=*/2600), &ma, &max_mv,
-			     &min_mv);
-	TEST_EQ(max_mv, 20000, "%d");
-	TEST_EQ(min_mv, 20000, "%d");
-	TEST_EQ(ma, 2600, "%d");
-	pd_extract_pdo_power(MAKE_FIXED(/*v=*/20000, /*c=*/4000), &ma, &max_mv,
-			     &min_mv);
-	TEST_EQ(max_mv, 20000, "%d");
-	TEST_EQ(min_mv, 20000, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-	pd_extract_pdo_power(MAKE_FIXED(/*v=*/10000, /*c=*/4000), &ma, &max_mv,
-			     &min_mv);
-	TEST_EQ(max_mv, 10000, "%d");
-	TEST_EQ(min_mv, 10000, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-	pd_extract_pdo_power(MAKE_FIXED(/*v=*/21000, /*c=*/4000), &ma, &max_mv,
-			     &min_mv);
-	TEST_EQ(max_mv, 21000, "%d");
-	TEST_EQ(min_mv, 21000, "%d");
-	TEST_EQ(ma, 2857, "%d"); /* Capped at PD_MAX_POWER_MW */
-
-	pd_extract_pdo_power(MAKE_BATT(/*v_max=*/5700, /*v_min=*/3300,
-				       /*p=*/7000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 5700, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 2121, "%d"); /* 3300mV * 2121mA ~= 7000mW */
-	pd_extract_pdo_power(MAKE_BATT(/*v_max=*/3300, /*v_min=*/2700,
-				       /*p=*/12000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 3300, "%d");
-	TEST_EQ(min_mv, 2700, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-
-	pd_extract_pdo_power(MAKE_BATT(/*v_max=*/25000, /*v_min=*/21000,
-				       /*p=*/61000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 25000, "%d");
-	TEST_EQ(min_mv, 21000, "%d");
-	TEST_EQ(ma, 2857, "%d"); /* Capped at PD_MAX_POWER_MW */
-
-	pd_extract_pdo_power(MAKE_VAR(/*v_max=*/5000, /*v_min=*/3300,
-				      /*c=*/3000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 5000, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 3000, "%d");
-	pd_extract_pdo_power(MAKE_VAR(/*v_max=*/20000, /*v_min=*/5000,
-				      /*c=*/2600),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 20000, "%d");
-	TEST_EQ(min_mv, 5000, "%d");
-	TEST_EQ(ma, 2600, "%d");
-	pd_extract_pdo_power(MAKE_VAR(/*v_max=*/20000, /*v_min=*/5000,
-				      /*c=*/4000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 20000, "%d");
-	TEST_EQ(min_mv, 5000, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-	pd_extract_pdo_power(MAKE_VAR(/*v_max=*/10000, /*v_min=*/3300,
-				      /*c=*/4000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 10000, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-	pd_extract_pdo_power(MAKE_VAR(/*v_max=*/22000, /*v_min=*/21000,
-				      /*c=*/4000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 22000, "%d");
-	TEST_EQ(min_mv, 21000, "%d");
-	TEST_EQ(ma, 2857, "%d"); /* Capped at PD_MAX_POWER_MW */
-
-	pd_extract_pdo_power(MAKE_AUG(/*v_max=*/5000, /*v_min=*/3300,
-				      /*c=*/3000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 5000, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 3000, "%d");
-	pd_extract_pdo_power(MAKE_AUG(/*v_max=*/20000, /*v_min=*/3300,
-				      /*c=*/2600),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 20000, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 2600, "%d");
-	pd_extract_pdo_power(MAKE_AUG(/*v_max=*/10000, /*v_min=*/3300,
-				      /*c=*/4000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 10000, "%d");
-	TEST_EQ(min_mv, 3300, "%d");
-	TEST_EQ(ma, 3000, "%d"); /* Capped at PD_MAX_CURRENT_MA */
-	pd_extract_pdo_power(MAKE_AUG(/*v_max=*/22000, /*v_min=*/21000,
-				      /*c=*/4000),
-			     &ma, &max_mv, &min_mv);
-	TEST_EQ(max_mv, 22000, "%d");
-	TEST_EQ(min_mv, 21000, "%d");
-	TEST_EQ(ma, 2857, "%d"); /* Capped at PD_MAX_POWER_MW */
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	RUN_TEST(test_pd_get_cc_state);
-	RUN_TEST(test_pd_extract_pdo_power);
-
-	test_print_result();
-}