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

diff --git a/cts/interrupt/dut.c b/cts/interrupt/dut.c
deleted file mode 100644
index 3c83e5701f..0000000000
--- a/cts/interrupt/dut.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Copyright 2016 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 <string.h>
-#include "common.h"
-#include "cts_common.h"
-#include "gpio.h"
-#include "registers.h"
-#include "task.h"
-#include "timer.h"
-#include "watchdog.h"
-
-static int got_interrupt;
-static int wake_me_up;
-static int state_index;
-static char state[4];
-
-/*
- * Raw busy loop. Returns 1 if loop finishes before interrupt is triggered.
- * Loop length is controlled by busy_loop_timeout. It has to be set to the
- * value which makes the loop last longer than CTS_INTERRUPT_TRIGGER_DELAY_US.
- */
-static int busy_loop(void)
-{
-	/* TODO: Derive a proper value from clock speed */
-	const uint32_t busy_loop_timeout = 0xfffff;
-	uint32_t counter = 0;
-
-	while (counter++ < busy_loop_timeout) {
-		if (got_interrupt)
-			break;
-		watchdog_reload();
-	}
-	if (counter > busy_loop_timeout)
-		return 1;
-
-	return 0;
-}
-
-/*
- * Interrupt handler.
- */
-void cts_irq1(enum gpio_signal signal)
-{
-	state[state_index++] = 'B';
-
-	got_interrupt = in_interrupt_context();
-
-	/* Wake up the CTS task */
-	if (wake_me_up)
-		task_wake(TASK_ID_CTS);
-
-	busy_loop();
-
-	state[state_index++] = 'C';
-}
-
-void cts_irq2(enum gpio_signal signal)
-{
-	state[state_index++] = 'A';
-	busy_loop();
-	state[state_index++] = 'D';
-}
-
-void clean_state(void)
-{
-	uint32_t *event;
-
-	interrupt_enable();
-	got_interrupt = 0;
-	wake_me_up = 0;
-	state_index = 0;
-	memset(state, '_', sizeof(state));
-	event = task_get_event_bitmap(TASK_ID_CTS);
-	*event = 0;
-}
-
-enum cts_rc test_task_wait_event(void)
-{
-	uint32_t event;
-
-	wake_me_up = 1;
-
-	/* Sleep and wait for interrupt. This shouldn't time out. */
-	event = task_wait_event(CTS_INTERRUPT_TRIGGER_DELAY_US * 2);
-	if (event != TASK_EVENT_WAKE) {
-		CPRINTS("Woken up by unexpected event: 0x%08x", event);
-		return CTS_RC_FAILURE;
-	}
-	if (!got_interrupt) {
-		CPRINTS("Interrupt context not detected");
-		return CTS_RC_TIMEOUT;
-	}
-
-	return CTS_RC_SUCCESS;
-}
-
-enum cts_rc test_task_disable_irq(void)
-{
-	uint32_t event;
-
-	wake_me_up = 1;
-
-	task_disable_irq(CTS_IRQ_NUMBER);
-	/* Sleep and wait for interrupt. This should time out. */
-	event = task_wait_event(CTS_INTERRUPT_TRIGGER_DELAY_US * 2);
-	if (event != TASK_EVENT_TIMER) {
-		CPRINTS("Woken up by unexpected event: 0x%08x", event);
-		return CTS_RC_FAILURE;
-	}
-	task_enable_irq(CTS_IRQ_NUMBER);
-
-	return CTS_RC_SUCCESS;
-}
-
-enum cts_rc test_interrupt_enable(void)
-{
-	if (busy_loop()) {
-		CPRINTS("Timeout before interrupt");
-		return CTS_RC_TIMEOUT;
-	}
-	return CTS_RC_SUCCESS;
-}
-
-enum cts_rc test_interrupt_disable(void)
-{
-	interrupt_disable();
-	if (!busy_loop()) {
-		CPRINTS("Expected timeout but didn't");
-		return CTS_RC_FAILURE;
-	}
-	return CTS_RC_SUCCESS;
-}
-
-enum cts_rc test_nested_interrupt_low_high(void)
-{
-	uint32_t event;
-
-	event = task_wait_event(CTS_INTERRUPT_TRIGGER_DELAY_US * 4);
-	if (event != TASK_EVENT_TIMER) {
-		CPRINTS("Woken up by unexpected event: 0x%08x", event);
-		return CTS_RC_FAILURE;
-	}
-	if (!got_interrupt) {
-		CPRINTS("Interrupt context not detected");
-		return CTS_RC_TIMEOUT;
-	}
-	if (memcmp(state, "ABCD", sizeof(state))) {
-		CPRINTS("State transition differs from expectation");
-		return CTS_RC_FAILURE;
-	}
-
-	return CTS_RC_SUCCESS;
-}
-
-enum cts_rc test_nested_interrupt_high_low(void)
-{
-	uint32_t event;
-
-	event = task_wait_event(CTS_INTERRUPT_TRIGGER_DELAY_US * 4);
-	if (event != TASK_EVENT_TIMER) {
-		CPRINTS("Woken up by unexpected event: 0x%08x", event);
-		return CTS_RC_FAILURE;
-	}
-
-	if (memcmp(state, "BCAD", sizeof(state))) {
-		CPRINTS("State transition differs from expectation");
-		return CTS_RC_FAILURE;
-	}
-
-	return CTS_RC_SUCCESS;
-}
-
-#include "cts_testlist.h"
-
-void cts_task(void)
-{
-	gpio_enable_interrupt(GPIO_CTS_IRQ1);
-	gpio_enable_interrupt(GPIO_CTS_IRQ2);
-	cts_main_loop(tests, "Interrupt");
-	task_wait_event(-1);
-}