return SR_OK;
}
-static int command_get_revid_version(libusb_device_handle *devhdl,
- uint8_t *revid)
+static int command_get_revid_version(struct sr_dev_inst *sdi, uint8_t *revid)
{
+ struct sr_usb_dev_inst *usb = sdi->conn;
+ libusb_device_handle *devhdl = usb->devhdl;
int ret;
ret = libusb_control_transfer(devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
return SR_OK;
}
-SR_PRIV int fx2lafw_command_start_acquisition(libusb_device_handle *devhdl,
- uint64_t samplerate, gboolean samplewide)
+SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi)
{
- struct cmd_start_acquisition cmd;
+ struct dev_context *devc = sdi->priv;
+ struct sr_usb_dev_inst *usb = sdi->conn;
+ libusb_device_handle *devhdl = usb->devhdl;
+ uint64_t samplerate = devc->cur_samplerate;
+ gboolean samplewide = devc->sample_wide;
+ struct cmd_start_acquisition cmd = { 0 };
int delay = 0, ret;
/* Compute the sample rate. */
break;
}
- ret = command_get_revid_version(usb->devhdl, &revid);
+ ret = command_get_revid_version(sdi, &revid);
if (ret != SR_OK) {
sr_err("Failed to get REVID.");
break;
return SR_OK;
}
-SR_PRIV int fx2lafw_configure_probes(const struct sr_dev_inst *sdi)
+SR_PRIV int fx2lafw_configure_channels(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
GSList *l;
- int probe_bit, stage, i;
+ int channel_bit, stage, i;
char *tc;
devc = sdi->priv;
}
stage = -1;
- for (l = sdi->probes; l; l = l->next) {
- probe = (struct sr_channel *)l->data;
- if (probe->enabled == FALSE)
+ for (l = sdi->channels; l; l = l->next) {
+ ch = (struct sr_channel *)l->data;
+ if (ch->enabled == FALSE)
continue;
- if (probe->index > 7)
+ if (ch->index > 7)
devc->sample_wide = TRUE;
- probe_bit = 1 << (probe->index);
- if (!(probe->trigger))
+ channel_bit = 1 << (ch->index);
+ if (!(ch->trigger))
continue;
stage = 0;
- for (tc = probe->trigger; *tc; tc++) {
- devc->trigger_mask[stage] |= probe_bit;
+ for (tc = ch->trigger; *tc; tc++) {
+ devc->trigger_mask[stage] |= channel_bit;
if (*tc == '1')
- devc->trigger_value[stage] |= probe_bit;
+ devc->trigger_value[stage] |= channel_bit;
stage++;
if (stage > NUM_TRIGGER_STAGES)
return SR_ERR;
}
}
- if (stage == -1)
+ if (stage == -1) {
/*
* We didn't configure any triggers, make sure acquisition
* doesn't wait for any.
*/
- devc->trigger_stage = TRIGGER_FIRED;
- else
+ devc->trigger_fired = TRUE;
+ } else {
+ devc->trigger_fired = FALSE;
devc->trigger_stage = 0;
+ }
return SR_OK;
}
{
int i;
- devc->num_samples = -1;
+ devc->acq_aborted = TRUE;
for (i = devc->num_transfers - 1; i >= 0; i--) {
if (devc->transfers[i])
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct dev_context *devc;
- int trigger_offset, i, sample_width, cur_sample_count;
- int trigger_offset_bytes;
+ unsigned int trigger_offset, num_samples;
+ int cur_sample_count, sample_width, i;
uint8_t *cur_buf;
uint16_t cur_sample;
* If acquisition has already ended, just free any queued up
* transfer that come in.
*/
- if (devc->num_samples == -1) {
+ if (devc->acq_aborted) {
free_transfer(transfer);
return;
}
}
trigger_offset = 0;
- if (devc->trigger_stage >= 0) {
+ if (!devc->trigger_fired) {
for (i = 0; i < cur_sample_count; i++) {
-
cur_sample = devc->sample_wide ?
*((uint16_t *)cur_buf + i) :
*((uint8_t *)cur_buf + i);
if (devc->trigger_stage == NUM_TRIGGER_STAGES ||
devc->trigger_mask[devc->trigger_stage] == 0) {
/* Match on all trigger stages, we're done. */
- trigger_offset = i + 1;
+ trigger_offset = i;
/*
* TODO: Send pre-trigger buffer to session bus.
*/
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
+ num_samples = cur_sample_count - trigger_offset;
+ if (devc->limit_samples &&
+ num_samples > devc->limit_samples - devc->sent_samples)
+ num_samples = devc->limit_samples - devc->sent_samples;
+ logic.length = num_samples * sample_width;
logic.unitsize = sample_width;
- logic.length = devc->trigger_stage * logic.unitsize;
- logic.data = devc->trigger_buffer;
+ logic.data = cur_buf + trigger_offset * sample_width;
sr_session_send(devc->cb_data, &packet);
+ devc->sent_samples += num_samples;
- devc->trigger_stage = TRIGGER_FIRED;
+ devc->trigger_fired = TRUE;
break;
}
} else if (devc->trigger_stage > 0) {
devc->trigger_stage = 0;
}
}
- }
-
- if (devc->trigger_stage == TRIGGER_FIRED) {
+ } else if (devc->sent_samples < devc->limit_samples) {
/* Send the incoming transfer to the session bus. */
- trigger_offset_bytes = trigger_offset * sample_width;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- logic.length = transfer->actual_length - trigger_offset_bytes;
+ if (devc->sent_samples + cur_sample_count > devc->limit_samples)
+ num_samples = devc->limit_samples - devc->sent_samples;
+ else
+ num_samples = cur_sample_count;
+ logic.length = num_samples * sample_width;
logic.unitsize = sample_width;
- logic.data = cur_buf + trigger_offset_bytes;
+ logic.data = cur_buf;
sr_session_send(devc->cb_data, &packet);
+ devc->sent_samples += cur_sample_count;
+ }
- devc->num_samples += cur_sample_count;
- if (devc->limit_samples &&
- (unsigned int)devc->num_samples > devc->limit_samples) {
- fx2lafw_abort_acquisition(devc);
- free_transfer(transfer);
- return;
- }
- } else {
- /*
- * TODO: Buffer pre-trigger data in capture
- * ratio-sized buffer.
- */
+ if (devc->limit_samples && devc->sent_samples >= devc->limit_samples) {
+ fx2lafw_abort_acquisition(devc);
+ free_transfer(transfer);
+ return;
}
resubmit_transfer(transfer);
projects / libsigrok.git / blobdiff