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

diff --git a/zephyr/shim/src/console_buffer.c b/zephyr/shim/src/console_buffer.c
deleted file mode 100644
index 427ae47768..0000000000
--- a/zephyr/shim/src/console_buffer.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2021 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 <kernel.h>
-#include <zephyr.h>
-
-#include "common.h"
-#include "console.h"
-#include "ec_commands.h"
-
-static char console_buf[CONFIG_PLATFORM_EC_HOSTCMD_CONSOLE_BUF_SIZE];
-static uint32_t previous_snapshot_idx;
-static uint32_t current_snapshot_idx;
-static uint32_t tail_idx;
-
-static inline uint32_t next_idx(uint32_t cur_idx)
-{
-	return (cur_idx + 1) % ARRAY_SIZE(console_buf);
-}
-
-K_MUTEX_DEFINE(console_write_lock);
-
-void console_buf_notify_chars(const char *s, size_t len)
-{
-	/*
-	 * This is just notifying of console characters for debugging
-	 * output, so if we are unable to lock the mutex immediately,
-	 * then just drop the string.
-	 */
-	if (k_mutex_lock(&console_write_lock, K_NO_WAIT))
-		return;
-	/* We got the mutex. */
-	while (len--) {
-		/* Don't copy null byte into buffer */
-		if (!(*s))
-			continue;
-
-		uint32_t new_tail = next_idx(tail_idx);
-
-		/* Check if we are starting to overwrite our snapshot
-		 * heads
-		 */
-		if (new_tail == previous_snapshot_idx)
-			previous_snapshot_idx =
-				next_idx(previous_snapshot_idx);
-		if (new_tail == current_snapshot_idx)
-			current_snapshot_idx =
-				next_idx(current_snapshot_idx);
-
-		console_buf[new_tail] = *s++;
-		tail_idx = new_tail;
-	}
-	k_mutex_unlock(&console_write_lock);
-}
-
-enum ec_status uart_console_read_buffer_init(void)
-{
-	if (k_mutex_lock(&console_write_lock, K_MSEC(100)))
-		/* Failed to acquire console buffer mutex */
-		return EC_RES_TIMEOUT;
-
-	previous_snapshot_idx = current_snapshot_idx;
-	current_snapshot_idx = tail_idx;
-
-	k_mutex_unlock(&console_write_lock);
-
-	return EC_RES_SUCCESS;
-}
-
-int uart_console_read_buffer(uint8_t type, char *dest, uint16_t dest_size,
-			     uint16_t *write_count_out)
-{
-	uint32_t *head;
-	uint16_t write_count = 0;
-
-	switch (type) {
-	case CONSOLE_READ_NEXT:
-		/* Start from beginning of latest snapshot */
-		head = &current_snapshot_idx;
-		break;
-	case CONSOLE_READ_RECENT:
-		/* Start from end of previous snapshot */
-		head = &previous_snapshot_idx;
-		break;
-	default:
-		return EC_RES_INVALID_PARAM;
-	}
-
-	/* We need to make sure we have room for at least the null byte */
-	if (dest_size == 0)
-		return EC_RES_INVALID_PARAM;
-
-	if (k_mutex_lock(&console_write_lock, K_MSEC(100)))
-		/* Failed to acquire console buffer mutex */
-		return EC_RES_TIMEOUT;
-
-	if (*head == tail_idx) {
-		/* No new data, return empty response */
-		k_mutex_unlock(&console_write_lock);
-		return EC_RES_SUCCESS;
-	}
-
-	do {
-		if (write_count >= dest_size - 1)
-			/* Buffer is full, minus the space for a null byte */
-			break;
-
-		dest[write_count] = console_buf[*head];
-		write_count++;
-		*head = next_idx(*head);
-	} while (*head != tail_idx);
-
-	dest[write_count] = '\0';
-	write_count++;
-
-	*write_count_out = write_count;
-	k_mutex_unlock(&console_write_lock);
-
-	return EC_RES_SUCCESS;
-}
-
-/* ECOS uart buffer, putc is blocking instead. */
-int uart_buffer_full(void)
-{
-	return false;
-}