fx2lafw: Use physical USB connection instead of sdi->index

Previously, sdi->index was used to tell several identical fx2lafw-compatible
devices apart. This was a bit of a hack, so this patch makes it use physical
device connections instead. They're guaranteed to remain the same even if
the USB device reconnects.

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 18a34df659ab5daed4fe71b1529a1a81b27ceab4..8e28f22494cf146b26cc5e40feba453ab37c1ed3 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -140,9 +140,9 @@ static GSList *scan(GSList *options)
        struct libusb_device_descriptor des;
        libusb_device **devlist;
        struct libusb_device_handle *hdl;
-       int devcnt, num_logic_channels, ret, i, j;
+       int num_logic_channels, ret, i, j;
        const char *conn;
-       char manufacturer[64], product[64];
+       char manufacturer[64], product[64], serial_num[64], connection_id[64];
 
        drvc = di->priv;
 
@@ -207,6 +207,18 @@ static GSList *scan(GSList *options)
                        continue;
                }
 
+               if (des.iSerialNumber == 0) {
+                       serial_num[0] = '\0';
+               } else if ((ret = libusb_get_string_descriptor_ascii(hdl,
+                               des.iSerialNumber, (unsigned char *) serial_num,
+                               sizeof(serial_num))) < 0) {
+                       sr_warn("Failed to get serial number string descriptor: %s.",
+                               libusb_error_name(ret));
+                       continue;
+               }
+
+               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+
                libusb_close(hdl);
 
                prof = NULL;
@@ -226,12 +238,13 @@ static GSList *scan(GSList *options)
                if (!prof)
                        continue;
 
-               devcnt = g_slist_length(drvc->instances);
-               sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
+               sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
                        prof->vendor, prof->model, prof->model_version);
                if (!sdi)
                        return NULL;
                sdi->driver = di;
+               sdi->serial_num = g_strdup(serial_num);
+               sdi->connection_id = g_strdup(connection_id);
 
                /* Fill in channellist according to this device's profile. */
                num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
@@ -262,7 +275,9 @@ static GSList *scan(GSList *options)
                                devc->fw_updated = g_get_monotonic_time();
                        else
                                sr_err("Firmware upload failed for "
-                                      "device %d.", devcnt);
+                                      "device %d.%d (logical).",
+                                      libusb_get_bus_number(devlist[i]),
+                                      libusb_get_device_address(devlist[i]));
                        sdi->inst_type = SR_INST_USB;
                        sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
                                        0xff, NULL);
@@ -358,8 +373,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        if (usb->devhdl == NULL)
                return SR_ERR;
 
-       sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
-               sdi->index, usb->bus, usb->address, USB_INTERFACE);
+       sr_info("fx2lafw: Closing device on %d.%d (logical) / %s (physical) interface %d.",
+               usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
        libusb_release_interface(usb->devhdl, USB_INTERFACE);
        libusb_close(usb->devhdl);
        usb->devhdl = NULL;

diff --git a/src/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c
index dfd58becebc6ea184f5f88d146d404990854c866..7e7b189116c565bd6b7f352de84e340bdb247fe6 100644 (file)
--- a/src/hardware/fx2lafw/protocol.c
+++ b/src/hardware/fx2lafw/protocol.c
@@ -198,8 +198,9 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
        struct dev_context *devc;
        struct drv_context *drvc;
        struct version_info vi;
-       int ret, skip, i, device_count;
+       int ret, i, device_count;
        uint8_t revid;
+       char connection_id[64];
 
        drvc = di->priv;
        devc = sdi->priv;
@@ -209,7 +210,6 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
                /* Device is already in use. */
                return SR_ERR;
 
-       skip = 0;
        device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
        if (device_count < 0) {
                sr_err("Failed to get device list: %s.",
@@ -228,19 +228,13 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
                    || des.idProduct != devc->profile->pid)
                        continue;
 
-               if (sdi->status == SR_ST_INITIALIZING) {
-                       if (skip != sdi->index) {
-                               /* Skip devices of this type that aren't the one we want. */
-                               skip += 1;
-                               continue;
-                       }
-               } else if (sdi->status == SR_ST_INACTIVE) {
+               if ((sdi->status == SR_ST_INITIALIZING) ||
+                               (sdi->status == SR_ST_INACTIVE)) {
                        /*
-                        * This device is fully enumerated, so we need to find
-                        * this device by vendor, product, bus and address.
+                        * Check device by its physical USB bus/port address.
                         */
-                       if (libusb_get_bus_number(devlist[i]) != usb->bus
-                               || libusb_get_device_address(devlist[i]) != usb->address)
+                       usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+                       if (strcmp(sdi->connection_id, connection_id))
                                /* This is not the one. */
                                continue;
                }
@@ -283,9 +277,9 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
                }
 
                sdi->status = SR_ST_ACTIVE;
-               sr_info("Opened device %d on %d.%d, "
+               sr_info("Opened device on %d.%d (logical) / %s (physical), "
                        "interface %d, firmware %d.%d.",
-                       sdi->index, usb->bus, usb->address,
+                       usb->bus, usb->address, connection_id,
                        USB_INTERFACE, vi.major, vi.minor);
 
                sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",