* This file is part of the libsigrok project.
*
* Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "libsigrok-internal.h"
#include "protocol.h"
-#define LOGIC16_VID 0x21a9
-#define LOGIC16_PID 0x1001
-#define NUM_PROBES 16
+#define LOGIC16_VID 0x21a9
+#define LOGIC16_PID 0x1001
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
#define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32
-
SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
static struct sr_dev_driver *di = &saleae_logic16_driver_info;
SR_CONF_CONTINUOUS,
};
-static const char *probe_names[NUM_PROBES + 1] = {
+static const char *probe_names[] = {
"0", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15",
NULL,
break;
if (libusb_get_string_descriptor_ascii(hdl,
- des.iProduct, strdesc, sizeof(strdesc)) < 0)
+ des.iProduct, strdesc, sizeof(strdesc)) < 0)
break;
if (strcmp((const char *)strdesc, "Logic S/16"))
break;
continue;
}
- if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) {
+ if ((ret = libusb_get_device_descriptor(devlist[i], &des)) != 0) {
sr_warn("Failed to get device descriptor: %s.",
libusb_error_name(ret));
continue;
sr_dbg("Found a Logic16 device.");
sdi->status = SR_ST_INACTIVE;
sdi->inst_type = SR_INST_USB;
- sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
- libusb_get_device_address(devlist[i]), NULL);
+ sdi->conn = sr_usb_dev_inst_new(
+ libusb_get_bus_number(devlist[i]),
+ libusb_get_device_address(devlist[i]), NULL);
} else {
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
FX2_FIRMWARE) == SR_OK)
sr_err("Firmware upload failed for "
"device %d.", devcnt);
sdi->inst_type = SR_INST_USB;
- sdi->conn = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]),
- 0xff, NULL);
+ sdi->conn = sr_usb_dev_inst_new(
+ libusb_get_bus_number(devlist[i]), 0xff, NULL);
}
}
libusb_free_device_list(devlist, 1);
static GSList *dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
-}
-
-static int dev_clear(void)
-{
- return std_dev_clear(di, NULL);
+ return ((struct drv_context *)(di->priv))->instances;
}
static int logic16_dev_open(struct sr_dev_inst *sdi)
continue;
}
- if (des.idVendor != LOGIC16_VID
- || des.idProduct != LOGIC16_PID)
+ if (des.idVendor != LOGIC16_VID || des.idProduct != LOGIC16_PID)
continue;
if (sdi->status == SR_ST_INITIALIZING) {
* this device by vendor, product, bus and address.
*/
if (libusb_get_bus_number(devlist[i]) != usb->bus
- || libusb_get_device_address(devlist[i]) != usb->address)
+ || libusb_get_device_address(devlist[i]) != usb->address)
/* This is not the one. */
continue;
}
break;
}
- if ((ret = saleae_logic16_init_device(sdi)) != SR_OK) {
+ ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
+ if (ret == LIBUSB_ERROR_BUSY) {
+ sr_err("Unable to claim USB interface. Another "
+ "program or driver has already claimed it.");
+ break;
+ } else if (ret == LIBUSB_ERROR_NO_DEVICE) {
+ sr_err("Device has been disconnected.");
+ break;
+ } else if (ret != 0) {
+ sr_err("Unable to claim interface: %s.",
+ libusb_error_name(ret));
+ break;
+ }
+
+ if ((ret = logic16_init_device(sdi)) != SR_OK) {
sr_err("Failed to init device.");
break;
}
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 %d on %d.%d, interface %d.",
+ sdi->index, usb->bus, usb->address, USB_INTERFACE);
break;
}
libusb_free_device_list(devlist, 1);
- if (sdi->status != SR_ST_ACTIVE)
+ if (sdi->status != SR_ST_ACTIVE) {
+ if (usb->devhdl) {
+ libusb_release_interface(usb->devhdl, USB_INTERFACE);
+ libusb_close(usb->devhdl);
+ usb->devhdl = NULL;
+ }
return SR_ERR;
+ }
return SR_OK;
}
static int dev_open(struct sr_dev_inst *sdi)
{
- struct sr_usb_dev_inst *usb;
struct dev_context *devc;
int ret;
int64_t timediff_us, timediff_ms;
devc = sdi->priv;
- usb = sdi->conn;
/*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
return SR_ERR;
}
- ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
- if (ret != 0) {
- switch(ret) {
- case LIBUSB_ERROR_BUSY:
- sr_err("Unable to claim USB interface. Another "
- "program or driver has already claimed it.");
- break;
- case LIBUSB_ERROR_NO_DEVICE:
- sr_err("Device has been disconnected.");
- break;
- default:
- sr_err("Unable to claim interface: %s.",
- libusb_error_name(ret));
- break;
- }
-
- return SR_ERR;
- }
-
if (devc->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
devc->cur_samplerate = samplerates[0];
/* Can get called on an unused driver, doesn't matter. */
return SR_OK;
- ret = dev_clear();
+
+ ret = std_dev_clear(di, NULL);
g_free(drvc);
di->priv = NULL;
return ret;
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
GVariant *range[2];
char str[128];
int ret;
- unsigned i;
+ unsigned int i;
+
+ (void)cg;
ret = SR_OK;
switch (key) {
return SR_ERR;
devc = sdi->priv;
ret = SR_ERR;
- for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++)
- if (devc->selected_voltage_range ==
- volt_thresholds[i].range) {
- range[0] = g_variant_new_double(volt_thresholds[i].low);
- range[1] = g_variant_new_double(volt_thresholds[i].high);
- *data = g_variant_new_tuple(range, 2);
- ret = SR_OK;
- break;
- }
+ for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
+ if (devc->selected_voltage_range !=
+ volt_thresholds[i].range)
+ continue;
+ range[0] = g_variant_new_double(volt_thresholds[i].low);
+ range[1] = g_variant_new_double(volt_thresholds[i].high);
+ *data = g_variant_new_tuple(range, 2);
+ ret = SR_OK;
+ break;
+ }
break;
default:
return SR_ERR_NA;
return ret;
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
gdouble low, high;
int ret;
- unsigned i;
+ unsigned int i;
+
+ (void)cg;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
GVariant *gvar, *range[2];
GVariantBuilder gvb;
int ret;
- unsigned i;
+ unsigned int i;
(void)sdi;
+ (void)cg;
ret = SR_OK;
switch (key) {
break;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
- gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
- ARRAY_SIZE(samplerates), sizeof(uint64_t));
+ gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+ samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb);
break;
devc->cur_channels |= probe_bit;
#ifdef WORDS_BIGENDIAN
- /* Output logic data should be stored in little endian
- format. To speed things up during conversion, do the
- switcharoo here instead. */
-
+ /*
+ * Output logic data should be stored in little endian format.
+ * To speed things up during conversion, do the switcharoo
+ * here instead.
+ */
probe_bit = 1 << (probe->index ^ 8);
#endif
- devc->channel_masks[devc->num_channels ++] = probe_bit;
+ devc->channel_masks[devc->num_channels++] = probe_bit;
}
return SR_OK;
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
if (devc->num_samples == -2) {
- saleae_logic16_abort_acquisition(sdi);
+ logic16_abort_acquisition(sdi);
abort_acquisition(devc);
}
return TRUE;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
struct dev_context *devc;
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
struct libusb_transfer *transfer;
- const struct libusb_pollfd **lupfd;
unsigned int i, timeout, num_transfers;
int ret;
unsigned char *buf;
devc = sdi->priv;
usb = sdi->conn;
- /* Configures devc->cur_channels */
+ /* Configures devc->cur_channels. */
if (configure_probes(sdi) != SR_OK) {
sr_err("Failed to configure probes.");
return SR_ERR;
size = get_buffer_size(devc);
convsize = (size / devc->num_channels + 2) * 16;
devc->submitted_transfers = 0;
- devc->usbfd = NULL;
devc->convbuffer_size = convsize;
if (!(devc->convbuffer = g_try_malloc(convsize))) {
return SR_ERR_MALLOC;
}
- if ((ret = saleae_logic16_setup_acquisition(sdi, devc->cur_samplerate,
- devc->cur_channels)) != SR_OK) {
+ if ((ret = logic16_setup_acquisition(sdi, devc->cur_samplerate,
+ devc->cur_channels)) != SR_OK) {
g_free(devc->transfers);
g_free(devc->convbuffer);
return ret;
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size,
- saleae_logic16_receive_transfer, devc, timeout);
+ logic16_receive_transfer, devc, timeout);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));
devc->submitted_transfers++;
}
- lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
- for (i = 0; lupfd[i]; i++);
- if (!(devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1)))) {
- abort_acquisition(devc);
- free(lupfd);
- return SR_ERR;
- }
- for (i = 0; lupfd[i]; i++) {
- sr_source_add(lupfd[i]->fd, lupfd[i]->events,
- timeout, receive_data, (void *)sdi);
- devc->usbfd[i] = lupfd[i]->fd;
- }
- devc->usbfd[i] = -1;
- free(lupfd);
+ devc->ctx = drvc->sr_ctx;
+
+ usb_source_add(devc->ctx, timeout, receive_data, (void *)sdi);
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
- if ((ret = saleae_logic16_start_acquisition(sdi)) != SR_OK) {
+ if ((ret = logic16_start_acquisition(sdi)) != SR_OK) {
abort_acquisition(devc);
return ret;
}
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- ret = saleae_logic16_abort_acquisition(sdi);
+ ret = logic16_abort_acquisition(sdi);
abort_acquisition(sdi->priv);
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
+ .dev_clear = NULL,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
projects / libsigrok.git / blobdiff