/** The currently configured samplerate of the device. */
uint64_t cur_samplerate;
+ /** period in picoseconds corresponding to the samplerate */
+ uint64_t period_ps;
+
/** The current sampling limit (in ms). */
uint64_t limit_msec;
/* Function prototypes. */
static int la8_close_usb_reset_sequencer(struct la8 *la8);
-static void hw_stop_acquisition(int device_index, gpointer session_device_id);
+static void hw_stop_acquisition(int device_index, gpointer session_data);
static int la8_reset(struct la8 *la8);
static void fill_supported_samplerates_if_needed(void)
uint8_t buf[8] = {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
int ret;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
if (!la8) {
sr_err("la8: %s: la8 was NULL", __func__);
sr_warn("la8: %s: ftdi_usb_close: (%d) %s", __func__,
ret, ftdi_get_error_string(la8->ftdic));
} else {
- sr_dbg("la8: %s: usb_dev was NULL, nothing to do", __func__);
+ sr_spew("la8: %s: usb_dev was NULL, nothing to do", __func__);
}
ftdi_free(la8->ftdic); /* Returns void. */
struct sr_device_instance *sdi;
struct la8 *la8;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
/* Avoid compiler errors. */
deviceinfo = deviceinfo;
/* Set some sane defaults. */
la8->ftdic = NULL;
la8->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */
+ la8->period_ps = 10000;
la8->limit_msec = 0;
la8->limit_samples = 0;
la8->session_id = NULL;
device_instances = g_slist_append(device_instances, sdi);
- sr_dbg("la8: %s finished successfully", __func__);
+ sr_spew("la8: %s finished successfully", __func__);
/* Close device. We'll reopen it again when we need it. */
(void) la8_close(la8); /* Log, but ignore errors. */
return SR_ERR_ARG;
}
- sr_dbg("la8: setting samplerate");
+ sr_spew("la8: setting samplerate");
fill_supported_samplerates_if_needed();
/* Set the new samplerate. */
la8->cur_samplerate = samplerate;
+ la8->period_ps = 1000000000000 / samplerate;
sr_dbg("la8: samplerate set to %" PRIu64 "Hz", la8->cur_samplerate);
/* TODO: Really ignore errors here, or return SR_ERR? */
(void) la8_close_usb_reset_sequencer(la8); /* Ignore errors. */
} else {
- sr_dbg("la8: %s: status not ACTIVE, nothing to do", __func__);
+ sr_spew("la8: %s: status not ACTIVE, nothing to do", __func__);
}
sdi->status = SR_ST_INACTIVE;
GSList *l;
struct sr_device_instance *sdi;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
/* Properly close all devices. */
for (l = device_instances; l; l = l->next) {
struct la8 *la8;
void *info;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
sr_err("la8: %s: sdi was NULL", __func__);
static int *hw_get_capabilities(void)
{
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
return capabilities;
}
struct sr_device_instance *sdi;
struct la8 *la8;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
sr_err("la8: %s: sdi was NULL", __func__);
return SR_ERR_ARG;
}
- // sr_dbg("la8: %s: reading block %d", __func__, la8->block_counter);
+ sr_spew("la8: %s: reading block %d", __func__, la8->block_counter);
bytes_read = la8_read(la8, la8->mangled_buf, BS);
/* If first block read got 0 bytes, retry until success or timeout. */
if ((bytes_read == 0) && (la8->block_counter == 0)) {
do {
- // sr_dbg("la8: %s: reading block 0 again", __func__);
+ sr_spew("la8: %s: reading block 0 again", __func__);
bytes_read = la8_read(la8, la8->mangled_buf, BS);
/* TODO: How to handle read errors here? */
now = time(NULL);
}
/* De-mangle the data. */
- // sr_dbg("la8: de-mangling samples of block %d", la8->block_counter);
+ sr_spew("la8: de-mangling samples of block %d", la8->block_counter);
byte_offset = la8->block_counter * BS;
m = byte_offset / (1024 * 1024);
mi = m * (1024 * 1024);
int i;
uint8_t sample, expected_sample;
struct sr_datafeed_packet packet;
+ struct sr_datafeed_logic logic;
int trigger_point; /* Relative trigger point (in this block). */
/* Note: No sanity checks on la8/block, caller is responsible. */
if (la8->trigger_found)
break;
+ /*
+ * Also, don't continue if triggers are "don't care", i.e. if
+ * no trigger conditions were specified by the user. In that
+ * case we don't want to send an SR_DF_TRIGGER packet at all.
+ */
+ if (la8->trigger_mask == 0x00)
+ break;
+
sample = *(la8->final_buf + (block * BS) + i);
if ((sample & la8->trigger_mask) == expected_sample) {
/* If no trigger was found, send one SR_DF_LOGIC packet. */
if (trigger_point == -1) {
/* Send an SR_DF_LOGIC packet to the session bus. */
- // sr_dbg("la8: %s: sending SR_DF_LOGIC packet", __func__);
+ sr_spew("la8: sending SR_DF_LOGIC packet (%d bytes) for "
+ "block %d", BS, block);
packet.type = SR_DF_LOGIC;
- packet.length = BS;
- packet.unitsize = 1;
- packet.payload = la8->final_buf + (block * BS);
+ packet.timeoffset = block * BS * la8->period_ps;
+ packet.duration = BS * la8->period_ps;
+ packet.payload = &logic;
+ logic.length = BS;
+ logic.unitsize = 1;
+ logic.data = la8->final_buf + (block * BS);
sr_session_bus(la8->session_id, &packet);
return;
}
/* If at least one sample is located before the trigger... */
if (trigger_point > 0) {
/* Send pre-trigger SR_DF_LOGIC packet to the session bus. */
- sr_dbg("la8: %s: sending pre-trigger SR_DF_LOGIC packet, ",
- "start = %" PRIu64 ", length = %d", __func__,
- block * BS, trigger_point);
+ sr_spew("la8: sending pre-trigger SR_DF_LOGIC packet, "
+ "start = %d, length = %d", block * BS, trigger_point);
packet.type = SR_DF_LOGIC;
- packet.length = trigger_point;
- packet.unitsize = 1;
- packet.payload = la8->final_buf + (block * BS);
+ packet.timeoffset = block * BS * la8->period_ps;
+ packet.duration = trigger_point * la8->period_ps;
+ packet.payload = &logic;
+ logic.length = trigger_point;
+ logic.unitsize = 1;
+ logic.data = la8->final_buf + (block * BS);
sr_session_bus(la8->session_id, &packet);
}
/* Send the SR_DF_TRIGGER packet to the session bus. */
- sr_dbg("la8: %s: sending SR_DF_TRIGGER packet, sample = %" PRIu64,
- __func__, (block * BS) + trigger_point);
+ sr_spew("la8: sending SR_DF_TRIGGER packet, sample = %d",
+ (block * BS) + trigger_point);
packet.type = SR_DF_TRIGGER;
- packet.length = 0;
- packet.unitsize = 0;
+ packet.timeoffset = (block * BS + trigger_point) * la8->period_ps;
+ packet.duration = 0;
packet.payload = NULL;
sr_session_bus(la8->session_id, &packet);
/* If at least one sample is located after the trigger... */
if (trigger_point < (BS - 1)) {
/* Send post-trigger SR_DF_LOGIC packet to the session bus. */
- sr_dbg("la8: %s: sending post-trigger SR_DF_LOGIC packet, ",
- "start = %" PRIu64 ", length = %d", __func__,
- (block * BS) + trigger_point, (BS - 1) - trigger_point);
+ sr_spew("la8: sending post-trigger SR_DF_LOGIC packet, "
+ "start = %d, length = %d",
+ (block * BS) + trigger_point, BS - trigger_point);
packet.type = SR_DF_LOGIC;
- packet.length = (BS - 1) - trigger_point;
- packet.unitsize = 1;
- packet.payload = la8->final_buf + (block * BS) + trigger_point;
+ packet.timeoffset = (block * BS + trigger_point) * la8->period_ps;
+ packet.duration = (BS - trigger_point) * la8->period_ps;
+ packet.payload = &logic;
+ logic.length = BS - trigger_point;
+ logic.unitsize = 1;
+ logic.data = la8->final_buf + (block * BS) + trigger_point;
sr_session_bus(la8->session_id, &packet);
}
}
-static int receive_data(int fd, int revents, void *user_data)
+static int receive_data(int fd, int revents, void *session_data)
{
int i, ret;
struct sr_device_instance *sdi;
fd = fd;
revents = revents;
- if (!(sdi = user_data)) {
+ if (!(sdi = session_data)) {
sr_err("la8: %s: user_data was NULL", __func__);
return FALSE;
}
/* Get one block of data. */
if ((ret = la8_read_block(la8)) < 0) {
sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
- hw_stop_acquisition(sdi->index, user_data);
+ hw_stop_acquisition(sdi->index, session_data);
return FALSE;
}
for (i = 0; i < NUM_BLOCKS; i++)
send_block_to_session_bus(la8, i);
- hw_stop_acquisition(sdi->index, user_data);
+ hw_stop_acquisition(sdi->index, session_data);
// return FALSE; /* FIXME? */
return TRUE;
}
-static int hw_start_acquisition(int device_index, gpointer session_device_id)
+static int hw_start_acquisition(int device_index, gpointer session_data)
{
struct sr_device_instance *sdi;
struct la8 *la8;
uint8_t buf[4];
int bytes_written;
- sr_dbg("la8: entering %s", __func__);
+ sr_spew("la8: entering %s", __func__);
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
sr_err("la8: %s: sdi was NULL", __func__);
sr_dbg("la8: acquisition started successfully");
- la8->session_id = session_device_id;
+ la8->session_id = session_data;
/* Send header packet to the session bus. */
sr_dbg("la8: %s: sending SR_DF_HEADER", __func__);
packet.type = SR_DF_HEADER;
- packet.length = sizeof(struct sr_datafeed_header);
- packet.unitsize = 0;
packet.payload = &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
header.samplerate = la8->cur_samplerate;
- header.protocol_id = SR_PROTO_RAW;
header.num_logic_probes = NUM_PROBES;
header.num_analog_probes = 0;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_data, &packet);
/* Time when we should be done (for detecting trigger timeouts). */
la8->done = (la8->divcount + 1) * 0.08388608 + time(NULL)
return SR_OK;
}
-static void hw_stop_acquisition(int device_index, gpointer session_device_id)
+static void hw_stop_acquisition(int device_index, gpointer session_data)
{
struct sr_device_instance *sdi;
struct la8 *la8;
/* Send end packet to the session bus. */
sr_dbg("la8: %s: sending SR_DF_END", __func__);
packet.type = SR_DF_END;
- packet.length = 0;
- packet.unitsize = 0;
- packet.payload = NULL;
- sr_session_bus(session_device_id, &packet);
+ sr_session_bus(session_data, &packet);
}
struct sr_device_plugin chronovu_la8_plugin_info = {
projects / libsigrok.git / blobdiff