saleae-logic16: Use physical USB connection instead of sdi->index

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 2ae1f3de02470e83b81d7110507df3755625d31b..e8ce53a877f11fbd72785d7c4088b1a9e9830aeb 100644 (file)
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -149,8 +149,9 @@ static GSList *scan(GSList *options)
        GSList *l, *devices, *conn_devices;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
-       int devcnt, ret, i, j;
+       int ret, i, j;
        const char *conn;
+       char connection_id[64];
 
        drvc = di->priv;
 
@@ -192,15 +193,17 @@ static GSList *scan(GSList *options)
                        continue;
                }
 
+               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+
                if (des.idVendor != LOGIC16_VID || des.idProduct != LOGIC16_PID)
                        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,
                                      "Saleae", "Logic16", NULL);
                if (!sdi)
                        return NULL;
                sdi->driver = di;
+               sdi->connection_id = g_strdup(connection_id);
 
                for (j = 0; channel_names[j]; j++) {
                        if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
@@ -230,8 +233,7 @@ static GSList *scan(GSList *options)
                                /* Store when this device's FW was updated. */
                                devc->fw_updated = g_get_monotonic_time();
                        else
-                               sr_err("Firmware upload failed for "
-                                      "device %d.", devcnt);
+                               sr_err("Firmware upload failed.");
                        sdi->inst_type = SR_INST_USB;
                        sdi->conn = sr_usb_dev_inst_new(
                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -254,7 +256,8 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        struct libusb_device_descriptor des;
        struct drv_context *drvc;
-       int ret, skip, i, device_count;
+       int ret, i, device_count;
+       char connection_id[64];
 
        drvc = di->priv;
        usb = sdi->conn;
@@ -263,7 +266,6 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
                /* 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.",
@@ -281,19 +283,13 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
                if (des.idVendor != LOGIC16_VID || des.idProduct != LOGIC16_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;
                }
@@ -331,8 +327,8 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
                }
 
                sdi->status = SR_ST_ACTIVE;
-               sr_info("Opened device %d on %d.%d, interface %d.",
-                       sdi->index, usb->bus, usb->address, USB_INTERFACE);
+               sr_info("Opened device on %d.%d (logical) / %s (physical), interface %d.",
+                       usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
 
                break;
        }
@@ -408,8 +404,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        if (usb->devhdl == NULL)
                return SR_ERR;
 
-       sr_info("Closing device %d on %d.%d interface %d.",
-               sdi->index, usb->bus, usb->address, USB_INTERFACE);
+       sr_info("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;
@@ -427,7 +423,6 @@ static int cleanup(void)
                /* Can get called on an unused driver, doesn't matter. */
                return SR_OK;
 
-
        ret = std_dev_clear(di, NULL);
        g_free(drvc);
        di->priv = NULL;