BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fx2lafw: Use new trigger API.

This commit is contained in:
Bert Vermeulen 2014-05-28 00:21:10 +02:00
parent aeff7fa286
commit 9615eeb572
3 changed files with 155 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hardware/fx2lafw/api.c
View File

@ -79,7 +79,7 @@ static const int32_t hwopts[] = {
static const int32_t hwcaps[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_TRIGGER_TYPE,
SR_CONF_TRIGGER_MATCH,
SR_CONF_SAMPLERATE,
/* These are really implemented in the driver, not the hardware. */
@ -93,6 +93,11 @@ static const char *channel_names[] = {
NULL,
};
static const int32_t soft_trigger_matches[] = {
SR_TRIGGER_ZERO,
SR_TRIGGER_ONE,
};
static const uint64_t samplerates[] = {
SR_KHZ(20),
SR_KHZ(25),
@ -369,7 +374,6 @@ static int cleanup(void)
if (!(drvc = di->priv))
return SR_OK;
ret = std_dev_clear(di, NULL);
g_free(drvc);
@ -475,8 +479,10 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb);
break;
case SR_CONF_TRIGGER_TYPE:
*data = g_variant_new_string(SOFT_TRIGGER_TYPES);
case SR_CONF_TRIGGER_MATCH:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
sizeof(int32_t));
break;
default:
return SR_ERR_NA;
@ -520,17 +526,18 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
devc = sdi->priv;
usb = sdi->conn;
/* Configures devc->trigger_* and devc->sample_wide */
if (fx2lafw_configure_channels(sdi) != SR_OK) {
sr_err("Failed to configure channels.");
return SR_ERR;
}
devc->cb_data = cb_data;
devc->sent_samples = 0;
devc->acq_aborted = FALSE;
devc->empty_transfer_count = 0;
if (sr_session_trigger_get()) {
devc->trigger_fired = FALSE;
devc->cur_trigger_stage = 0;
devc->cur_trigger_step = 0;
} else
devc->trigger_fired = TRUE;
timeout = fx2lafw_get_timeout(devc);
num_transfers = fx2lafw_get_number_of_transfers(devc);
size = fx2lafw_get_buffer_size(devc);
@ -551,7 +558,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
transfer = libusb_alloc_transfer(0);
libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size,
fx2lafw_receive_transfer, devc, timeout);
fx2lafw_receive_transfer, (void *)sdi, timeout);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret));

276
hardware/fx2lafw/protocol.c
View File

@ -297,58 +297,6 @@ SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di)
return SR_OK;
}
SR_PRIV int fx2lafw_configure_channels(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_channel *ch;
GSList *l;
int channel_bit, stage, i;
char *tc;
devc = sdi->priv;
for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
devc->trigger_mask[i] = 0;
devc->trigger_value[i] = 0;
}
stage = -1;
for (l = sdi->channels; l; l = l->next) {
ch = (struct sr_channel *)l->data;
if (ch->enabled == FALSE)
continue;
if (ch->index > 7)
devc->sample_wide = TRUE;
channel_bit = 1 << (ch->index);
if (!(ch->trigger))
continue;
stage = 0;
for (tc = ch->trigger; *tc; tc++) {
devc->trigger_mask[stage] |= channel_bit;
if (*tc == '1')
devc->trigger_value[stage] |= channel_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.
*/
devc->trigger_fired = TRUE;
} else {
devc->trigger_fired = FALSE;
devc->trigger_stage = 0;
}
return SR_OK;
}
SR_PRIV struct dev_context *fx2lafw_dev_new(void)
{
struct dev_context *devc;
@ -396,10 +344,12 @@ static void finish_acquisition(struct dev_context *devc)
static void free_transfer(struct libusb_transfer *transfer)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
unsigned int i;
devc = transfer->user_data;
sdi = transfer->user_data;
devc = sdi->priv;
g_free(transfer->buffer);
transfer->buffer = NULL;
@ -424,24 +374,112 @@ static void resubmit_transfer(struct libusb_transfer *transfer)
if ((ret = libusb_submit_transfer(transfer)) == LIBUSB_SUCCESS)
return;
free_transfer(transfer);
/* TODO: Stop session? */
sr_err("%s: %s", __func__, libusb_error_name(ret));
free_transfer(transfer);
}
static gboolean check_match(uint16_t sample, struct sr_trigger_match *match)
{
gboolean bit, result;
result = FALSE;
bit = sample & (1 << match->channel->index);
if (match->match == SR_TRIGGER_ZERO && !bit)
result = TRUE;
else if (match->match == SR_TRIGGER_ONE && bit)
result = TRUE;
return result;
}
/* Returns the offset (in samples) within buf of where the trigger
* occurred, or -1 if not triggered. */
static int soft_trigger(struct sr_dev_inst *sdi, uint8_t *buf,
int len)
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_trigger *trigger;
struct sr_trigger_stage *stage;
struct sr_trigger_match *match;
GSList *l, *lst;;
int offset;
uint16_t sample;
int unitsize, i;
gboolean match_found;
devc = sdi->priv;
offset = -1;
trigger = sr_session_trigger_get();
unitsize = devc->sample_wide ? 2 : 1;
for (i = 0; i < len; i += unitsize) {
memcpy(&sample, buf + i, unitsize);
lst = g_slist_nth(trigger->stages, devc->cur_trigger_stage);
stage = lst->data;
if (!stage->matches)
/* No matches supplied, client error. */
return SR_ERR_ARG;
match_found = TRUE;
for (l = stage->matches; l; l = l->next) {
match = l->data;
if (!match->channel->enabled)
/* Ignore disabled channels with a trigger. */
continue;
if (!check_match(sample, match)) {
match_found = FALSE;
break;
}
}
if (match_found) {
/* Matched on the current stage. */
if (lst->next) {
/* Advance to next stage. */
devc->cur_trigger_stage++;
} else {
/* Matched on last stage, fire trigger. */
offset = i / unitsize;
packet.type = SR_DF_TRIGGER;
packet.payload = NULL;
sr_session_send(devc->cb_data, &packet);
break;
}
} else if (devc->cur_trigger_stage > 0) {
/*
* We had a match at an earlier stage, but failed on the
* current stage. 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.
*/
i -= devc->cur_trigger_stage * unitsize;
if (i < -1)
i = -1; /* Oops, went back past this buffer. */
/* Reset trigger stage. */
devc->cur_trigger_stage = 0;
}
}
return offset;
}
SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
gboolean packet_has_error = FALSE;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
struct dev_context *devc;
unsigned int trigger_offset, num_samples;
int cur_sample_count, sample_width, i;
uint8_t *cur_buf;
uint16_t cur_sample;
unsigned int num_samples;
int trigger_offset, cur_sample_count, unitsize;
devc = transfer->user_data;
sdi = transfer->user_data;
devc = sdi->priv;
/*
* If acquisition has already ended, just free any queued up
@ -456,9 +494,8 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
transfer->status, transfer->actual_length);
/* Save incoming transfer before reusing the transfer struct. */
cur_buf = transfer->buffer;
sample_width = devc->sample_wide ? 2 : 1;
cur_sample_count = transfer->actual_length / sample_width;
unitsize = devc->sample_wide ? 2 : 1;
cur_sample_count = transfer->actual_length / unitsize;
switch (transfer->status) {
case LIBUSB_TRANSFER_NO_DEVICE:
@ -490,88 +527,45 @@ SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer)
devc->empty_transfer_count = 0;
}
trigger_offset = 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 ((cur_sample & devc->trigger_mask[devc->trigger_stage]) ==
devc->trigger_value[devc->trigger_stage]) {
/* Match on this trigger stage. */
devc->trigger_buffer[devc->trigger_stage] = cur_sample;
devc->trigger_stage++;
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;
/*
* 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(devc->cb_data, &packet);
/*
* Send the samples that triggered it,
* since we're skipping past them.
*/
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.data = cur_buf + trigger_offset * sample_width;
sr_session_send(devc->cb_data, &packet);
devc->sent_samples += num_samples;
devc->trigger_fired = TRUE;
break;
}
} else if (devc->trigger_stage > 0) {
/*
* 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.
*/
i -= devc->trigger_stage;
if (i < -1)
i = -1; /* Oops, went back past this buffer. */
/* Reset trigger stage. */
devc->trigger_stage = 0;
}
if (devc->trigger_fired) {
if (devc->sent_samples < devc->limit_samples) {
/* Send the incoming transfer to the session bus. */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
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 * unitsize;
logic.unitsize = unitsize;
logic.data = transfer->buffer;
sr_session_send(devc->cb_data, &packet);
devc->sent_samples += cur_sample_count;
}
} else {
trigger_offset = soft_trigger(sdi, transfer->buffer, transfer->actual_length);
if (trigger_offset > -1) {
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 * unitsize;
logic.unitsize = unitsize;
logic.data = transfer->buffer + trigger_offset * unitsize;
sr_session_send(devc->cb_data, &packet);
devc->sent_samples += num_samples;
devc->trigger_fired = TRUE;
}
} else if (devc->sent_samples < devc->limit_samples) {
/* Send the incoming transfer to the session bus. */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
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;
sr_session_send(devc->cb_data, &packet);
devc->sent_samples += cur_sample_count;
}
if (devc->limit_samples && devc->sent_samples >= devc->limit_samples) {
fx2lafw_abort_acquisition(devc);
free_transfer(transfer);
return;
}
resubmit_transfer(transfer);
} else
resubmit_transfer(transfer);
}
static unsigned int to_bytes_per_ms(unsigned int samplerate)

8
hardware/fx2lafw/protocol.h
View File

@ -34,7 +34,6 @@
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
#define NUM_TRIGGER_STAGES 4
#define SOFT_TRIGGER_TYPES "01"
#define MAX_RENUM_DELAY_MS 3000
#define NUM_SIMUL_TRANSFERS 32
@ -86,10 +85,8 @@ struct dev_context {
gboolean trigger_fired;
gboolean acq_aborted;
gboolean sample_wide;
uint16_t trigger_mask[NUM_TRIGGER_STAGES];
uint16_t trigger_value[NUM_TRIGGER_STAGES];
unsigned int trigger_stage;
uint16_t trigger_buffer[NUM_TRIGGER_STAGES];
unsigned int cur_trigger_stage;
int cur_trigger_step;
unsigned int sent_samples;
int submitted_transfers;
@ -104,7 +101,6 @@ struct dev_context {
SR_PRIV int fx2lafw_command_start_acquisition(const struct sr_dev_inst *sdi);
SR_PRIV gboolean fx2lafw_check_conf_profile(libusb_device *dev);
SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di);
SR_PRIV int fx2lafw_configure_channels(const struct sr_dev_inst *sdi);
SR_PRIV struct dev_context *fx2lafw_dev_new(void);
SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc);
SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer);