jtag/drivers: Add vid_pid command to OpenJTAG

[openocd.git] / src / jtag / drivers / arm-jtag-ew.c

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index a3e9e17129e1544df3012190e20411dc72a7ba9d..eada67f45ccdbd6d3ec0483c1b0970726a288846 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -213,7 +213,7 @@ static int armjtagew_init(void)
 
        armjtagew_handle = armjtagew_usb_open();
 
-       if (armjtagew_handle == 0) {
+       if (!armjtagew_handle) {
                LOG_ERROR(
                        "Cannot find ARM-JTAG-EW Interface! Please check connection and permissions.");
                return ERROR_JTAG_INIT_FAILED;
@@ -677,7 +677,7 @@ static struct armjtagew *armjtagew_usb_open(void)
        const uint16_t pids[] = { USB_PID, 0 };
        struct libusb_device_handle *dev;
 
-       if (jtag_libusb_open(vids, pids, &dev, NULL) != ERROR_OK)
+       if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
                return NULL;
 
        struct armjtagew *result = malloc(sizeof(struct armjtagew));
@@ -776,17 +776,12 @@ static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 
 static void armjtagew_debug_buffer(uint8_t *buffer, int length)
 {
-       char line[81];
-       char s[4];
-       int i;
-       int j;
+       char line[8 + 3 * BYTES_PER_LINE + 1];
 
-       for (i = 0; i < length; i += BYTES_PER_LINE) {
-               snprintf(line, 5, "%04x", i);
-               for (j = i; j < i + BYTES_PER_LINE && j < length; j++) {
-                       snprintf(s, 4, " %02x", buffer[j]);
-                       strcat(line, s);
-               }
+       for (int i = 0; i < length; i += BYTES_PER_LINE) {
+               int n = snprintf(line, 9, "%04x", i);
+               for (int j = i; j < i + BYTES_PER_LINE && j < length; j++)
+                       n += snprintf(line + n, 4, " %02x", buffer[j]);
                LOG_DEBUG("%s", line);
 
                /* Prevent GDB timeout (writing to log might take some time) */