X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fusb.c;h=efe4eb432a1444c854da118a3a15945707a0c40a;hb=1953564a96798bc298d1c94eb90c129adbde1c9e;hp=4c0c5b031069a0e10af1de091ffba7dc9488a4ad;hpb=7ae6a75826be6d7ddd885947630ecb26ba9fa1a5;p=libsigrok.git

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 4c0c5b03..efe4eb43 100644
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -25,10 +25,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* SR_HWCAP_CONN takes one of these: */
+/* SR_CONF_CONN takes one of these: */
 #define CONN_USB_VIDPID  "^([0-9a-z]{1,4})\\.([0-9a-z]{1,4})$"
 #define CONN_USB_BUSADDR "^(\\d+)\\.(\\d+)$"
 
+/* Some USBTMC-specific enums, as defined in the USBTMC standard. */
+#define SUBCLASS_USBTMC 0x03
+#define USBTMC_USB488   0x01
+
 /* Message logging helpers with driver-specific prefix string. */
 #define DRIVER_LOG_DOMAIN "usb: "
 #define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
@@ -63,18 +67,12 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
 	vid = pid = bus = addr = 0;
 	reg = g_regex_new(CONN_USB_VIDPID, 0, 0, NULL);
 	if (g_regex_match(reg, conn, 0, &match)) {
-		/* Extract VID. */
-		if ((mstr = g_match_info_fetch(match, 1))) {
+		if ((mstr = g_match_info_fetch(match, 1)))
 			vid = strtoul(mstr, NULL, 16);
-			sr_spew("Extracted VID 0x%04x.", vid);
-		}
 		g_free(mstr);
 
-		/* Extract PID. */
-		if ((mstr = g_match_info_fetch(match, 2))) {
+		if ((mstr = g_match_info_fetch(match, 2)))
 			pid = strtoul(mstr, NULL, 16);
-			sr_spew("Extracted PID 0x%04x.", pid);
-		}
 		g_free(mstr);
 		sr_dbg("Trying to find USB device with VID:PID = %04x:%04x.",
 		       vid, pid);
@@ -83,18 +81,12 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
 		g_regex_unref(reg);
 		reg = g_regex_new(CONN_USB_BUSADDR, 0, 0, NULL);
 		if (g_regex_match(reg, conn, 0, &match)) {
-			/* Extract bus. */
-			if ((mstr = g_match_info_fetch(match, 1))) {
+			if ((mstr = g_match_info_fetch(match, 1)))
 				bus = strtoul(mstr, NULL, 16);
-				sr_spew("Extracted bus %d.", bus);
-			}
 			g_free(mstr);
 
-			/* Extract address. */
-			if ((mstr = g_match_info_fetch(match, 2))) {
+			if ((mstr = g_match_info_fetch(match, 2)))
 				addr = strtoul(mstr, NULL, 16);
-				sr_spew("Extracted address %d.", addr);
-			}
 			g_free(mstr);
 			sr_dbg("Trying to find USB device with bus.address = "
 			       "%d.%d.", bus, addr);
@@ -104,7 +96,7 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
 	g_regex_unref(reg);
 
 	if (vid + pid + bus + addr == 0) {
-		sr_err("Neither VID:PID nor bus.address was found.");
+		sr_err("Neither VID:PID nor bus.address was specified.");
 		return NULL;
 	}
 
@@ -123,7 +115,8 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
 	libusb_get_device_list(usb_ctx, &devlist);
 	for (i = 0; devlist[i]; i++) {
 		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %d.", ret);
+			sr_err("Failed to get device descriptor: %s.",
+			       libusb_error_name(ret));
 			continue;
 		}
 
@@ -149,13 +142,70 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
 	return devices;
 }
 
+/**
+ * Find USB devices supporting the USBTMC class
+ *
+ * @param usb_ctx libusb context to use while scanning.
+ *
+ * @return A GSList of struct sr_usb_dev_inst, with bus and address fields
+ * indicating devices with USBTMC support.
+ */
+SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx)
+{
+	struct sr_usb_dev_inst *usb;
+	struct libusb_device **devlist;
+	struct libusb_device_descriptor des;
+	struct libusb_config_descriptor *confdes;
+	const struct libusb_interface_descriptor *intfdes;
+	GSList *devices;
+	int confidx, intfidx, ret, i;
+
+	devices = NULL;
+	libusb_get_device_list(usb_ctx, &devlist);
+	for (i = 0; devlist[i]; i++) {
+		if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+			sr_err("Failed to get device descriptor: %s.",
+			       libusb_error_name(ret));
+			continue;
+		}
+
+		for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
+			if (libusb_get_config_descriptor(devlist[i], confidx, &confdes) != 0) {
+				sr_err("Failed to get configuration descriptor.");
+				break;
+			}
+			for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
+				intfdes = confdes->interface[intfidx].altsetting;
+				if (intfdes->bInterfaceClass != LIBUSB_CLASS_APPLICATION
+						|| intfdes->bInterfaceSubClass != SUBCLASS_USBTMC
+						|| intfdes->bInterfaceProtocol != USBTMC_USB488)
+					continue;
+				sr_dbg("Found USBTMC device (VID:PID = %04x:%04x, bus.address = "
+					   "%d.%d).", des.idVendor, des.idProduct,
+					   libusb_get_bus_number(devlist[i]),
+					   libusb_get_device_address(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_config_descriptor(confdes);
+		}
+	}
+	libusb_free_device_list(devlist, 1);
+
+	sr_dbg("Found %d device(s).", g_slist_length(devices));
+
+	return devices;
+}
+
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb)
 {
 	struct libusb_device **devlist;
 	struct libusb_device_descriptor des;
 	int ret, r, cnt, i, a, b;
 
-	sr_dbg("Trying to open USB device.");
+	sr_dbg("Trying to open USB device %d.%d.", usb->bus, usb->address);
 
 	if ((cnt = libusb_get_device_list(usb_ctx, &devlist)) < 0) {
 		sr_err("Failed to retrieve device list: %s.",
@@ -173,11 +223,8 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb)
 
 		b = libusb_get_bus_number(devlist[i]);
 		a = libusb_get_device_address(devlist[i]);
-
-		if (b != usb->bus || a != usb->address) {
-			sr_spew("bus.address = %d.%d does not match.", b, a);
+		if (b != usb->bus || a != usb->address)
 			continue;
-		}
 
 		if ((r = libusb_open(devlist[i], &usb->devhdl)) < 0) {
 			sr_err("Failed to open device: %s.",