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 584a09dc383f4a0014331a82a648effa19de1737..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,8 +25,8 @@
 #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. */
@@ -82,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);
@@ -189,6 +189,7 @@ SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx)
                                                libusb_get_device_address(devlist[i]), NULL);
                                devices = g_slist_append(devices, usb);
                        }
+                       libusb_free_config_descriptor(confdes);
                }
        }
        libusb_free_device_list(devlist, 1);