jtag/mpsse: mpsse_flush should not treat LIBUSB_ERROR_INTERRUPTED as an error

[openocd.git] / src / jtag / drivers / openjtag.c

diff --git a/src/jtag/drivers/openjtag.c b/src/jtag/drivers/openjtag.c
index 771b6e6f3ecd522ac913602135995adf9356e8cd..45064fe6a274eb46a05c574a6884f16c50df12f7 100644 (file)
--- a/src/jtag/drivers/openjtag.c
+++ b/src/jtag/drivers/openjtag.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*******************************************************************************
  *   Driver for OpenJTAG Project (www.openjtag.org)                            *
  *   Compatible with libftdi drivers.                                          *
@@ -18,19 +20,6 @@
  *   And jlink.c                                                               *
  *   Copyright (C) 2008 by Spencer Oliver                                      *
  *   spen@spen-soft.co.uk                                                      *
- *                                                                             *
- *   This program is free software; you can redistribute it and/or modify      *
- *   it under the terms of the GNU General Public License as published by      *
- *   the Free Software Foundation; either version 2 of the License, or         *
- *   (at your option) any later version.                                       *
- *                                                                             *
- *   This program is distributed in the hope that it will be useful,           *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
- *   GNU General Public License for more details.                              *
- *                                                                             *
- *   You should have received a copy of the GNU General Public License         *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
  ***************************************************************************/
 
 /***************************************************************************
@@ -250,10 +239,10 @@ static int openjtag_buf_write_cy7c65215(
 
        ret = jtag_libusb_control_transfer(usbh, CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_WRITE, size, 0,
-                                                                          NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
-               LOG_ERROR("vendor command failed, error %d", ret);
-               return ERROR_JTAG_DEVICE_ERROR;
+                                                                          NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
+               LOG_ERROR("vendor command failed");
+               return ret;
        }
 
        if (jtag_libusb_bulk_write(usbh, ep_out, (char *)buf, size,
@@ -317,10 +306,10 @@ static int openjtag_buf_read_cy7c65215(
 
        ret = jtag_libusb_control_transfer(usbh, CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_READ, qty, 0,
-                                                                          NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
-               LOG_ERROR("vendor command failed, error %d", ret);
-               return ERROR_JTAG_DEVICE_ERROR;
+                                                                          NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
+               LOG_ERROR("vendor command failed");
+               return ret;
        }
 
        if (jtag_libusb_bulk_read(usbh, ep_in, (char *)buf, qty,
@@ -449,7 +438,7 @@ static int openjtag_init_cy7c65215(void)
        int ret;
 
        usbh = NULL;
-       ret = jtag_libusb_open(cy7c65215_vids, cy7c65215_pids, &usbh, NULL);
+       ret = jtag_libusb_open(cy7c65215_vids, cy7c65215_pids, NULL, &usbh, NULL);
        if (ret != ERROR_OK) {
                LOG_ERROR("unable to open cy7c65215 device");
                goto err;
@@ -466,8 +455,8 @@ static int openjtag_init_cy7c65215(void)
        ret = jtag_libusb_control_transfer(usbh,
                                                                           CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_ENABLE,
-                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0) {
+                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK) {
                LOG_ERROR("could not enable JTAG module");
                goto err;
        }
@@ -477,7 +466,7 @@ static int openjtag_init_cy7c65215(void)
 err:
        if (usbh)
                jtag_libusb_close(usbh);
-       return ERROR_JTAG_INIT_FAILED;
+       return ret;
 }
 
 static int openjtag_init(void)
@@ -519,8 +508,8 @@ static int openjtag_quit_cy7c65215(void)
        ret = jtag_libusb_control_transfer(usbh,
                                                                           CY7C65215_JTAG_REQUEST,
                                                                           CY7C65215_JTAG_DISABLE,
-                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT);
-       if (ret < 0)
+                                                                          0, 0, NULL, 0, CY7C65215_USB_TIMEOUT, NULL);
+       if (ret != ERROR_OK)
                LOG_WARNING("could not disable JTAG module");
 
        jtag_libusb_close(usbh);
@@ -753,16 +742,18 @@ static void openjtag_execute_runtest(struct jtag_command *cmd)
                tap_set_state(TAP_IDLE);
        }
 
-       if (cmd->cmd.runtest->num_cycles > 16)
-               LOG_WARNING("num_cycles > 16 on run test");
-
        if (openjtag_variant != OPENJTAG_VARIANT_CY7C65215 ||
                cmd->cmd.runtest->num_cycles) {
                uint8_t command;
-               command = 7;
-               command |= ((cmd->cmd.runtest->num_cycles - 1) & 0x0F) << 4;
+               int cycles = cmd->cmd.runtest->num_cycles;
 
-               openjtag_add_byte(command);
+               do {
+                       command = 7;
+                       command |= (((cycles > 16 ? 16 : cycles) - 1) & 0x0F) << 4;
+
+                       openjtag_add_byte(command);
+                       cycles -= 16;
+               } while (cycles > 0);
        }
 
        tap_set_end_state(end_state);
@@ -870,6 +861,17 @@ COMMAND_HANDLER(openjtag_handle_variant_command)
        return ERROR_OK;
 }
 
+COMMAND_HANDLER(openjtag_handle_vid_pid_command)
+{
+       if (CMD_ARGC != 2)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], openjtag_vid);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[1], openjtag_pid);
+
+       return ERROR_OK;
+}
+
 static const struct command_registration openjtag_subcommand_handlers[] = {
        {
                .name = "device_desc",
@@ -885,6 +887,13 @@ static const struct command_registration openjtag_subcommand_handlers[] = {
                .help = "set the OpenJTAG variant",
                .usage = "variant-string",
        },
+       {
+               .name = "vid_pid",
+               .handler = openjtag_handle_vid_pid_command,
+               .mode = COMMAND_CONFIG,
+               .help = "USB VID and PID of the adapter",
+               .usage = "vid pid",
+       },
        COMMAND_REGISTRATION_DONE
 };