GPL headers: Use correct project name.

[libsigrok.git] / hardware / common / usb.c

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 3da583218ca6ff02921831b80607a6b2af5e8ec2..f40a998ab9e370baac5b69f4ca556f38cafd4ae7 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
@@ -25,10 +25,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* SR_HWCAP_CONN takes one of these: */
-#define CONN_USB_VIDPID  "^([0-9a-z]{1,4})\\.([0-9a-z]{1,4})$"
+/* SR_CONF_CONN takes one of these: */
+#define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{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)
@@ -78,11 +82,11 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
                reg = g_regex_new(CONN_USB_BUSADDR, 0, 0, NULL);
                if (g_regex_match(reg, conn, 0, &match)) {
                        if ((mstr = g_match_info_fetch(match, 1)))
-                               bus = strtoul(mstr, NULL, 16);
+                               bus = strtoul(mstr, NULL, 10);
                        g_free(mstr);
 
                        if ((mstr = g_match_info_fetch(match, 2)))
-                               addr = strtoul(mstr, NULL, 16);
+                               addr = strtoul(mstr, NULL, 10);
                        g_free(mstr);
                        sr_dbg("Trying to find USB device with bus.address = "
                               "%d.%d.", bus, addr);
@@ -138,6 +142,63 @@ 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;