Sten <debian@sansys-electronic.com>: add support for ICEbear FDTI-based interface.

[openocd.git] / src / jtag / jlink.c

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 6665c7e32005924abe59108739add4294d73a9e1..d2e8947c12b635efe77f66eb5180cc4e9c745ebc 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -31,6 +31,7 @@
 
 #include <usb.h>
 #include <string.h>
+#include <errno.h>
 
 #include "log.h"
 
@@ -621,8 +622,6 @@ typedef struct
 static int pending_scan_results_length;
 static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
 
-static int last_tms;
-
 static void jlink_tap_init(void)
 {
        tap_length = 0;
@@ -642,7 +641,6 @@ static void jlink_tap_ensure_space(int scans, int bits)
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
-       last_tms = tms;
        int index = tap_length / 8;
 
        if (index >= JLINK_TAP_BUFFER_SIZE)
@@ -870,21 +868,17 @@ static int usb_bulk_with_retries(
                usb_dev_handle *dev, int ep,
                char *bytes, int size, int timeout)
 {
-       int rc = 0, tries = 3, this_size;
-
-       while (tries && size) {
+       int tries = 3, count = 0;
 
-               this_size = f(dev, ep, bytes, size, timeout);
-               if (this_size > 0) {
-                       
-                       size -= this_size;
-                       rc += this_size;
-                       bytes += this_size;
-
-               } else
-                       tries --;
+       while (tries && (count < size))
+       {
+               int result = f(dev, ep, bytes + count, size - count, timeout);
+               if (result > 0)
+                       count += result;
+               else if ((-ETIMEDOUT != result) || !--tries)
+                       return result;
        }
-       return rc;
+       return count;
 }
 
 static int wrap_usb_bulk_write(usb_dev_handle *dev, int ep,