tcl/target: Switch Renesas R-Car Gen2 boards to new config

[fw/openocd] / src / jtag / drivers / libusb0_common.c

diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c
index 9cf85b70e9ff2a3382bd7adc079072342b42a112..0e78589116bd249a56daeba83b7a377a9c411a7b 100644 (file)
--- a/src/jtag/drivers/libusb0_common.c
+++ b/src/jtag/drivers/libusb0_common.c
@@ -23,6 +23,18 @@
 #include "log.h"
 #include "libusb0_common.h"
 
+static int jtag_libusb_error(int err)
+{
+       switch (err) {
+       case 0:
+               return ERROR_OK;
+       case -ETIMEDOUT:
+               return ERROR_TIMEOUT_REACHED;
+       default:
+               return ERROR_FAIL;
+       }
+}
+
 static bool jtag_libusb_match(struct jtag_libusb_device *dev,
                const uint16_t vids[], const uint16_t pids[])
 {
@@ -68,6 +80,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
                struct jtag_libusb_device_handle **out)
 {
        int retval = ERROR_FAIL;
+       bool serial_mismatch = false;
        struct jtag_libusb_device_handle *libusb_handle;
        usb_init();
 
@@ -90,14 +103,20 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
                        /* Device must be open to use libusb_get_string_descriptor_ascii. */
                        if (serial != NULL &&
                                        !string_descriptor_equal(libusb_handle, dev->descriptor.iSerialNumber, serial)) {
+                               serial_mismatch = true;
                                usb_close(libusb_handle);
                                continue;
                        }
                        *out = libusb_handle;
                        retval = ERROR_OK;
+                       serial_mismatch = false;
                        break;
                }
        }
+
+       if (serial_mismatch)
+               LOG_INFO("No device matches the serial string");
+
        return retval;
 }
 
@@ -123,15 +142,37 @@ int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t request
 }
 
 int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
-               int size, int timeout)
+               int size, int timeout, int *transferred)
 {
-       return usb_bulk_write(dev, ep, bytes, size, timeout);
+       int ret;
+
+       *transferred = 0;
+
+       ret = usb_bulk_write(dev, ep, bytes, size, timeout);
+
+       if (ret < 0) {
+               LOG_ERROR("usb_bulk_write error: %i", ret);
+               return jtag_libusb_error(ret);
+       }
+
+       return ERROR_OK;
 }
 
 int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
-               int size, int timeout)
+               int size, int timeout, int *transferred)
 {
-       return usb_bulk_read(dev, ep, bytes, size, timeout);
+       int ret;
+
+       *transferred = 0;
+
+       ret = usb_bulk_read(dev, ep, bytes, size, timeout);
+
+       if (ret < 0) {
+               LOG_ERROR("usb_bulk_read error: %i", ret);
+               return jtag_libusb_error(ret);
+       }
+
+       return ERROR_OK;
 }
 
 int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,