return SR_OK;
}
-SR_PRIV int ols_configure_probes(const struct sr_dev_inst *sdi)
+/* Configures the channel mask based on which channels are enabled. */
+SR_PRIV void ols_channel_mask(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- const struct sr_probe *probe;
+ struct sr_channel *channel;
const GSList *l;
- int probe_bit, stage, i;
- char *tc;
devc = sdi->priv;
- devc->probe_mask = 0;
+ devc->channel_mask = 0;
+ for (l = sdi->channels; l; l = l->next) {
+ channel = l->data;
+ if (channel->enabled)
+ devc->channel_mask |= 1 << channel->index;
+ }
+}
+
+SR_PRIV int ols_convert_trigger(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ struct sr_trigger *trigger;
+ struct sr_trigger_stage *stage;
+ struct sr_trigger_match *match;
+ const GSList *l, *m;
+ int i;
+
+ devc = sdi->priv;
+
+ devc->num_stages = 0;
for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
devc->trigger_mask[i] = 0;
devc->trigger_value[i] = 0;
}
- devc->num_stages = 0;
- for (l = sdi->probes; l; l = l->next) {
- probe = (const struct sr_probe *)l->data;
- if (!probe->enabled)
- continue;
-
- if (probe->index >= devc->max_probes) {
- sr_err("Channels over the limit of %d\n", devc->max_probes);
- return SR_ERR;
- }
+ if (!(trigger = sr_session_trigger_get(sdi->session)))
+ return SR_OK;
- /*
- * Set up the probe mask for later configuration into the
- * flag register.
- */
- probe_bit = 1 << (probe->index);
- devc->probe_mask |= probe_bit;
-
- if (!probe->trigger)
- continue;
-
- /* Configure trigger mask and value. */
- stage = 0;
- for (tc = probe->trigger; tc && *tc; tc++) {
- devc->trigger_mask[stage] |= probe_bit;
- if (*tc == '1')
- devc->trigger_value[stage] |= probe_bit;
- stage++;
- /* Only supporting parallel mode, with up to 4 stages. */
- if (stage > 4)
- return SR_ERR;
+ devc->num_stages = g_slist_length(trigger->stages);
+ if (devc->num_stages > NUM_TRIGGER_STAGES) {
+ sr_err("This device only supports %d trigger stages.",
+ NUM_TRIGGER_STAGES);
+ return SR_ERR;
+ }
+
+ for (l = trigger->stages; l; l = l->next) {
+ stage = l->data;
+ for (m = stage->matches; m; m = m->next) {
+ match = m->data;
+ if (!match->channel->enabled)
+ /* Ignore disabled channels with a trigger. */
+ continue;
+ devc->trigger_mask[stage->stage] |= 1 << match->channel->index;
+ if (match->match == SR_TRIGGER_ONE)
+ devc->trigger_value[stage->stage] |= 1 << match->channel->index;
}
- if (stage > devc->num_stages)
- devc->num_stages = stage - 1;
}
return SR_OK;
/* Acquisition settings */
devc->limit_samples = devc->capture_ratio = 0;
devc->trigger_at = -1;
- devc->probe_mask = 0xffffffff;
+ devc->channel_mask = 0xffffffff;
devc->flag_reg = 0;
return devc;
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *ch;
uint32_t tmp_int, ui;
uint8_t key, type, token;
GString *tmp_str, *devname, *version;
key = 0xff;
while (key) {
- if (serial_read_blocking(serial, &key, 1) != 1 || key == 0x00)
+ if (serial_read_blocking(serial, &key, 1) != 1)
break;
+ if (key == 0x00) {
+ sr_dbg("Got metadata key 0x00, metadata ends.");
+ break;
+ }
type = key >> 5;
token = key & 0x1f;
switch (type) {
key, tmp_int);
switch (token) {
case 0x00:
- /* Number of usable probes */
+ /* Number of usable channels */
for (ui = 0; ui < tmp_int; ui++) {
- if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE,
- ols_probe_names[ui])))
+ if (!(ch = sr_channel_new(ui, SR_CHANNEL_LOGIC, TRUE,
+ ols_channel_names[ui])))
return 0;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
}
break;
case 0x01:
key, tmp_c);
switch (token) {
case 0x00:
- /* Number of usable probes */
+ /* Number of usable channels */
for (ui = 0; ui < tmp_c; ui++) {
- if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE,
- ols_probe_names[ui])))
+ if (!(ch = sr_channel_new(ui, SR_CHANNEL_LOGIC, TRUE,
+ ols_channel_names[ui])))
return 0;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
}
break;
case 0x01:
sr_info("Enabling demux mode.");
devc->flag_reg |= FLAG_DEMUX;
devc->flag_reg &= ~FLAG_FILTER;
- devc->max_probes = NUM_PROBES / 2;
+ devc->max_channels = NUM_CHANNELS / 2;
devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
} else {
sr_info("Disabling demux mode.");
devc->flag_reg &= ~FLAG_DEMUX;
devc->flag_reg |= FLAG_FILTER;
- devc->max_probes = NUM_PROBES;
+ devc->max_channels = NUM_CHANNELS;
devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
}
struct sr_serial_dev_inst *serial;
serial = sdi->conn;
- serial_source_remove(serial);
+ serial_source_remove(sdi->session, serial);
/* Terminate session */
packet.type = SR_DF_END;
SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
{
- struct drv_context *drvc;
struct dev_context *devc;
+ struct sr_dev_inst *sdi;
struct sr_serial_dev_inst *serial;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
- struct sr_dev_inst *sdi;
- GSList *l;
uint32_t sample;
- int num_channels, offset, j;
+ int num_ols_changrp, offset, j;
unsigned int i;
unsigned char byte;
- int serial_fd;
-
- drvc = di->priv;
-
- /* Find this device's devc struct by its fd. */
- devc = NULL;
- for (l = drvc->instances; l; l = l->next) {
- sdi = l->data;
- devc = sdi->priv;
- serial = sdi->conn;
- sp_get_port_handle(serial->data, &serial_fd);
- if (serial_fd == fd)
- break;
- devc = NULL;
- }
- if (!devc)
- /* Shouldn't happen. */
- return TRUE;
+
+ (void)fd;
+
+ sdi = cb_data;
+ serial = sdi->conn;
+ devc = sdi->priv;
if (devc->num_transfers++ == 0) {
/*
* longer than it takes to send a byte, that means it's
* finished. We'll double that to 30ms to be sure...
*/
- serial_source_remove(serial);
- serial_source_add(serial, G_IO_IN, 30, ols_receive_data, cb_data);
+ serial_source_remove(sdi->session, serial);
+ serial_source_add(sdi->session, serial, G_IO_IN, 30,
+ ols_receive_data, cb_data);
devc->raw_sample_buf = g_try_malloc(devc->limit_samples * 4);
if (!devc->raw_sample_buf) {
sr_err("Sample buffer malloc failed.");
memset(devc->raw_sample_buf, 0x82, devc->limit_samples * 4);
}
- num_channels = 0;
-
- for (i = NUM_PROBES; i > 0x02; i /= 2) {
+ num_ols_changrp = 0;
+ for (i = NUM_CHANNELS; i > 0x02; i /= 2) {
if ((devc->flag_reg & i) == 0) {
- num_channels++;
+ num_ols_changrp++;
}
}
if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) {
if (serial_read_nonblocking(serial, &byte, 1) != 1)
return FALSE;
+ devc->cnt_bytes++;
/* Ignore it if we've read enough. */
if (devc->num_samples >= devc->limit_samples)
devc->sample[devc->num_bytes++] = byte;
sr_spew("Received byte 0x%.2x.", byte);
- if (devc->num_bytes == num_channels) {
- /* Got a full sample. Convert from the OLS's little-endian
- * sample to the local format. */
+ if (devc->num_bytes == num_ols_changrp) {
+ devc->cnt_samples++;
+ devc->cnt_samples_rle++;
+ /*
+ * Got a full sample. Convert from the OLS's little-endian
+ * sample to the local format.
+ */
sample = devc->sample[0] | (devc->sample[1] << 8) \
| (devc->sample[2] << 16) | (devc->sample[3] << 24);
- sr_spew("Received sample 0x%.*x.", devc->num_bytes * 2, sample);
+ sr_dbg("Received sample 0x%.*x.", devc->num_bytes * 2, sample);
if (devc->flag_reg & FLAG_RLE) {
/*
* In RLE mode the high bit of the sample is the
/* Clear the high bit. */
sample &= ~(0x80 << (devc->num_bytes - 1) * 8);
devc->rle_count = sample;
+ devc->cnt_samples_rle += devc->rle_count;
sr_dbg("RLE count: %u.", devc->rle_count);
devc->num_bytes = 0;
return TRUE;
devc->num_samples = devc->limit_samples;
}
- if (num_channels < 4) {
+ if (num_ols_changrp < 4) {
/*
* Some channel groups may have been turned
* off, to speed up transfer between the
* submitting it over the session bus --
* whatever is listening on the bus will be
* expecting a full 32-bit sample, based on
- * the number of probes.
+ * the number of channels.
*/
j = 0;
memset(devc->tmp_sample, 0, 4);
}
}
memcpy(devc->sample, devc->tmp_sample, 4);
- sr_dbg("Full sample: 0x%.8x.", sample);
+ sr_spew("Expanded sample: 0x%.8x.", sample);
}
- /* the OLS sends its sample buffer backwards.
+ /*
+ * the OLS sends its sample buffer backwards.
* store it in reverse order here, so we can dump
* this on the session bus later.
*/
* we've acquired all the samples we asked for -- we're done.
* Send the (properly-ordered) buffer to the frontend.
*/
+ sr_dbg("Received %d bytes, %d samples, %d decompressed samples.",
+ devc->cnt_bytes, devc->cnt_samples,
+ devc->cnt_samples_rle);
if (devc->trigger_at != -1) {
- /* a trigger was set up, so we need to tell the frontend
+ /*
+ * A trigger was set up, so we need to tell the frontend
* about it.
*/
if (devc->trigger_at > 0) {
- /* there are pre-trigger samples, send those first */
+ /* There are pre-trigger samples, send those first. */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = devc->trigger_at * 4;
sr_session_send(cb_data, &packet);
}
- /* send the trigger */
+ /* Send the trigger. */
packet.type = SR_DF_TRIGGER;
sr_session_send(cb_data, &packet);
- /* send post-trigger samples */
+ /* Send post-trigger samples. */
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = (devc->num_samples * 4) - (devc->trigger_at * 4);
projects / libsigrok.git / blobdiff