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

diff --git a/test/interrupt.c b/test/interrupt.c
deleted file mode 100644
index ca98309e1f..0000000000
--- a/test/interrupt.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2013 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 interrupt support of EC emulator.
- */
-#include <stdio.h>
-
-#include "common.h"
-#include "console.h"
-#include "task.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-
-static int main_count;
-static int has_error;
-static int interrupt_count;
-
-/* period between 50us and 3.2ms */
-#define PERIOD_US(num) (((num % 64) + 1) * 50)
-
-void my_isr(void)
-{
-	int i = main_count;
-	udelay(3 * PERIOD_US(prng_no_seed()));
-	if (i != main_count || !in_interrupt_context())
-		has_error = 1;
-	interrupt_count++;
-}
-
-static volatile uint32_t enable_ready_reg;
-
-static void set_ready_bit(void)
-{
-	if (enable_ready_reg & BIT(0))
-		enable_ready_reg |= BIT(1);
-}
-
-void interrupt_generator(void)
-{
-	while (1) {
-		udelay(3 * PERIOD_US(prng_no_seed()));
-		task_trigger_test_interrupt(my_isr);
-		task_trigger_test_interrupt(set_ready_bit);
-	}
-}
-
-static int interrupt_test(void)
-{
-	timestamp_t deadline = get_time();
-	deadline.val += SECOND / 2;
-	while (!timestamp_expired(deadline, NULL))
-		++main_count;
-
-	ccprintf("Interrupt count: %d\n", interrupt_count);
-	ccprintf("Main thread tick: %d\n", main_count);
-
-	TEST_ASSERT(!has_error);
-	TEST_ASSERT(!in_interrupt_context());
-
-	return EC_SUCCESS;
-}
-
-static int interrupt_disable_test(void)
-{
-	timestamp_t deadline = get_time();
-	int start_int_cnt, end_int_cnt;
-	deadline.val += SECOND / 2;
-
-	interrupt_disable();
-	start_int_cnt = interrupt_count;
-	while (!timestamp_expired(deadline, NULL))
-		;
-	end_int_cnt = interrupt_count;
-	interrupt_enable();
-
-	TEST_ASSERT(start_int_cnt == end_int_cnt);
-
-	return EC_SUCCESS;
-}
-
-static int test_wait_for_ready(void)
-{
-	wait_for_ready(&enable_ready_reg, BIT(0), BIT(1));
-	TEST_EQ(enable_ready_reg, BIT(0) | BIT(1), "%x");
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	test_reset();
-
-	RUN_TEST(interrupt_test);
-	RUN_TEST(interrupt_disable_test);
-	RUN_TEST(test_wait_for_ready);
-
-	test_print_result();
-}