#include "fx2lafw.h"
#include "command.h"
-static struct fx2lafw_profile supported_fx2[] = {
- /* USBee AX */
- { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, 8 },
- { 0, 0, 0, 0, 0, 0 }
+static const struct fx2lafw_profile supported_fx2[] = {
+ /* CWAV USBee AX
+ * EE Electronics ESLA201A
+ */
+ { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
+ FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 },
+
+ /* CWAV USBee SX
+ */
+ { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL,
+ FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 8 },
+
+ /* Saleae Logic
+ * EE Electronics ESLA100
+ * Robomotic MiniLogic
+ */
+ { 0x0925, 0x3881, "Saleae", "Logic", NULL,
+ FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", 8 },
+
+ { 0, 0, 0, 0, 0, 0, 0 }
};
static int fx2lafw_capabilities[] = {
static GSList *dev_insts = NULL;
static libusb_context *usb_context = NULL;
+static int hw_dev_config_set(int dev_index, int hwcap, void *value);
static int hw_dev_acquisition_stop(int dev_index, void *session_dev_id);
/**
gboolean ret = FALSE;
while (!ret) {
- /* Assume it's not a Saleae Logic unless proven wrong. */
+ /* Assume the firmware has not been loaded, unless proven wrong. */
ret = 0;
if (libusb_get_device_descriptor(dev, &des) != 0)
break;
intf_dsc = &(conf_dsc->interface[0].altsetting[0]);
- if (intf_dsc->bNumEndpoints != 3)
- /* Need exactly 3 end points. */
+ if (intf_dsc->bNumEndpoints != 2)
+ /* Need exactly 2 end points. */
break;
if ((intf_dsc->endpoint[0].bEndpointAddress & 0x8f) !=
- (1 | LIBUSB_ENDPOINT_OUT))
- /* The first endpoint should be 1 (outbound). */
- break;
-
- if ((intf_dsc->endpoint[1].bEndpointAddress & 0x8f) !=
- (2 | LIBUSB_ENDPOINT_IN))
- /* The second endpoint should be 2 (inbound). */
+ (2 | LIBUSB_ENDPOINT_IN)) // 0x82
+ /* The first endpoint should be 2 (inbound). */
break;
/* TODO: Check the debug channel... */
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("fx2lafw: failed to get device descriptor: %d", err);
+ if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
+ sr_err("fx2lafw: 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("fx2lafw: failed to open device: %d", err);
+ sr_err("fx2lafw: failed to open device: %d", ret);
}
/* if we made it here, we handled the device one way or another */
sdi->status = SR_ST_INACTIVE;
}
+static int configure_probes(struct context *ctx, GSList *probes)
+{
+ struct sr_probe *probe;
+ GSList *l;
+ int probe_bit, stage, i;
+ char *tc;
+
+ for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
+ ctx->trigger_mask[i] = 0;
+ ctx->trigger_value[i] = 0;
+ }
+
+ stage = -1;
+ for (l = probes; l; l = l->next) {
+ probe = (struct sr_probe *)l->data;
+ if (probe->enabled == FALSE)
+ continue;
+ probe_bit = 1 << (probe->index - 1);
+ if (!(probe->trigger))
+ continue;
+
+ stage = 0;
+ for (tc = probe->trigger; *tc; tc++) {
+ ctx->trigger_mask[stage] |= probe_bit;
+ if (*tc == '1')
+ ctx->trigger_value[stage] |= probe_bit;
+ stage++;
+ if (stage > NUM_TRIGGER_STAGES)
+ return SR_ERR;
+ }
+ }
+
+ if (stage == -1)
+ /*
+ * We didn't configure any triggers, make sure acquisition
+ * doesn't wait for any.
+ */
+ ctx->trigger_stage = TRIGGER_FIRED;
+ else
+ ctx->trigger_stage = 0;
+
+ return SR_OK;
+}
+
static struct context *fx2lafw_device_new(void)
{
struct context *ctx;
return NULL;
}
+ ctx->trigger_stage = TRIGGER_FIRED;
+
return ctx;
}
{
struct sr_dev_inst *sdi;
struct libusb_device_descriptor des;
- struct fx2lafw_profile *fx2lafw_prof;
+ const struct fx2lafw_profile *fx2lafw_prof;
struct context *ctx;
libusb_device **devlist;
- int err;
+ int ret;
int devcnt = 0;
int i, j;
libusb_get_device_list(usb_context, &devlist);
for (i = 0; devlist[i]; i++) {
- if ((err = libusb_get_device_descriptor(
+ if ((ret = libusb_get_device_descriptor(
devlist[i], &des)) != 0) {
- sr_warn("failed to get device descriptor: %d", err);
+ sr_warn("failed to get device descriptor: %d", ret);
continue;
}
(libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL);
} else {
- if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, FIRMWARE) == SR_OK)
+ if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
+ fx2lafw_prof->firmware) == SR_OK)
/* Remember when the firmware on this device was updated */
g_get_current_time(&ctx->fw_updated);
else
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("fx2lafw: 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 = fx2lafw_open_dev(dev_index)) == SR_OK)
+ if ((ret = fx2lafw_open_dev(dev_index)) == SR_OK)
break;
g_usleep(100 * 1000);
g_get_current_time(&cur_time);
}
sr_info("fx2lafw: device came back after %d ms", timediff);
} else {
- err = fx2lafw_open_dev(dev_index);
+ ret = fx2lafw_open_dev(dev_index);
}
- if (err != SR_OK) {
+ if (ret != SR_OK) {
sr_err("fx2lafw: unable to open device");
return SR_ERR;
}
ctx = sdi->priv;
- err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
- if (err != 0) {
- sr_err("fx2lafw: Unable to claim interface: %d", err);
+ ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+ if (ret != 0) {
+ sr_err("fx2lafw: Unable to claim interface: %d", ret);
return SR_ERR;
}
+ 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,
+ &fx2lafw_supported_samplerates[0]) == SR_ERR)
+ return SR_ERR;
+ }
+
return SR_OK;
}
ctx->cur_samplerate = *(uint64_t *)value;
ret = SR_OK;
} else if (hwcap == SR_HWCAP_PROBECONFIG) {
- ret = SR_OK;
+ ret = configure_probes(ctx, (GSList *) value);
} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
ctx->limit_samples = *(uint64_t *)value;
ret = SR_OK;
return TRUE;
}
+static void abort_acquisition(struct context *ctx)
+{
+ struct sr_datafeed_packet packet;
+
+ packet.type = SR_DF_END;
+ sr_session_send(ctx->session_dev_id, &packet);
+
+ ctx->num_samples = -1;
+
+ /* TODO: Need to cancel and free any queued up transfers. */
+}
+
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;
- int cur_buflen;
+ 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);
return;
/* Save incoming transfer before reusing the transfer struct. */
cur_buf = transfer->buffer;
cur_buflen = transfer->actual_length;
- ctx = transfer->user_data;
/* Fire off a new request. */
if (!(new_buf = g_try_malloc(4096))) {
* The FX2 gave up. End the acquisition, the frontend
* will work out that the samplecount is short.
*/
- hw_dev_acquisition_stop(-1, ctx->session_dev_id);
+ abort_acquisition(ctx);
}
return;
} else {
empty_transfer_count = 0;
}
- /* Send the incoming transfer to the session bus. */
- packet.type = SR_DF_LOGIC;
- packet.payload = &logic;
- logic.length = cur_buflen;
- logic.unitsize = 1;
- logic.data = cur_buf;
- sr_session_send(ctx->session_dev_id, &packet);
- g_free(cur_buf);
+ trigger_offset = 0;
+ if (ctx->trigger_stage >= 0) {
+ for (i = 0; i < cur_buflen; i++) {
+
+ if ((cur_buf[i] & ctx->trigger_mask[ctx->trigger_stage]) == ctx->trigger_value[ctx->trigger_stage]) {
+ /* Match on this trigger stage. */
+ ctx->trigger_buffer[ctx->trigger_stage] = cur_buf[i];
+ ctx->trigger_stage++;
+
+ if (ctx->trigger_stage == NUM_TRIGGER_STAGES || ctx->trigger_mask[ctx->trigger_stage] == 0) {
+ /* Match on all trigger stages, we're done. */
+ trigger_offset = i + 1;
+
+ /*
+ * TODO: Send pre-trigger buffer to session bus.
+ * Tell the frontend we hit the trigger here.
+ */
+ packet.type = SR_DF_TRIGGER;
+ packet.payload = NULL;
+ sr_session_send(ctx->session_dev_id, &packet);
+
+ /*
+ * Send the samples that triggered it, since we're
+ * skipping past them.
+ */
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ logic.length = ctx->trigger_stage;
+ logic.unitsize = 1;
+ logic.data = ctx->trigger_buffer;
+ sr_session_send(ctx->session_dev_id, &packet);
+
+ ctx->trigger_stage = TRIGGER_FIRED;
+ break;
+ }
+ return;
+ }
+
+ /*
+ * We had a match before, but not in the next sample. However, we may
+ * have a match on this stage in the next bit -- trigger on 0001 will
+ * fail on seeing 00001, so we need to go back to stage 0 -- but at
+ * the next sample from the one that matched originally, which the
+ * counter increment at the end of the loop takes care of.
+ */
+ if (ctx->trigger_stage > 0) {
+ i -= ctx->trigger_stage;
+ if (i < -1)
+ i = -1; /* Oops, went back past this buffer. */
+ /* Reset trigger stage. */
+ ctx->trigger_stage = 0;
+ }
+ }
+ }
- num_samples += cur_buflen;
- if (ctx->limit_samples &&
- (unsigned int) num_samples > ctx->limit_samples) {
- hw_dev_acquisition_stop(-1, ctx->session_dev_id);
+ if (ctx->trigger_stage == TRIGGER_FIRED) {
+ /* Send the incoming transfer to the session bus. */
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ logic.length = cur_buflen - trigger_offset;
+ logic.unitsize = 1;
+ logic.data = cur_buf + trigger_offset;
+ sr_session_send(ctx->session_dev_id, &packet);
+ g_free(cur_buf);
+
+ ctx->num_samples += cur_buflen;
+ if (ctx->limit_samples &&
+ (unsigned int)ctx->num_samples > ctx->limit_samples) {
+ abort_acquisition(ctx);
+ }
+ } else {
+ /*
+ * TODO: Buffer pre-trigger data in capture
+ * ratio-sized buffer.
+ */
}
}
struct context *ctx;
struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd;
- int err, size, i;
+ int ret, size, i;
unsigned char *buf;
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
return SR_ERR;
ctx = sdi->priv;
ctx->session_dev_id = cb_data;
+ ctx->num_samples = 0;
if (!(packet = g_try_malloc(sizeof(struct sr_datafeed_packet)))) {
sr_err("fx2lafw: %s: packet malloc failed", __func__);
return SR_ERR_MALLOC;
}
- if ((err = command_start_acquisition (ctx->usb->devhdl)) != SR_OK) {
- return err;
- }
-
/* Start with 2K transfer, subsequently increased to 4K. */
size = 2048;
for (i = 0; i < NUM_SIMUL_TRANSFERS; i++) {
g_free(header);
g_free(packet);
+ if ((ret = command_start_acquisition (ctx->usb->devhdl,
+ ctx->cur_samplerate)) != SR_OK) {
+ return ret;
+ }
+
return SR_OK;
}
/* 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;
-
- /* Avoid compiler warnings. */
- (void)dev_index;
-
- packet.type = SR_DF_END;
- sr_session_send(cb_data, &packet);
+ struct sr_dev_inst *sdi;
- receive_transfer(NULL);
+ /* unused parameter */
+ (void)cb_data;
- /* TODO: Need to cancel and free any queued up transfers. */
+ if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ return SR_ERR;
+
+ abort_acquisition(sdi->priv);
return SR_OK;
}
SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
.name = "fx2lafw",
- .longname = "fx2lafw",
+ .longname = "fx2lafw (generic driver for FX2 based LAs)",
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
projects / libsigrok.git / blobdiff