Zach Welch <zw@superlucidity.net> add --enable-verbose* options

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

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 7eae9049deab563d2c73ef2b9906e9ba9307b29c..1c7a39887f0b2487aac0f738c3b755a1b4472a34 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -34,18 +34,6 @@
 
 #include "log.h"
 
-/* enable this to debug communication
- */
-#if 0
-#define _DEBUG_USB_COMMS_
-#endif
-
-#ifdef _DEBUG_JTAG_IO_
-#define DEBUG_JTAG_IO(expr ...)        LOG_DEBUG(expr)
-#else
-#define DEBUG_JTAG_IO(expr ...)
-#endif
-
 #define VID 0x1366
 #define PID 0x0101
 
@@ -537,7 +525,7 @@ static int jlink_get_version_info(void)
                if (result == len)
                {
                        usb_in_buffer[result] = 0;
-                       LOG_INFO((char *)usb_in_buffer);
+                       LOG_INFO("%s", (char *)usb_in_buffer);
                        return ERROR_OK;
                }
        }
@@ -859,15 +847,17 @@ static int jlink_usb_message(jlink_jtag_t *jlink_jtag, int out_length, int in_le
        }
 }
 
-static int usb_bulk_write_ex(usb_dev_handle *dev, int ep, char *bytes, int size,
-                      int timeout) {
-
+/* calls the given usb_bulk_* function, allowing for the data to trickle in with some timeouts  */
+static int usb_bulk_with_retries(
+               int (*f)(usb_dev_handle *, int, char *, int, int),
+               usb_dev_handle *dev, int ep,
+               char *bytes, int size, int timeout)
+{
        int rc = 0, tries = 3, this_size;
 
        while (tries && size) {
 
-               this_size = usb_bulk_write (dev, ep, bytes, size, timeout);
-
+               this_size = f(dev, ep, bytes, size, timeout);
                if (this_size > 0) {
                        
                        size -= this_size;
@@ -877,35 +867,20 @@ static int usb_bulk_write_ex(usb_dev_handle *dev, int ep, char *bytes, int size,
                } else
                        tries --;
        }
-
        return rc;
-
-
 }
-
-static int usb_bulk_read_ex(usb_dev_handle *dev, int ep, char *bytes, int size,
-                  int timeout) {
-
-       int rc = 0, tries = 3, this_size;
-
-       while (tries && size) {
-
-               this_size = usb_bulk_read (dev, ep, bytes, size, timeout);
-
-               if (this_size > 0) {
-                       
-                       size -= this_size;
-                       rc += this_size;
-                       bytes += this_size;
-
-               } else
-                       tries --;
-       }
-
-       return rc;
-
+static inline int usb_bulk_write_ex(usb_dev_handle *dev, int ep,
+               char *bytes, int size, int timeout)
+{
+       return usb_bulk_with_retries(&usb_bulk_write,
+                       dev, ep, bytes, size, timeout);
+}
+static inline int usb_bulk_read_ex(usb_dev_handle *dev, int ep,
+               char *bytes, int size, int timeout)
+{
+       return usb_bulk_with_retries(&usb_bulk_read,
+                       dev, ep, bytes, size, timeout);
 }
-
 
 /* Write data from out_buffer to USB. */
 static int jlink_usb_write(jlink_jtag_t *jlink_jtag, int out_length)
@@ -976,7 +951,7 @@ static void jlink_debug_buffer(u8 *buffer, int length)
                        snprintf(s, 4, " %02x", buffer[j]);
                        strcat(line, s);
                }
-               LOG_DEBUG(line);
+               LOG_DEBUG("%s", line);
        }
 }
 #endif