contrib/firmware: Change USB interruption handling for JTAG/I2C communications

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

diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c
index 00b2f9675e0b77e08defcc8f88e2e8aa9408e9a0..4260e2d39db23ca3501765c074979185190ce1f7 100644 (file)
--- a/src/jtag/drivers/ti_icdi_usb.c
+++ b/src/jtag/drivers/ti_icdi_usb.c
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *                                                                         *
  *   Copyright (C) 2012 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/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -23,6 +12,7 @@
 
 /* project specific includes */
 #include <helper/binarybuffer.h>
+#include <jtag/adapter.h>
 #include <jtag/interface.h>
 #include <jtag/hla/hla_layout.h>
 #include <jtag/hla/hla_transport.h>
@@ -36,8 +26,8 @@
 #define ICDI_WRITE_ENDPOINT 0x02
 #define ICDI_READ_ENDPOINT 0x83
 
-#define ICDI_WRITE_TIMEOUT 1000
-#define ICDI_READ_TIMEOUT 1000
+#define ICDI_WRITE_TIMEOUT (LIBUSB_TIMEOUT_MS)
+#define ICDI_READ_TIMEOUT (LIBUSB_TIMEOUT_MS)
 #define ICDI_PACKET_SIZE 2048
 
 #define PACKET_START "$"
@@ -122,7 +112,7 @@ static int icdi_send_packet(void *handle, int len)
        int result, retry = 0;
        int transferred = 0;
 
-       assert(handle != NULL);
+       assert(handle);
 
        /* check we have a large enough buffer for checksum "#00" */
        if (len + 3 > h->max_packet) {
@@ -253,7 +243,7 @@ static int icdi_get_cmd_result(void *handle)
        int offset = 0;
        char ch;
 
-       assert(handle != NULL);
+       assert(handle);
 
        do {
                ch = h->read_buffer[offset++];
@@ -379,7 +369,7 @@ static int icdi_usb_query(void *handle)
        if (h->max_packet != ICDI_PACKET_SIZE) {
                h->read_buffer = realloc(h->read_buffer, h->max_packet);
                h->write_buffer = realloc(h->write_buffer, h->max_packet);
-               if (h->read_buffer == 0 || h->write_buffer == 0) {
+               if (!h->read_buffer || !h->write_buffer) {
                        LOG_ERROR("unable to reallocate memory");
                        return ERROR_FAIL;
                }
@@ -674,18 +664,18 @@ static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
 
        h = calloc(1, sizeof(struct icdi_usb_handle_s));
 
-       if (h == 0) {
+       if (!h) {
                LOG_ERROR("unable to allocate memory");
                return ERROR_FAIL;
        }
 
        for (uint8_t i = 0; param->vid[i] && param->pid[i]; ++i)
                LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x serial: %s", param->transport,
-                       param->vid[i], param->pid[i], param->serial ? param->serial : "");
+                       param->vid[i], param->pid[i], adapter_get_required_serial() ? adapter_get_required_serial() : "");
 
        /* TI (Stellaris) ICDI provides its serial number in the USB descriptor;
           no need to provide a callback here. */
-       jtag_libusb_open(param->vid, param->pid, param->serial, &h->usb_dev, NULL);
+       jtag_libusb_open(param->vid, param->pid, NULL, &h->usb_dev, NULL);
 
        if (!h->usb_dev) {
                LOG_ERROR("open failed");
@@ -722,7 +712,7 @@ static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
        h->write_buffer = malloc(ICDI_PACKET_SIZE);
        h->max_packet = ICDI_PACKET_SIZE;
 
-       if (h->read_buffer == 0 || h->write_buffer == 0) {
+       if (!h->read_buffer || !h->write_buffer) {
                LOG_DEBUG("malloc failed");
                goto error_open;
        }