fx2lafw: Allow matching USB descriptor strings as well as VID/PID.

diff --git a/hardware/fx2lafw/api.c b/hardware/fx2lafw/api.c
index 1205c4f92b27d42912bc70413123ef682d64b67a..6b7f9fa0f0f76e1d46a3103d28013ecaf21cb7e0 100644 (file)
--- a/hardware/fx2lafw/api.c
+++ b/hardware/fx2lafw/api.c
@@ -28,21 +28,21 @@ static const struct fx2lafw_profile supported_fx2[] = {
         */
        { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
                FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw",
-               0 },
+               0, NULL, NULL},
        /*
         * CWAV USBee DX
         * XZL-Studio DX
         */
        { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
                FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
-               DEV_CAPS_16BIT },
+               DEV_CAPS_16BIT, NULL, NULL },
 
        /*
         * CWAV USBee SX
         */
        { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
                FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw",
-               0 },
+               0, NULL, NULL},
 
        /*
         * Saleae Logic
@@ -52,7 +52,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
         */
        { 0x0925, 0x3881, "Saleae", "Logic", NULL,
                FIRMWARE_DIR "/fx2lafw-saleae-logic.fw",
-               0 },
+               0, NULL, NULL},
 
        /*
         * Default Cypress FX2 without EEPROM, e.g.:
@@ -61,16 +61,16 @@ static const struct fx2lafw_profile supported_fx2[] = {
         */
        { 0x04B4, 0x8613, "Cypress", "FX2", NULL,
                FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw",
-               DEV_CAPS_16BIT },
+               DEV_CAPS_16BIT, NULL, NULL },
 
        /*
         * Braintechnology USB-LPS
         */
        { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL,
                FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw",
-               DEV_CAPS_16BIT },
+               DEV_CAPS_16BIT, NULL, NULL },
 
-       { 0, 0, 0, 0, 0, 0, 0 }
+       { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
 static const int32_t hwopts[] = {
@@ -132,8 +132,10 @@ static GSList *scan(GSList *options)
        GSList *l, *devices, *conn_devices;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
+       struct libusb_device_handle *hdl;
        int devcnt, num_logic_channels, ret, i, j;
        const char *conn;
+       char manufacturer[64], product[64];
 
        drvc = di->priv;
 
@@ -175,11 +177,41 @@ static GSList *scan(GSList *options)
                        continue;
                }
 
+               if ((ret = libusb_open(devlist[i], &hdl)) < 0)
+                       continue;
+
+               if (des.iManufacturer == 0) {
+                       manufacturer[0] = '\0';
+               } else if ((ret = libusb_get_string_descriptor_ascii(hdl,
+                               des.iManufacturer, (unsigned char *) manufacturer,
+                               sizeof(manufacturer))) < 0) {
+                       sr_warn("Failed to get manufacturer string descriptor: %s.",
+                               libusb_error_name(ret));
+                       continue;
+               }
+
+               if (des.iProduct == 0) {
+                       product[0] = '\0';
+               } else if ((ret = libusb_get_string_descriptor_ascii(hdl,
+                               des.iProduct, (unsigned char *) product,
+                               sizeof(product))) < 0) {
+                       sr_warn("Failed to get product string descriptor: %s.",
+                               libusb_error_name(ret));
+                       continue;
+               }
+
+               libusb_close(hdl);
+
                prof = NULL;
                for (j = 0; supported_fx2[j].vid; j++) {
                        if (des.idVendor == supported_fx2[j].vid &&
-                               des.idProduct == supported_fx2[j].pid) {
+                                       des.idProduct == supported_fx2[j].pid &&
+                                       (!supported_fx2[j].usb_manufacturer ||
+                                        !strcmp(manufacturer, supported_fx2[j].usb_manufacturer)) &&
+                                       (!supported_fx2[j].usb_manufacturer ||
+                                        !strcmp(product, supported_fx2[j].usb_product))) {
                                prof = &supported_fx2[j];
+                               break;
                        }
                }
 

diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index 08e2589946de6d0d6c6f53a8ae15598652b833ad..dfb6ef8a909537c5a1c9bc0a8f5289034d529fbe 100644 (file)
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -63,6 +63,9 @@ struct fx2lafw_profile {
        const char *firmware;
 
        uint32_t dev_caps;
+
+       const char *usb_manufacturer;
+       const char *usb_product;
 };
 
 struct dev_context {