This is an automated email from Gerrit.
"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/7529
-- gerrit
commit 9ed6d44aae06364689de21a67bcade68bdc09e92
Author: Tomas Vanek <van...@fbl.cz>
Date: Mon Mar 6 15:37:43 2023 +0100
drivers/ftdi: prevent misleading error msg when more vid/pids configured
The driver tries to open mpsse engine for each vid pid
pair in sequence. If more vid/pid pairs are configured and
the USB device does not correspond to the first pair,
the driver shows 'unable to open ftdi device ...' error.
Match vid pid with the whole list as used in jtag_libusb_open()
instead of multiple mpsse_open() in for loop over vid/pid pairs.
Change-Id: I8ef55205be221c727607fe25b81ae21de0d96f02
Signed-off-by: Tomas Vanek <van...@fbl.cz>
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 3097d41296..6356a4929b 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -658,13 +658,8 @@ static int ftdi_initialize(void)
return ERROR_JTAG_INIT_FAILED;
}
- for (int i = 0; ftdi_vid[i] || ftdi_pid[i]; i++) {
- mpsse_ctx = mpsse_open(&ftdi_vid[i], &ftdi_pid[i],
ftdi_device_desc,
+ mpsse_ctx = mpsse_open(ftdi_vid, ftdi_pid, ftdi_device_desc,
adapter_get_required_serial(),
adapter_usb_get_location(), ftdi_channel);
- if (mpsse_ctx)
- break;
- }
-
if (!mpsse_ctx)
return ERROR_JTAG_INIT_FAILED;
diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c
index 18aeb38a48..9f2fdde9fb 100644
--- a/src/jtag/drivers/mpsse.c
+++ b/src/jtag/drivers/mpsse.c
@@ -13,6 +13,7 @@
#include "helper/log.h"
#include "helper/replacements.h"
#include "helper/time_support.h"
+#include "libusb_helper.h"
#include <libusb.h>
/* Compatibility define for older libusb-1.0 */
@@ -148,7 +149,7 @@ static bool device_location_equal(struct libusb_device
*device, const char *loca
* Set any field to 0 as a wildcard. If the device is found true is returned,
with ctx containing
* the already opened handle. ctx->interface must be set to the desired
interface (channel) number
* prior to calling this function. */
-static bool open_matching_device(struct mpsse_ctx *ctx, const uint16_t *vid,
const uint16_t *pid,
+static bool open_matching_device(struct mpsse_ctx *ctx, const uint16_t vids[],
const uint16_t pids[],
const char *product, const char *serial, const char *location)
{
struct libusb_device **list;
@@ -169,9 +170,7 @@ static bool open_matching_device(struct mpsse_ctx *ctx,
const uint16_t *vid, con
continue;
}
- if (vid && *vid != desc.idVendor)
- continue;
- if (pid && *pid != desc.idProduct)
+ if (!jtag_libusb_match_ids(&desc, vids, pids))
continue;
err = libusb_open(device, &ctx->usb_dev);
@@ -203,7 +202,7 @@ static bool open_matching_device(struct mpsse_ctx *ctx,
const uint16_t *vid, con
libusb_free_device_list(list, 1);
if (!found) {
- LOG_ERROR("no device found");
+ /* The caller reports detailed error desc */
return false;
}
@@ -307,7 +306,7 @@ error:
return false;
}
-struct mpsse_ctx *mpsse_open(const uint16_t *vid, const uint16_t *pid, const
char *description,
+struct mpsse_ctx *mpsse_open(const uint16_t vids[], const uint16_t pids[],
const char *description,
const char *serial, const char *location, int channel)
{
struct mpsse_ctx *ctx = calloc(1, sizeof(*ctx));
@@ -343,14 +342,9 @@ struct mpsse_ctx *mpsse_open(const uint16_t *vid, const
uint16_t *pid, const cha
goto error;
}
- if (!open_matching_device(ctx, vid, pid, description, serial,
location)) {
- /* Four hex digits plus terminating zero each */
- char vidstr[5];
- char pidstr[5];
- LOG_ERROR("unable to open ftdi device with vid %s, pid %s,
description '%s', "
+ if (!open_matching_device(ctx, vids, pids, description, serial,
location)) {
+ LOG_ERROR("unable to open ftdi device with description '%s', "
"serial '%s' at bus location '%s'",
- vid ? sprintf(vidstr, "%04x", *vid), vidstr :
"*",
- pid ? sprintf(pidstr, "%04x", *pid), pidstr :
"*",
description ? description : "*",
serial ? serial : "*",
location ? location : "*");
--
