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

diff --git a/test/timer_dos.c b/test/timer_dos.c
deleted file mode 100644
index c681300102..0000000000
--- a/test/timer_dos.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2012 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.
- *
- * Tasks for timer test.
- */
-
-#include "common.h"
-#include "console.h"
-#include "task.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-
-/* period between 500us and 128ms */
-#define PERIOD_US(num) (((num % 256) + 1) * 500)
-
-#define TEST_TIME (3 * SECOND)
-
-#define ERROR_MARGIN 5
-
-static int calculate_golden(uint32_t seed)
-{
-	int golden = 0;
-	uint32_t elapsed = 0;
-	while (1) {
-		elapsed += PERIOD_US(seed);
-		++golden;
-		if (elapsed >= TEST_TIME)
-			return golden;
-		seed = prng(seed);
-	}
-}
-
-int task_timer(void *seed)
-{
-	uint32_t num = (uint32_t)(uintptr_t)seed;
-	int golden_cnt = calculate_golden(num);
-	task_id_t id = task_get_current();
-	timestamp_t start;
-	int cnt = 0;
-
-	while (1) {
-		task_wait_event(-1);
-
-		ccprintf("\n[Timer task %d]\n", id);
-		start = get_time();
-
-		while (get_time().val - start.val < TEST_TIME) {
-			/* Wait for a "random" period */
-			task_wait_event(PERIOD_US(num));
-			ccprintf("%01d\n", id);
-			cnt++;
-			/* next pseudo random delay */
-			num = prng(num);
-		}
-		ccprintf("Task %d: Count=%d Golden=%d\n", id, cnt, golden_cnt);
-		cnt -= golden_cnt;
-		if (cnt < 0)
-			cnt = -cnt;
-		if (cnt > ERROR_MARGIN) {
-			ccprintf("Count differs from Golden by more than %d!\n",
-				 ERROR_MARGIN);
-			test_fail();
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-void run_test(int argc, char **argv)
-{
-	wait_for_task_started();
-	task_wake(TASK_ID_TMRD);
-	task_wake(TASK_ID_TMRC);
-	task_wake(TASK_ID_TMRB);
-	task_wake(TASK_ID_TMRA);
-	usleep(TEST_TIME + SECOND);
-	test_pass();
-}