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

diff --git a/common/cec.c b/common/cec.c
deleted file mode 100644
index 1bc3273c1d..0000000000
--- a/common/cec.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2018 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 "cec.h"
-#include "console.h"
-#include "task.h"
-
-#define CPRINTF(format, args...) cprintf(CC_CEC, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_CEC, format, ## args)
-
-/*
- * Mutex for the read-offset of the rx queue. Needed since the
- * queue is read and flushed from different contexts
- */
-static struct mutex rx_queue_readoffset_mutex;
-
-int cec_transfer_get_bit(const struct cec_msg_transfer *transfer)
-{
-	if (transfer->byte >= MAX_CEC_MSG_LEN)
-		return 0;
-
-	return transfer->buf[transfer->byte] & (0x80 >> transfer->bit);
-}
-
-void cec_transfer_set_bit(struct cec_msg_transfer *transfer, int val)
-{
-	uint8_t bit_flag;
-
-	if (transfer->byte >= MAX_CEC_MSG_LEN)
-		return;
-	bit_flag = 0x80 >> transfer->bit;
-	transfer->buf[transfer->byte] &= ~bit_flag;
-	if (val)
-		transfer->buf[transfer->byte] |= bit_flag;
-}
-
-void cec_transfer_inc_bit(struct cec_msg_transfer *transfer)
-{
-	if (++(transfer->bit) == 8) {
-		if (transfer->byte >= MAX_CEC_MSG_LEN)
-			return;
-		transfer->bit = 0;
-		transfer->byte++;
-	}
-}
-
-int cec_transfer_is_eom(const struct cec_msg_transfer *transfer, int len)
-{
-	if (transfer->bit)
-		return 0;
-	return (transfer->byte == len);
-}
-
-void cec_rx_queue_flush(struct cec_rx_queue *queue)
-{
-	mutex_lock(&rx_queue_readoffset_mutex);
-	queue->read_offset = 0;
-	mutex_unlock(&rx_queue_readoffset_mutex);
-	queue->write_offset = 0;
-}
-
-int cec_rx_queue_push(struct cec_rx_queue *queue, const uint8_t *msg,
-		      uint8_t msg_len)
-{
-	int i;
-	uint32_t offset;
-
-	if (msg_len > MAX_CEC_MSG_LEN || msg_len == 0)
-		return EC_ERROR_INVAL;
-
-	offset = queue->write_offset;
-	/* Fill in message length last, if successful. Set to zero for now */
-	queue->buf[offset] = 0;
-	offset = (offset + 1) % CEC_RX_BUFFER_SIZE;
-
-	for (i = 0 ; i < msg_len; i++) {
-		if (offset == queue->read_offset) {
-			/* Buffer full */
-			return EC_ERROR_OVERFLOW;
-		}
-
-		queue->buf[offset] = msg[i];
-		offset = (offset + 1) % CEC_RX_BUFFER_SIZE;
-	}
-
-	/*
-	 * Don't commit if we caught up with read-offset
-	 * since that would indicate an empty buffer
-	 */
-	if (offset == queue->read_offset) {
-		/* Buffer full */
-		return EC_ERROR_OVERFLOW;
-	}
-
-	/* Commit the push */
-	queue->buf[queue->write_offset] = msg_len;
-	queue->write_offset = offset;
-
-	return EC_SUCCESS;
-}
-
-int cec_rx_queue_pop(struct cec_rx_queue *queue, uint8_t *msg,
-		     uint8_t *msg_len)
-{
-	int i;
-
-	mutex_lock(&rx_queue_readoffset_mutex);
-	if (queue->read_offset == queue->write_offset) {
-		/* Queue empty */
-		mutex_unlock(&rx_queue_readoffset_mutex);
-		*msg_len = 0;
-		return -1;
-	}
-
-	/* The first byte in the buffer is the message length */
-	*msg_len = queue->buf[queue->read_offset];
-	if (*msg_len == 0 || *msg_len > MAX_CEC_MSG_LEN) {
-		mutex_unlock(&rx_queue_readoffset_mutex);
-		*msg_len = 0;
-		CPRINTF("Invalid CEC msg size: %u\n", *msg_len);
-		return -1;
-	}
-
-	queue->read_offset = (queue->read_offset + 1) % CEC_RX_BUFFER_SIZE;
-	for (i = 0; i < *msg_len; i++) {
-		msg[i] = queue->buf[queue->read_offset];
-		queue->read_offset = (queue->read_offset + 1) %
-							CEC_RX_BUFFER_SIZE;
-
-	}
-
-	mutex_unlock(&rx_queue_readoffset_mutex);
-
-	return 0;
-}