"fx2lafw-cwav-usbeesx.fw",
0, NULL, NULL},
+ /*
+ * CWAV USBee ZX
+ */
+ { 0x08a9, 0x0005, "CWAV", "USBee ZX", NULL,
+ "fx2lafw-cwav-usbeezx.fw",
+ 0, NULL, NULL},
+
/* DreamSourceLab DSLogic (before FW upload) */
{ 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
"dreamsourcelab-dslogic-fx2.fw",
SR_MHZ(400),
};
+static gboolean is_plausible(const struct libusb_device_descriptor *des)
+{
+ int i;
+
+ for (i = 0; supported_fx2[i].vid; i++) {
+ if (des->idVendor != supported_fx2[i].vid)
+ continue;
+ if (des->idProduct == supported_fx2[i].pid)
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct drv_context *drvc;
libusb_get_device_descriptor( devlist[i], &des);
- if ((ret = libusb_open(devlist[i], &hdl)) < 0)
+ if (!is_plausible(&des))
continue;
+ if ((ret = libusb_open(devlist[i], &hdl)) < 0) {
+ sr_warn("Failed to open potential device with "
+ "VID:PID %04x:%04x: %s.", des.idVendor,
+ des.idProduct, libusb_error_name(ret));
+ continue;
+ }
+
if (des.iManufacturer == 0) {
manufacturer[0] = '\0';
} else if ((ret = libusb_get_string_descriptor_ascii(hdl,
des.idProduct == supported_fx2[j].pid &&
(!supported_fx2[j].usb_manufacturer ||
!strcmp(manufacturer, supported_fx2[j].usb_manufacturer)) &&
- (!supported_fx2[j].usb_manufacturer ||
+ (!supported_fx2[j].usb_product ||
!strcmp(product, supported_fx2[j].usb_product))) {
prof = &supported_fx2[j];
break;
devc = fx2lafw_dev_new();
devc->profile = prof;
- if ((prof->dev_caps & DEV_CAPS_16BIT) || (prof->dev_caps & DEV_CAPS_AX_ANALOG))
- devc->sample_wide = TRUE;
sdi->priv = devc;
devices = g_slist_append(devices, sdi);
const GSList *l;
int p;
struct sr_channel *ch;
+ uint32_t channel_mask = 0, num_analog = 0;
devc = sdi->priv;
for (l = sdi->channels, p = 0; l; l = l->next, p++) {
ch = l->data;
if ((p <= NUM_CHANNELS) && (ch->type == SR_CHANNEL_ANALOG)) {
+ num_analog++;
devc->ch_enabled[p] = ch->enabled;
devc->enabled_analog_channels =
g_slist_append(devc->enabled_analog_channels, ch);
+ } else {
+ channel_mask |= ch->enabled << p;
}
}
+ /* Use no wide sampling if we have only the first 8 channels set. */
+ devc->sample_wide = (channel_mask > 0xff || num_analog > 0);
+
return SR_OK;
}