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

diff --git a/chip/stm32/usart_tx_dma.c b/chip/stm32/usart_tx_dma.c
deleted file mode 100644
index 0c8e2c73d6..0000000000
--- a/chip/stm32/usart_tx_dma.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2015 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 "usart_tx_dma.h"
-
-#include "usart.h"
-#include "common.h"
-#include "registers.h"
-#include "system.h"
-#include "task.h"
-#include "util.h"
-
-void usart_tx_dma_written(struct consumer const *consumer, size_t count)
-{
-	struct usart_config const *config =
-		DOWNCAST(consumer, struct usart_config, consumer);
-
-	task_trigger_irq(config->hw->irq);
-}
-
-void usart_tx_dma_init(struct usart_config const *config)
-{
-	struct usart_tx_dma const *dma_config =
-		DOWNCAST(config->tx, struct usart_tx_dma const, usart_tx);
-
-	intptr_t base = config->hw->base;
-
-	STM32_USART_CR1(base) |= STM32_USART_CR1_TE;
-	STM32_USART_CR3(base) |= STM32_USART_CR3_DMAT;
-
-	dma_config->state->dma_active = 0;
-}
-
-static void usart_tx_dma_start(struct usart_config const *config,
-			       struct usart_tx_dma const *dma_config)
-{
-	struct usart_tx_dma_state volatile *state = dma_config->state;
-	intptr_t                           base   = config->hw->base;
-
-	struct dma_option options = {
-		.channel = dma_config->channel,
-		.periph  = (void *)&STM32_USART_TDR(base),
-		.flags   = (STM32_DMA_CCR_MSIZE_8_BIT |
-			    STM32_DMA_CCR_PSIZE_8_BIT),
-	};
-
-	/*
-	 * Limit our DMA transfer.  If we didn't do this then it would be
-	 * possible to start a large DMA transfer of an entirely full buffer
-	 * that would hold up any additional writes to the TX queue
-	 * unnecessarily.
-	 */
-	state->chunk.count = MIN(state->chunk.count, dma_config->max_bytes);
-
-	dma_prepare_tx(&options, state->chunk.count, state->chunk.buffer);
-
-	state->dma_active = 1;
-
-	usart_clear_tc(config);
-	STM32_USART_CR1(base) |= STM32_USART_CR1_TCIE;
-
-	dma_go(dma_get_channel(options.channel));
-}
-
-static void usart_tx_dma_stop(struct usart_config const *config,
-			      struct usart_tx_dma const *dma_config)
-{
-	dma_config->state->dma_active = 0;
-
-	STM32_USART_CR1(config->hw->base) &= ~STM32_USART_CR1_TCIE;
-}
-
-void usart_tx_dma_interrupt(struct usart_config const *config)
-{
-	struct usart_tx_dma const *dma_config =
-		DOWNCAST(config->tx, struct usart_tx_dma const, usart_tx);
-	struct usart_tx_dma_state volatile *state = dma_config->state;
-
-	/*
-	 * If we have completed a DMA transaction, or if we haven't yet started
-	 * one then we clean up and start one now.
-	 */
-	if ((STM32_USART_SR(config->hw->base) & STM32_USART_SR_TC) ||
-	    !state->dma_active) {
-		struct queue const *queue = config->consumer.queue;
-
-		/*
-		 * Only advance the queue head (indicating that we have read
-		 * units from the queue if we had an active DMA transfer.
-		 */
-		if (state->dma_active)
-			queue_advance_head(queue, state->chunk.count);
-
-		state->chunk = queue_get_read_chunk(queue);
-
-		if (state->chunk.count)
-			usart_tx_dma_start(config, dma_config);
-		else
-			usart_tx_dma_stop(config, dma_config);
-	}
-}