};
static struct sr_samplerates samplerates = {
- SR_KHZ(200),
- SR_MHZ(24),
- SR_HZ(0),
+ 0,
+ 0,
+ 0,
supported_samplerates,
};
static int new_saleae_logic_firmware = 0;
static int hw_dev_config_set(int dev_index, int hwcap, void *value);
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id);
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
/**
* Check the USB configuration to determine if this is a Saleae Logic.
struct libusb_device_descriptor des;
struct sr_dev_inst *sdi;
struct context *ctx;
- int err, skip, i;
+ 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++) {
- if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("logic: failed to get device descriptor: %d", err);
+ if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+ sr_err("logic: failed to get device descriptor: %d", ret);
continue;
}
continue;
}
- if (!(err = libusb_open(devlist[i], &ctx->usb->devhdl))) {
+ if (!(ret = libusb_open(devlist[i], &ctx->usb->devhdl))) {
if (ctx->usb->address == 0xff)
/*
* first time we touch this device after firmware upload,
sdi->index, ctx->usb->bus,
ctx->usb->address, USB_INTERFACE);
} else {
- sr_err("logic: failed to open device: %d", err);
+ sr_err("logic: failed to open device: %d", ret);
}
/* if we made it here, we handled the device one way or another */
struct fx2_profile *fx2_prof;
struct context *ctx;
libusb_device **devlist;
- int err, devcnt, i, j;
+ int ret, devcnt, i, j;
/* Avoid compiler warnings. */
(void)devinfo;
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
fx2_prof = NULL;
- err = libusb_get_device_descriptor(devlist[i], &des);
- if (err != 0) {
+ ret = libusb_get_device_descriptor(devlist[i], &des);
+ if (ret != 0) {
sr_err("logic: failed to get device descriptor: %d",
- err);
+ ret);
continue;
}
GTimeVal cur_time;
struct sr_dev_inst *sdi;
struct context *ctx;
- int timediff, err;
+ int timediff, ret;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
* if the firmware was recently uploaded, wait up to MAX_RENUM_DELAY ms
* for the FX2 to renumerate
*/
- err = 0;
+ ret = 0;
if (GTV_TO_MSEC(ctx->fw_updated) > 0) {
sr_info("logic: waiting for device to reset");
/* takes at least 300ms for the FX2 to be gone from the USB bus */
g_usleep(300 * 1000);
timediff = 0;
while (timediff < MAX_RENUM_DELAY) {
- if ((err = sl_open_dev(dev_index)) == SR_OK)
+ if ((ret = sl_open_dev(dev_index)) == SR_OK)
break;
g_usleep(100 * 1000);
g_get_current_time(&cur_time);
}
sr_info("logic: device came back after %d ms", timediff);
} else {
- err = sl_open_dev(dev_index);
+ ret = sl_open_dev(dev_index);
}
- if (err != SR_OK) {
+ if (ret != SR_OK) {
sr_err("logic: unable to open device");
return SR_ERR;
}
ctx = sdi->priv;
- err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
- if (err != 0) {
- sr_err("logic: Unable to claim interface: %d", err);
+ ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+ if (ret != 0) {
+ sr_err("logic: Unable to claim interface: %d", ret);
return SR_ERR;
}
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("logic: %s: sdi was NULL", __func__);
- return SR_ERR; /* TODO: SR_ERR_ARG? */
+ return SR_ERR_BUG;
}
/* TODO */
return ret;
}
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *cb_data)
{
struct timeval tv;
/* Avoid compiler warnings. */
(void)fd;
(void)revents;
- (void)user_data;
+ (void)cb_data;
tv.tv_sec = tv.tv_usec = 0;
libusb_handle_events_timeout(usb_context, &tv);
return TRUE;
}
+static void abort_acquisition(struct context *ctx)
+{
+ ctx->num_samples = -1;
+}
+
+static void finish_acquisition(struct context *ctx)
+{
+ struct sr_datafeed_packet packet;
+ int i;
+
+ /* Terminate session */
+ packet.type = SR_DF_END;
+ sr_session_send(ctx->session_dev_id, &packet);
+
+ /* Remove fds from polling */
+ const struct libusb_pollfd **const lupfd =
+ libusb_get_pollfds(usb_context);
+ for (i = 0; lupfd[i]; i++)
+ sr_source_remove(lupfd[i]->fd);
+ free(lupfd); /* NOT g_free()! */
+}
+
static void receive_transfer(struct libusb_transfer *transfer)
{
/* TODO: These statics have to move to the ctx struct. */
- static int num_samples = 0;
static int empty_transfer_count = 0;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
- struct context *ctx;
+ struct context *ctx = transfer->user_data;
int cur_buflen, trigger_offset, i;
unsigned char *cur_buf, *new_buf;
- /* hw_dev_acquisition_stop() is telling us to stop. */
- if (transfer == NULL)
- num_samples = -1;
-
/*
* If acquisition has already ended, just free any queued up
* transfer that come in.
*/
- if (num_samples == -1) {
+ if (ctx->num_samples == -1) {
if (transfer)
libusb_free_transfer(transfer);
+
+ ctx->submitted_transfers--;
+ if (ctx->submitted_transfers == 0)
+ finish_acquisition(ctx);
+
return;
}
* The FX2 gave up. End the acquisition, the frontend
* will work out that the samplecount is short.
*/
- hw_dev_acquisition_stop(-1, ctx->session_data);
+ abort_acquisition(ctx);
}
return;
} else {
*/
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
- sr_session_send(ctx->session_data, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
/*
* Send the samples that triggered it, since we're
logic.length = ctx->trigger_stage;
logic.unitsize = 1;
logic.data = ctx->trigger_buffer;
- sr_session_send(ctx->session_data, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
ctx->trigger_stage = TRIGGER_FIRED;
break;
logic.length = cur_buflen - trigger_offset;
logic.unitsize = 1;
logic.data = cur_buf + trigger_offset;
- sr_session_send(ctx->session_data, &packet);
+ sr_session_send(ctx->session_dev_id, &packet);
g_free(cur_buf);
- num_samples += cur_buflen;
- if (ctx->limit_samples && (unsigned int) num_samples > ctx->limit_samples) {
- hw_dev_acquisition_stop(-1, ctx->session_data);
+ ctx->num_samples += cur_buflen;
+ if (ctx->limit_samples && (unsigned int)ctx->num_samples > ctx->limit_samples) {
+ abort_acquisition(ctx);
}
} else {
/*
}
}
-static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
{
struct sr_dev_inst *sdi;
struct sr_datafeed_packet *packet;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
ctx = sdi->priv;
- ctx->session_data = session_data;
+ ctx->session_dev_id = cb_data;
+ ctx->num_samples = 0;
if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
sr_err("logic: %s: packet malloc failed", __func__);
g_free(buf);
return SR_ERR;
}
+
+ ctx->submitted_transfers++;
size = 4096;
}
gettimeofday(&header->starttime, NULL);
header->samplerate = ctx->cur_samplerate;
header->num_logic_probes = ctx->profile->num_probes;
- sr_session_send(session_data, packet);
+ sr_session_send(ctx->session_dev_id, packet);
g_free(header);
g_free(packet);
return SR_OK;
}
-/* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
{
- struct sr_datafeed_packet packet;
+ struct sr_dev_inst *sdi;
- /* Avoid compiler warnings. */
- (void)dev_index;
+ /* unused parameter */
+ (void)cb_data;
- packet.type = SR_DF_END;
- sr_session_send(session_data, &packet);
-
- receive_transfer(NULL);
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ return SR_ERR;
- /* TODO: Need to cancel and free any queued up transfers. */
+ abort_acquisition(sdi->priv);
return SR_OK;
}
projects / libsigrok.git / blobdiff