{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw",
0 },
+ /*
+ * CWAV USBee DX
+ * XZL-Studio DX
+ */
+ { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
+ FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw",
+ DEV_CAPS_16BIT },
/*
* CWAV USBee SX
0,
};
-/*
- * TODO: Different probe_names[] for each supported device.
- */
static const char *probe_names[] = {
"0",
"1",
supported_samplerates,
};
-static GSList *dev_insts = NULL;
static libusb_context *usb_context = NULL;
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value);
+SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
+static struct sr_dev_driver *fdi = &fx2lafw_driver_info;
+static int hw_dev_close(struct sr_dev_inst *sdi);
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value);
static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
/**
return ret;
}
-static int fx2lafw_dev_open(int dev_index)
+static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
{
libusb_device **devlist;
struct libusb_device_descriptor des;
- struct sr_dev_inst *sdi;
struct context *ctx;
struct version_info vi;
int ret, skip, i;
uint8_t revid;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
ctx = sdi->priv;
if (sdi->status == SR_ST_ACTIVE)
continue;
if (sdi->status == SR_ST_INITIALIZING) {
- if (skip != dev_index) {
+ if (skip != sdi->index) {
/* Skip devices of this type that aren't the one we want. */
skip += 1;
continue;
return SR_OK;
}
-static void close_dev(struct sr_dev_inst *sdi)
-{
- struct context *ctx;
-
- ctx = sdi->priv;
-
- if (ctx->usb->devhdl == NULL)
- return;
-
- sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
- sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE);
- libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE);
- libusb_close(ctx->usb->devhdl);
- ctx->usb->devhdl = NULL;
- sdi->status = SR_ST_INACTIVE;
-}
-
static int configure_probes(struct context *ctx, GSList *probes)
{
struct sr_probe *probe;
return ctx;
}
+static int clear_instances(void)
+{
+ GSList *l;
+ struct sr_dev_inst *sdi;
+ struct context *ctx;
+ int ret;
+
+ ret = SR_OK;
+ for (l = fdi->instances; l; l = l->next) {
+ if (!(sdi = l->data)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("fx2lafw: %s: sdi was NULL, continuing.",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ if (!(ctx = sdi->priv)) {
+ /* Log error, but continue cleaning up the rest. */
+ sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
+ __func__);
+ ret = SR_ERR_BUG;
+ continue;
+ }
+ hw_dev_close(sdi);
+ sdi = l->data;
+ sr_dev_inst_free(sdi);
+ }
+
+ g_slist_free(fdi->instances);
+ fdi->instances = NULL;
+
+ return ret;
+}
+
+
/*
* API callbacks
*/
-static int hw_init(const char *devinfo)
+static int hw_init(void)
{
- struct sr_dev_inst *sdi;
+
+ if (libusb_init(&usb_context) != 0) {
+ sr_warn("fx2lafw: Failed to initialize libusb.");
+ return SR_ERR;
+ }
+
+ return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
+{
+ GSList *devices;
struct libusb_device_descriptor des;
+ struct sr_dev_inst *sdi;
const struct fx2lafw_profile *prof;
struct context *ctx;
+ struct sr_probe *probe;
libusb_device **devlist;
- int ret;
- int devcnt = 0;
- int i, j;
+ int devcnt, num_logic_probes, ret, i, j;
/* Avoid compiler warnings. */
- (void)devinfo;
+ (void)options;
- if (libusb_init(&usb_context) != 0) {
- sr_warn("fx2lafw: Failed to initialize libusb.");
- return 0;
- }
+ /* This scan always invalidates any previous scans. */
+ clear_instances();
/* Find all fx2lafw compatible devices and upload firmware to them. */
+ devices = NULL;
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
if (!prof)
continue;
+ devcnt = g_slist_length(fdi->instances);
sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING,
prof->vendor, prof->model, prof->model_version);
if (!sdi)
- return 0;
+ return NULL;
+ sdi->driver = fdi;
+
+ /* Fill in probelist according to this device's profile. */
+ num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
+ for (j = 0; j < num_logic_probes; j++) {
+ if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
+ probe_names[j])))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
ctx = fx2lafw_dev_new();
ctx->profile = prof;
sdi->priv = ctx;
- dev_insts = g_slist_append(dev_insts, sdi);
+ fdi->instances = g_slist_append(fdi->instances, sdi);
+ devices = g_slist_append(devices, sdi);
if (check_conf_profile(devlist[i])) {
/* Already has the firmware, so fix the new address. */
ctx->usb = sr_usb_dev_inst_new
(libusb_get_bus_number(devlist[i]), 0xff, NULL);
}
-
- devcnt++;
}
libusb_free_device_list(devlist, 1);
- return devcnt;
+ return devices;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
int64_t timediff_us, timediff_ms;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
ctx = sdi->priv;
/*
g_usleep(300 * 1000);
timediff_ms = 0;
while (timediff_ms < MAX_RENUM_DELAY_MS) {
- if ((ret = fx2lafw_dev_open(dev_index)) == SR_OK)
+ if ((ret = fx2lafw_dev_open(sdi)) == SR_OK)
break;
g_usleep(100 * 1000);
}
sr_info("fx2lafw: Device came back after %d ms.", timediff_ms);
} else {
- ret = fx2lafw_dev_open(dev_index);
+ ret = fx2lafw_dev_open(sdi);
}
if (ret != SR_OK) {
if (ctx->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
- if (hw_dev_config_set(dev_index, SR_HWCAP_SAMPLERATE,
+ if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE,
&supported_samplerates[0]) == SR_ERR)
return SR_ERR;
}
return SR_OK;
}
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
+ struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
- sr_err("fx2lafw: %s: sdi was NULL.", __func__);
- return SR_ERR_BUG;
- }
+ ctx = sdi->priv;
+ if (ctx->usb->devhdl == NULL)
+ return SR_ERR;
- /* TODO */
- close_dev(sdi);
+ sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
+ sdi->index, ctx->usb->bus, ctx->usb->address, USB_INTERFACE);
+ libusb_release_interface(ctx->usb->devhdl, USB_INTERFACE);
+ libusb_close(ctx->usb->devhdl);
+ ctx->usb->devhdl = NULL;
+ sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
static int hw_cleanup(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct context *ctx;
- int ret = SR_OK;
-
- for (l = dev_insts; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("fx2lafw: %s: sdi was NULL, continuing.",
- __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- if (!(ctx = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("fx2lafw: %s: sdi->priv was NULL, continuing",
- __func__);
- ret = SR_ERR_BUG;
- continue;
- }
- close_dev(sdi);
- sdi = l->data;
- sr_dev_inst_free(sdi);
- }
+ int ret;
- g_slist_free(dev_insts);
- dev_insts = NULL;
+ ret = clear_instances();
if (usb_context)
libusb_exit(usb_context);
return ret;
}
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+ const struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return NULL;
- ctx = sdi->priv;
-
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- return sdi;
+ *data = sdi;
+ break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
+ break;
case SR_DI_NUM_PROBES:
- return GINT_TO_POINTER(
- (ctx->profile->dev_caps & DEV_CAPS_16BIT) ?
- 16 : 8);
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = GINT_TO_POINTER(
+ (ctx->profile->dev_caps & DEV_CAPS_16BIT) ?
+ 16 : 8);
+ } else
+ return SR_ERR;
+ break;
case SR_DI_PROBE_NAMES:
- return probe_names;
+ *data = probe_names;
+ break;
case SR_DI_SAMPLERATES:
- return &samplerates;
+ *data = &samplerates;
+ break;
case SR_DI_TRIGGER_TYPES:
- return TRIGGER_TYPES;
+ *data = TRIGGER_TYPES;
+ break;
case SR_DI_CUR_SAMPLERATE:
- return &ctx->cur_samplerate;
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ } else
+ return SR_ERR;
+ break;
+ default:
+ return SR_ERR_ARG;
}
- return NULL;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
{
const struct sr_dev_inst *const sdi =
- sr_dev_inst_get(dev_insts, dev_index);
+ sr_dev_inst_get(fdi->instances, dev_index);
if (!sdi)
return SR_ST_NOT_FOUND;
return sdi->status;
}
-static const int *hw_hwcap_get_all(void)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+ const void *value)
{
- return hwcaps;
-}
-
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
-{
- struct sr_dev_inst *sdi;
struct context *ctx;
int ret;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
ctx = sdi->priv;
if (hwcap == SR_HWCAP_SAMPLERATE) {
static void abort_acquisition(struct context *ctx)
{
- unsigned int i;
+ int i;
ctx->num_samples = -1;
- for (i = 0; i < ctx->num_transfers; i++) {
+ for (i = ctx->num_transfers - 1; i >= 0; i--) {
if (ctx->transfers[i])
libusb_cancel_transfer(ctx->transfers[i]);
}
int ret;
unsigned char *buf;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv;
/* Avoid compiler warnings. */
(void)cb_data;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
return SR_ERR;
abort_acquisition(sdi->priv);
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
- .dev_info_get = hw_dev_info_get,
+ .info_get = hw_info_get,
.dev_status_get = hw_dev_status_get,
- .hwcap_get_all = hw_hwcap_get_all,
.dev_config_set = hw_dev_config_set,
.dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
+ .instances = NULL,
};
projects / libsigrok.git / blobdiff