On hosts with multiple USB devices connected, multiple "excluded by
device path option" messages can be observed. Add the USB VID/PID to
these messages to give them some additional value.
Signed-off-by: Bastian Krause <bst@xxxxxxxxxxxxxx>
---
Changes since (implicit) v1:
- pass libusb_device_descriptor from find_imx_dev() instead of calling
libusb_get_device_descriptor() again
---
scripts/imx/imx-usb-loader.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 6f9104e816..cff77f27f2 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -267,7 +267,8 @@ static void list_imx_device_types(void)
}
}
-static int device_location_equal(libusb_device *device, const char *location)
+static int device_location_equal(libusb_device *device, const char *location,
+ struct libusb_device_descriptor desc)
{
uint8_t port_path[MAX_USB_PORTS];
uint8_t dev_bus;
@@ -315,7 +316,8 @@ static int device_location_equal(libusb_device *device, const char *location)
if (path_step == path_len)
result = 1;
else if (verbose)
- fprintf(stderr, " excluded by device path option\n");
+ fprintf(stderr, "USB device [%04x:%04x] excluded by device path option\n",
+ desc.idVendor, desc.idProduct);
done:
free(loc);
@@ -343,7 +345,7 @@ static libusb_device *find_imx_dev(libusb_device **devs, const struct mach_id **
return NULL;
}
- if (location && !device_location_equal(dev, location)) {
+ if (location && !device_location_equal(dev, location, desc)) {
libusb_close(usb_dev_handle);
usb_dev_handle = NULL;
continue;
--
2.29.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
