const struct sr_datafeed_logic *logic;
const struct sr_datafeed_analog *analog;
struct sr_config *src;
- struct sr_probe *probe;
+ struct sr_channel *ch;
static struct sr_output *o = NULL;
static uint64_t rcvd_samples_logic = 0;
static uint64_t rcvd_samples_analog = 0;
static FILE *outfile = NULL;
GSList *l;
GString *out;
+ GVariant *gvar;
uint64_t end_sample;
- uint64_t output_len, input_len;
- uint8_t *output_buf;
+ uint64_t input_len;
int i;
- char **probes;
+ char **channels;
(void) cb_data;
}
rcvd_samples_logic = rcvd_samples_analog = 0;
+ if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar) == SR_OK) {
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ }
+
#ifdef HAVE_SRD
if (opt_pds) {
- GVariant *gvar;
- if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
- &gvar) == SR_OK) {
- samplerate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
+ if (samplerate) {
if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
g_variant_new_uint64(samplerate)) != SRD_OK) {
g_critical("Failed to configure decode session.");
case SR_DF_TRIGGER:
g_debug("cli: received SR_DF_TRIGGER");
- if (o->format->event)
- o->format->event(o, SR_DF_TRIGGER, &output_buf,
- &output_len);
triggered = 1;
break;
/* Saving to a session file. */
if (rcvd_samples_logic == 0) {
/* First packet with logic data, init session file. */
- probes = g_malloc(sizeof(char *) * g_slist_length(sdi->probes));
- for (i = 0, l = sdi->probes; l; l = l->next) {
- probe = l->data;
- if (probe->enabled && probe->type == SR_PROBE_LOGIC)
- probes[i++] = probe->name;
+ channels = g_malloc(sizeof(char *) * g_slist_length(sdi->channels));
+ for (i = 0, l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->enabled && ch->type == SR_CHANNEL_LOGIC)
+ channels[i++] = ch->name;
}
- probes[i] = NULL;
+ channels[i] = NULL;
sr_session_save_init(opt_output_file, samplerate,
- probes);
- g_free(probes);
+ channels);
+ g_free(channels);
}
save_chunk_logic(logic->data, input_len, logic->unitsize);
} else {
logic->data, input_len) != SRD_OK)
sr_session_stop();
#endif
- } else {
- output_len = 0;
- if (o->format->data && packet->type == o->format->df_type)
- o->format->data(o, logic->data, input_len,
- &output_buf, &output_len);
- if (output_len) {
- fwrite(output_buf, 1, output_len, outfile);
- fflush(outfile);
- g_free(output_buf);
- }
}
}
if (limit_samples && rcvd_samples_analog >= limit_samples)
break;
- if (o->format->data && packet->type == o->format->df_type) {
- o->format->data(o, (const uint8_t *)analog->data,
- analog->num_samples * sizeof(float),
- &output_buf, &output_len);
- if (output_buf) {
- fwrite(output_buf, 1, output_len, outfile);
- fflush(outfile);
- g_free(output_buf);
- }
- }
-
rcvd_samples_analog += analog->num_samples;
break;
case SR_DF_FRAME_BEGIN:
g_debug("cli: received SR_DF_FRAME_BEGIN");
- if (o->format->event) {
- o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
- &output_len);
- if (output_buf) {
- fwrite(output_buf, 1, output_len, outfile);
- fflush(outfile);
- g_free(output_buf);
- }
- }
break;
case SR_DF_FRAME_END:
g_debug("cli: received SR_DF_FRAME_END");
- if (o->format->event) {
- o->format->event(o, SR_DF_FRAME_END, &output_buf,
- &output_len);
- if (output_buf) {
- fwrite(output_buf, 1, output_len, outfile);
- fflush(outfile);
- g_free(output_buf);
- }
- }
break;
default:
if (packet->type == SR_DF_END) {
g_debug("cli: Received SR_DF_END");
- if (o->format->event) {
- o->format->event(o, SR_DF_END, &output_buf, &output_len);
- if (output_buf) {
- if (outfile)
- fwrite(output_buf, 1, output_len, outfile);
- g_free(output_buf);
- output_len = 0;
- }
- }
-
if (o->format->cleanup)
o->format->cleanup(o);
g_free(o);
int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
{
struct sr_config src;
- struct sr_probe_group *pg;
+ struct sr_channel_group *cg;
GHashTableIter iter;
gpointer key, value;
int ret;
while (g_hash_table_iter_next(&iter, &key, &value)) {
if ((ret = opt_to_gvar(key, value, &src)) != 0)
return ret;
- pg = select_probe_group(sdi);
- ret = sr_config_set(sdi, pg, src.key, src.data);
+ cg = select_channel_group(sdi);
+ ret = sr_config_set(sdi, cg, src.key, src.data);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
GVariant *gvar;
struct sr_dev_inst *sdi;
uint64_t min_samples, max_samples;
- int max_probes, i;
+ int max_channels, i;
char **triggerlist;
devices = device_scan();
}
}
- if (select_probes(sdi) != SR_OK) {
- g_critical("Failed to set probes.");
+ if (select_channels(sdi) != SR_OK) {
+ g_critical("Failed to set channels.");
sr_session_destroy();
return;
}
sr_session_destroy();
return;
}
- max_probes = g_slist_length(sdi->probes);
- for (i = 0; i < max_probes; i++) {
+ max_channels = g_slist_length(sdi->channels);
+ for (i = 0; i < max_channels; i++) {
if (triggerlist[i]) {
sr_dev_trigger_set(sdi, i, triggerlist[i]);
g_free(triggerlist[i]);
(buf_len + max) / unitsize);
memcpy(buf, data + max, data_len - max);
buf_len = data_len - max;
- } else if (data_len == 0) {
+ } else if (data_len == 0 && last_unitsize != 0) {
/* End of data, flush the buffer out. */
sr_session_append(opt_output_file, buf, last_unitsize,
buf_len / last_unitsize);
projects / sigrok-cli.git / blobdiff