BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb: sr_usb_find() uses standardized connection string to find a USB device

This commit is contained in:
Bert Vermeulen 2012-12-04 23:25:11 +01:00
parent 5ea1e54ab5
commit 7ae6a75826
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hardware/common/usb.c
View File

@ -38,8 +38,20 @@
#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) #define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) #define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn) /**
* Find USB devices according to a connection string.
*
* @param usb_ctx libusb context to use while scanning.
* @param conn Connection string specifying the device(s) to match. This
* can be of the form "<bus>.<address>", or "<vendorid>.<productid>".
*
* @return A GSList of struct sr_usb_dev_inst, with bus and address fields
* matching the device that matched the connection string. The GSList and
* its contents must be freed by the caller.
*/
SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
{ {
struct sr_usb_dev_inst *usb;
struct libusb_device **devlist; struct libusb_device **devlist;
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
GSList *devices; GSList *devices;
@ -115,25 +127,20 @@ SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn)
continue; continue;
} }
if (vid + pid && (des.idVendor != vid || des.idProduct != pid))
continue;
b = libusb_get_bus_number(devlist[i]); b = libusb_get_bus_number(devlist[i]);
a = libusb_get_device_address(devlist[i]); a = libusb_get_device_address(devlist[i]);
if (bus + addr && (b != bus || a != addr))
if (vid + pid &&
(des.idVendor != vid || des.idProduct != pid)) {
sr_spew("VID:PID = %04x:%04x (%d.%d) doesn't match.",
des.idVendor, des.idProduct, b, a);
continue; continue;
}
if (bus + addr && (b != bus || a != addr)) {
sr_spew("bus.address = %d.%d does not match.", b, a);
continue;
}
sr_dbg("Found USB device (VID:PID = %04x:%04x, bus.address = " sr_dbg("Found USB device (VID:PID = %04x:%04x, bus.address = "
"%d.%d).", des.idVendor, des.idProduct, b, a); "%d.%d).", des.idVendor, des.idProduct, b, a);
devices = g_slist_append(devices, devlist[i]); usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
devices = g_slist_append(devices, usb);
} }
libusb_free_device_list(devlist, 1); libusb_free_device_list(devlist, 1);

2
hardware/uni-t-dmm/api.c
View File

@ -100,7 +100,7 @@ static GSList *hw_scan(GSList *options)
devices = NULL; devices = NULL;
if (!(l = sr_usb_connect(drvc->sr_ctx->libusb_ctx, "1a86.e008"))) if (!(l = sr_usb_find(drvc->sr_ctx->libusb_ctx, "1a86.e008")))
return NULL; return NULL;
for (i = 0; i < (int)g_slist_length(l); i++) { for (i = 0; i < (int)g_slist_length(l); i++) {

2
libsigrok-internal.h
View File

@ -165,7 +165,7 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
/*--- hardware/common/usb.c -------------------------------------------------*/ /*--- hardware/common/usb.c -------------------------------------------------*/
#ifdef HAVE_LIBUSB_1_0 #ifdef HAVE_LIBUSB_1_0
SR_PRIV GSList *sr_usb_connect(libusb_context *usb_ctx, const char *conn); SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn);
SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb); SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
#endif #endif