BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Soeren Apel 2014-09-26 19:25:36 +02:00 committed by Bert Vermeulen
parent 8143cfdc90
commit 5e2c86eb31
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/hardware/fx2lafw/api.c
View File

@ -140,9 +140,9 @@ static GSList *scan(GSList *options)
struct libusb_device_descriptor des; struct libusb_device_descriptor des;
libusb_device **devlist; libusb_device **devlist;
struct libusb_device_handle *hdl; struct libusb_device_handle *hdl;
int devcnt, num_logic_channels, ret, i, j; int num_logic_channels, ret, i, j;
const char *conn; const char *conn;
char manufacturer[64], product[64]; char manufacturer[64], product[64], serial_num[64], connection_id[64];
drvc = di->priv; drvc = di->priv;
@ -207,6 +207,18 @@ static GSList *scan(GSList *options)
continue; 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); libusb_close(hdl);
prof = NULL; prof = NULL;
@ -226,12 +238,13 @@ static GSList *scan(GSList *options)
if (!prof) if (!prof)
continue; continue;
devcnt = g_slist_length(drvc->instances); sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
prof->vendor, prof->model, prof->model_version); prof->vendor, prof->model, prof->model_version);
if (!sdi) if (!sdi)
return NULL; return NULL;
sdi->driver = di; 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. */ /* Fill in channellist according to this device's profile. */
num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; 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(); devc->fw_updated = g_get_monotonic_time();
else else
sr_err("Firmware upload failed for " 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->inst_type = SR_INST_USB;
sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
0xff, NULL); 0xff, NULL);
@ -358,8 +373,8 @@ static int dev_close(struct sr_dev_inst *sdi)
if (usb->devhdl == NULL) if (usb->devhdl == NULL)
return SR_ERR; return SR_ERR;
sr_info("fx2lafw: Closing device %d on %d.%d interface %d.", sr_info("fx2lafw: Closing device on %d.%d (logical) / %s (physical) interface %d.",
sdi->index, usb->bus, usb->address, USB_INTERFACE); usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
libusb_release_interface(usb->devhdl, USB_INTERFACE); libusb_release_interface(usb->devhdl, USB_INTERFACE);
libusb_close(usb->devhdl); libusb_close(usb->devhdl);
usb->devhdl = NULL; usb->devhdl = NULL;

24
src/hardware/fx2lafw/protocol.c
View File

@ -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 dev_context *devc;
struct drv_context *drvc; struct drv_context *drvc;
struct version_info vi; struct version_info vi;
int ret, skip, i, device_count; int ret, i, device_count;
uint8_t revid; uint8_t revid;
char connection_id[64];
drvc = di->priv; drvc = di->priv;
devc = sdi->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. */ /* Device is already in use. */
return SR_ERR; return SR_ERR;
skip = 0;
device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
if (device_count < 0) { if (device_count < 0) {
sr_err("Failed to get device list: %s.", 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) || des.idProduct != devc->profile->pid)
continue; continue;
if (sdi->status == SR_ST_INITIALIZING) { if ((sdi->status == SR_ST_INITIALIZING) ||
if (skip != sdi->index) { (sdi->status == SR_ST_INACTIVE)) {
/* Skip devices of this type that aren't the one we want. */
skip += 1;
continue;
}
} else if (sdi->status == SR_ST_INACTIVE) {
/* /*
* This device is fully enumerated, so we need to find * Check device by its physical USB bus/port address.
* this device by vendor, product, bus and address.
*/ */
if (libusb_get_bus_number(devlist[i]) != usb->bus usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
|| libusb_get_device_address(devlist[i]) != usb->address) if (strcmp(sdi->connection_id, connection_id))
/* This is not the one. */ /* This is not the one. */
continue; 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; 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.", "interface %d, firmware %d.%d.",
sdi->index, usb->bus, usb->address, usb->bus, usb->address, connection_id,
USB_INTERFACE, vi.major, vi.minor); USB_INTERFACE, vi.major, vi.minor);
sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.", sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",