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

diff --git a/test/inductive_charging.c b/test/inductive_charging.c
deleted file mode 100644
index d487e171fd..0000000000
--- a/test/inductive_charging.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2014 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 inductive charging module.
- */
-
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "inductive_charging.h"
-#include "lid_switch.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-
-#define START_CHARGE_DELAY 5000 /* ms */
-#define MONITOR_CHARGE_DONE_DELAY 1000 /* ms */
-#define TEST_CHECK_CHARGE_DELAY (START_CHARGE_DELAY + \
-				 MONITOR_CHARGE_DONE_DELAY + 500) /* ms */
-
-static void wait_for_lid_debounce(void)
-{
-	while (lid_is_open() != gpio_get_level(GPIO_LID_OPEN))
-		msleep(20);
-}
-
-static void set_lid_open(int lid_open)
-{
-	gpio_set_level(GPIO_LID_OPEN, lid_open);
-	wait_for_lid_debounce();
-}
-
-static int test_lid(void)
-{
-	/* Lid is open initially */
-	set_lid_open(1);
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-
-	/*
-	 * Close the lid. The EC should wait for 5 second before
-	 * enabling transmitter.
-	 */
-	set_lid_open(0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-
-	/* Transmitter should now be enabled. */
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-
-	/* Open the lid. Charging should stop. */
-	set_lid_open(1);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	return EC_SUCCESS;
-}
-
-static int test_charge_done(void)
-{
-	/* Close the lid to start charging */
-	set_lid_open(0);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-
-	/* Charging is done. Stop charging, but don't turn off transmitter. */
-	gpio_set_level(GPIO_CHARGE_DONE, 1);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	/* Oops, CHARGE_DONE changes again. We should ignore it. */
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	/* Open the lid. Charger should be turned off. */
-	set_lid_open(1);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	return EC_SUCCESS;
-}
-
-static int test_lid_open_during_charging(void)
-{
-	/* Close the lid. Start charging. */
-	set_lid_open(0);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-
-	/* Open the lid. Transmitter should be turned off. */
-	set_lid_open(1);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	/* Toggle charge done signal. Charging should not start. */
-	gpio_set_level(GPIO_CHARGE_DONE, 1);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	return EC_SUCCESS;
-}
-
-static int test_debounce_charge_done(void)
-{
-	/* Lid is open initially. */
-	set_lid_open(1);
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	/* Close the lid. Charging should start. */
-	set_lid_open(0);
-	msleep(START_CHARGE_DELAY + 100);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-
-	/* Within the first second, changes on CHARGE_DONE should be ignore. */
-	gpio_set_level(GPIO_CHARGE_DONE, 1);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-	msleep(100);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-	gpio_set_level(GPIO_CHARGE_DONE, 0);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-	msleep(100);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 1);
-
-	/* Changes on CHARGE_DONE after take effect. */
-	msleep(MONITOR_CHARGE_DONE_DELAY);
-	gpio_set_level(GPIO_CHARGE_DONE, 1);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 1);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	/* Open the lid. Charger should be turned off. */
-	set_lid_open(1);
-	msleep(TEST_CHECK_CHARGE_DELAY);
-	TEST_ASSERT(gpio_get_level(GPIO_BASE_CHG_VDD_EN) == 0);
-	TEST_ASSERT(gpio_get_level(GPIO_CHARGE_EN) == 0);
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	test_reset();
-
-	RUN_TEST(test_lid);
-	RUN_TEST(test_charge_done);
-	RUN_TEST(test_lid_open_during_charging);
-	RUN_TEST(test_debounce_charge_done);
-
-	test_print_result();
-}