device.c: Fix memory leak in sr_serial_dev_inst_free

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

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 2dabfbee081c2d695df241521d7699725fca3be5..3da583218ca6ff02921831b80607a6b2af5e8ec2 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -38,8 +38,20 @@
 #define sr_warn(s, args...) sr_warn(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_descriptor des;
        GSList *devices;
@@ -51,18 +63,12 @@ SR_PRIV GSList *sr_usb_connect(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);
@@ -71,18 +77,12 @@ SR_PRIV GSList *sr_usb_connect(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);
@@ -92,7 +92,7 @@ SR_PRIV GSList *sr_usb_connect(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;
        }
 
@@ -111,29 +111,25 @@ SR_PRIV GSList *sr_usb_connect(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;
                }
 
-               b = libusb_get_bus_number(devlist[i]);
-               a = libusb_get_device_address(devlist[i]);
-
-               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);
+               if (vid + pid && (des.idVendor != vid || des.idProduct != pid))
                        continue;
-               }
 
-               if (bus + addr && (b != bus || a != addr)) {
-                       sr_spew("bus.address = %d.%d does not match.", b, a);
+               b = libusb_get_bus_number(devlist[i]);
+               a = libusb_get_device_address(devlist[i]);
+               if (bus + addr && (b != bus || a != addr))
                        continue;
-               }
 
                sr_dbg("Found USB device (VID:PID = %04x:%04x, bus.address = "
                       "%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);
 
@@ -148,7 +144,7 @@ SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb)
        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.",
@@ -166,11 +162,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.",