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

diff --git a/core/host/timer.c b/core/host/timer.c
deleted file mode 100644
index 3c3695cad4..0000000000
--- a/core/host/timer.c
+++ /dev/null
@@ -1,105 +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.
- */
-
-/* Timer module */
-
-#include <stdint.h>
-#include <stdio.h>
-
-#include "task.h"
-#include "test_util.h"
-#include "timer.h"
-#include "util.h"
-
-static timestamp_t boot_time;
-static int time_set;
-
-void usleep(unsigned us)
-{
-	if (!task_start_called() || task_get_current() == TASK_ID_INVALID) {
-		udelay(us);
-		return;
-	}
-
-	ASSERT(!in_interrupt_context() &&
-	       task_get_current() != TASK_ID_INT_GEN);
-
-	task_wait_event(us);
-}
-
-timestamp_t _get_time(void)
-{
-	static timestamp_t time;
-
-	/*
-	 * We just monotonically increase the microsecond every time we check
-	 * the time. Do not depend on host system time as this introduces
-	 * flakyness in tests. The time is periodically fast forwarded with
-	 * force_time() during the host's task scheduler implementation.
-	 */
-	++time.val;
-	return time;
-}
-
-test_mockable timestamp_t get_time(void)
-{
-	timestamp_t ret = _get_time();
-	ret.val -= boot_time.val;
-	return ret;
-}
-
-uint32_t __hw_clock_source_read(void)
-{
-	return get_time().le.lo;
-}
-
-void force_time(timestamp_t ts)
-{
-	timestamp_t now = _get_time();
-	boot_time.val = now.val - ts.val;
-	time_set = 1;
-}
-
-void udelay(unsigned us)
-{
-	timestamp_t deadline;
-
-	if (!in_interrupt_context() && task_get_current() == TASK_ID_INT_GEN) {
-		interrupt_generator_udelay(us);
-		return;
-	}
-
-	deadline.val = get_time().val + us;
-	while (get_time().val < deadline.val)
-		;
-}
-
-int timestamp_expired(timestamp_t deadline, const timestamp_t *now)
-{
-	timestamp_t now_val;
-
-	if (!now) {
-		now_val = get_time();
-		now = &now_val;
-	}
-
-	return ((int64_t)(now->val - deadline.val) >= 0);
-}
-
-void timer_init(void)
-{
-
-	if (!time_set) {
-		/*
-		 * Start the timer just before the 64-bit rollover to try
-		 * and catch 32-bit rollover/truncation bugs.
-		 */
-		timestamp_t ts = {
-			.val = 0xFFFFFFF0
-		};
-
-		force_time(ts);
-	}
-}