#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <inttypes.h>
#include <glib.h>
#include <libusb.h>
{ 0x0925, 0x3881, "Saleae", "Logic", NULL,
FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 },
+ /*
+ * Default Cypress FX2 without EEPROM
+ */
+ { 0x04B4, 0x8613, "Cypress", "FX2", NULL,
+ FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", 8 },
+
{ 0, 0, 0, 0, 0, 0, 0 }
};
};
static uint64_t supported_samplerates[] = {
+ SR_KHZ(200),
+ SR_KHZ(250),
+ SR_KHZ(500),
SR_MHZ(1),
SR_MHZ(2),
SR_MHZ(3),
SR_MHZ(12),
SR_MHZ(16),
SR_MHZ(24),
+ 0,
};
static struct sr_samplerates samplerates = {
static gboolean check_conf_profile(libusb_device *dev)
{
struct libusb_device_descriptor des;
- struct libusb_config_descriptor *conf_dsc = NULL;
- const struct libusb_interface_descriptor *intf_dsc;
- gboolean ret = FALSE;
+ struct libusb_device_handle *hdl;
+ gboolean ret;
+ unsigned char strdesc[64];
+ hdl = NULL;
+ ret = FALSE;
while (!ret) {
/* Assume the FW has not been loaded, unless proven wrong. */
- ret = FALSE;
-
if (libusb_get_device_descriptor(dev, &des) != 0)
break;
- /* Need exactly 1 configuration. */
- if (des.bNumConfigurations != 1)
- break;
-
- if (libusb_get_config_descriptor(dev, 0, &conf_dsc) != 0)
+ if (libusb_open(dev, &hdl) != 0)
break;
- /* Need exactly 1 interface. */
- if (conf_dsc->bNumInterfaces != 1)
+ if (libusb_get_string_descriptor_ascii(hdl,
+ des.iManufacturer, strdesc, sizeof(strdesc)) < 0)
break;
-
- /* Need just one alternate setting. */
- if (conf_dsc->interface[0].num_altsetting != 1)
+ if (strncmp((const char *)strdesc, "sigrok", 6))
break;
- /* Need exactly 2 endpoints. */
- intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
- if (intf_dsc->bNumEndpoints != 2)
+ if (libusb_get_string_descriptor_ascii(hdl,
+ des.iProduct, strdesc, sizeof(strdesc)) < 0)
break;
-
- /* The first endpoint should be 2 (inbound). */
- if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
- (2 | LIBUSB_ENDPOINT_IN))
+ if (strncmp((const char *)strdesc, "fx2lafw", 7))
break;
/* If we made it here, it must be an fx2lafw. */
ret = TRUE;
}
-
- if (conf_dsc)
- libusb_free_config_descriptor(conf_dsc);
+ if (hdl)
+ libusb_close(hdl);
return ret;
}
struct libusb_device_descriptor des;
struct sr_dev_inst *sdi;
struct context *ctx;
+ struct version_info vi;
int ret, skip, i;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
skip = 0;
- libusb_get_device_list(usb_context, &devlist);
- for (i = 0; devlist[i]; i++) {
+ const int device_count = libusb_get_device_list(usb_context, &devlist);
+ if (device_count < 0) {
+ sr_err("fx2lafw: Failed to retrieve device list (%d)",
+ device_count);
+ return SR_ERR;
+ }
+
+ for (i = 0; i < device_count; i++) {
if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
sr_err("fx2lafw: Failed to get device descriptor: %d.",
ret);
* so we don't know the address yet.
*/
ctx->usb->address = libusb_get_device_address(devlist[i]);
-
- sdi->status = SR_ST_ACTIVE;
- sr_info("fx2lafw: Opened device %d on %d.%d "
- "interface %d.", sdi->index, ctx->usb->bus,
- ctx->usb->address, USB_INTERFACE);
} else {
sr_err("fx2lafw: Failed to open device: %d.", ret);
+ break;
+ }
+
+ ret = command_get_fw_version(ctx->usb->devhdl, &vi);
+ if (ret != SR_OK) {
+ sr_err("fx2lafw: Failed to retrieve "
+ "firmware version information.");
+ break;
+ }
+
+ if (vi.major != FX2LAFW_VERSION_MAJOR ||
+ vi.minor != FX2LAFW_VERSION_MINOR) {
+ sr_err("fx2lafw: Expected firmware version %d.%02d "
+ "got %d.%02d.", FX2LAFW_VERSION_MAJOR,
+ FX2LAFW_VERSION_MINOR, vi.major, vi.minor);
+ break;
}
- /* if we made it here, we handled the device one way or another */
+ sdi->status = SR_ST_ACTIVE;
+ sr_info("fx2lafw: Opened device %d on %d.%d "
+ "interface %d, firmware version %d.%02d",
+ sdi->index, ctx->usb->bus, ctx->usb->address,
+ USB_INTERFACE, vi.major, vi.minor);
+
break;
}
libusb_free_device_list(devlist, 1);
ctx = sdi->priv;
/*
- * if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
- * for the FX2 to renumerate
+ * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
+ * for the FX2 to renumerate.
*/
ret = 0;
if (GTV_TO_MSEC(ctx->fw_updated) > 0) {