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

diff --git a/extra/usb_gpio/usb_gpio.c b/extra/usb_gpio/usb_gpio.c
deleted file mode 100644
index 8973f3d304..0000000000
--- a/extra/usb_gpio/usb_gpio.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2014 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 <libusb.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define CHECK(expression)					\
-	({							\
-		int error__ = (expression);			\
-								\
-		if (error__ != 0) {				\
-			fprintf(stderr,				\
-				"libusb error: %s:%d %s\n",	\
-				__FILE__,			\
-				__LINE__,			\
-				libusb_error_name(error__));	\
-			return error__;				\
-		}						\
-								\
-		error__;					\
-	})
-
-#define TRANSFER_TIMEOUT_MS 100
-
-static int gpio_write(libusb_device_handle *device,
-		      uint32_t set_mask,
-		      uint32_t clear_mask)
-{
-	uint8_t command[8];
-	int     transferred;
-
-	command[0] = (set_mask >>  0) & 0xff;
-	command[1] = (set_mask >>  8) & 0xff;
-	command[2] = (set_mask >> 16) & 0xff;
-	command[3] = (set_mask >> 24) & 0xff;
-
-	command[4] = (clear_mask >>  0) & 0xff;
-	command[5] = (clear_mask >>  8) & 0xff;
-	command[6] = (clear_mask >> 16) & 0xff;
-	command[7] = (clear_mask >> 24) & 0xff;
-
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_OUT | 2,
-				   command,
-				   sizeof(command),
-				   &transferred,
-				   TRANSFER_TIMEOUT_MS));
-
-	if (transferred != sizeof(command)) {
-		fprintf(stderr,
-			"Failed to transfer full command "
-			"(sent %d of %d bytes)\n",
-			transferred,
-			(int)sizeof(command));
-		return LIBUSB_ERROR_OTHER;
-	}
-
-	return 0;
-}
-
-static int gpio_read(libusb_device_handle *device, uint32_t *mask)
-{
-	uint8_t response[4];
-	int     transferred;
-
-	/*
-	 * The first query does triggers the sampling of the GPIO values, the
-	 * second query reads them back.
-	 */
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_IN | 2,
-				   response,
-				   sizeof(response),
-				   &transferred,
-				   TRANSFER_TIMEOUT_MS));
-
-	CHECK(libusb_bulk_transfer(device,
-				   LIBUSB_ENDPOINT_IN | 2,
-				   response,
-				   sizeof(response),
-				   &transferred,
-				   TRANSFER_TIMEOUT_MS));
-
-	if (transferred != sizeof(response)) {
-		fprintf(stderr,
-			"Failed to transfer full response "
-			"(read %d of %d bytes)\n",
-			transferred,
-			(int)sizeof(response));
-		return LIBUSB_ERROR_OTHER;
-	}
-
-	*mask = (response[0] <<  0 |
-		 response[1] <<  8 |
-		 response[2] << 16 |
-		 response[3] << 24);
-
-	return 0;
-}
-
-int main(int argc, char **argv)
-{
-	libusb_context       *context;
-	libusb_device_handle *device;
-	uint16_t              vendor_id  = 0x18d1; /* Google */
-	uint16_t              product_id = 0x500f; /* discovery-stm32f072 */
-	int                   interface = 1;	   /* gpio interface */
-
-	if (!(argc == 2 && strcmp(argv[1], "read")  == 0) &&
-	    !(argc == 4 && strcmp(argv[1], "write") == 0)) {
-		puts("Usage: usb_gpio read\n"
-		     "       usb_gpio write <set_mask> <clear_mask>\n");
-		return 1;
-	}
-
-	CHECK(libusb_init(&context));
-
-	device = libusb_open_device_with_vid_pid(context,
-						 vendor_id,
-						 product_id);
-
-	if (device == NULL) {
-		fprintf(stderr,
-			"Unable to find device 0x%04x:0x%04x\n",
-			vendor_id,
-			product_id);
-		return 1;
-	}
-
-	CHECK(libusb_set_auto_detach_kernel_driver(device, 1));
-	CHECK(libusb_claim_interface(device, interface));
-
-	if (argc == 2 && strcmp(argv[1], "read") == 0) {
-		uint32_t mask;
-
-		CHECK(gpio_read(device, &mask));
-
-		printf("GPIO mask: 0x%08x\n", mask);
-	}
-
-	if (argc == 4 && strcmp(argv[1], "write") == 0) {
-		uint32_t set_mask   = strtol(argv[2], NULL, 0);
-		uint32_t clear_mask = strtol(argv[3], NULL, 0);
-
-		CHECK(gpio_write(device, set_mask, clear_mask));
-	}
-
-	libusb_close(device);
-	libusb_exit(context);
-
-	return 0;
-}