static int default_output_format = FALSE;
static char *output_format_param = NULL;
#ifdef HAVE_SRD
+static struct srd_session *srd_sess = NULL;
static GHashTable *pd_ann_visible = NULL;
#endif
static GByteArray *savebuf;
}
if (!driver) {
g_critical("Driver %s not found.", drvname);
+ g_hash_table_destroy(drvargs);
+ g_free(drvname);
return NULL;
}
g_free(drvname);
if (sr_driver_init(sr_ctx, driver) != SR_OK) {
g_critical("Failed to initialize driver.");
+ g_hash_table_destroy(drvargs);
return NULL;
}
drvopts = NULL;
return NULL;
}
}
- g_hash_table_destroy(drvargs);
+ g_hash_table_destroy(drvargs);
devices = sr_driver_scan(driver, drvopts);
g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
} else {
s = g_string_sized_new(128);
g_string_assign(s, sdi->driver->name);
- if (sr_config_get(sdi->driver, SR_CONF_CONN, &gvar, sdi) == SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
g_string_append(s, ":conn=");
g_string_append(s, g_variant_get_string(gvar, NULL));
g_variant_unref(gvar);
return;
}
- if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, &gvar_opts,
- NULL) == SR_OK)) {
+ if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
+ &gvar_opts) == SR_OK)) {
opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
sizeof(int32_t));
printf("Supported driver options:\n");
g_variant_unref(gvar_opts);
}
- if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, &gvar_opts,
- sdi) != SR_OK))
+ if ((sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) != SR_OK))
/* Driver supports no device instance options. */
return;
continue;
if (srci->key == SR_CONF_TRIGGER_TYPE) {
- if (sr_config_list(sdi->driver, srci->key, &gvar,
- sdi) != SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL, srci->key,
+ &gvar) != SR_OK) {
printf("\n");
continue;
}
} else if (srci->key == SR_CONF_PATTERN_MODE) {
/* Pattern generator modes */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, srci->key, &gvar,
- sdi) == SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL, srci->key,
+ &gvar) == SR_OK) {
printf(" - supported patterns:\n");
stropts = g_variant_get_strv(gvar, &num_elements);
for (i = 0; i < num_elements; i++)
} else if (srci->key == SR_CONF_SAMPLERATE) {
/* Supported samplerates */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
- &gvar_dict, sdi) != SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar_dict) != SR_OK) {
printf("\n");
continue;
}
} else if (srci->key == SR_CONF_BUFFERSIZE) {
/* Supported buffer sizes */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
- &gvar_list, sdi) != SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
printf("\n");
continue;
}
} else if (srci->key == SR_CONF_TIMEBASE) {
/* Supported time bases */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
- &gvar_list, sdi) != SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
printf("\n");
continue;
}
} else if (srci->key == SR_CONF_VDIV) {
/* Supported volts/div values */
printf(" %s", srci->id);
- if (sr_config_list(sdi->driver, SR_CONF_VDIV,
- &gvar_list, sdi) != SR_OK) {
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_VDIV, &gvar_list) != SR_OK) {
printf("\n");
continue;
}
GSList *l;
GString *out;
int sample_size, ret;
- uint64_t samplerate, output_len, filter_out_len;
+ uint64_t samplerate, output_len, filter_out_len, end_sample;
uint8_t *output_buf, *filter_out;
(void) cb_data;
#ifdef HAVE_SRD
GVariant *gvar;
if (opt_pds && logic_probelist->len) {
- if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
- &gvar, sdi) != SR_OK) {
- g_critical("Unable to initialize protocol "
- "decoders: no samplerate found.");
+ if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar, sdi) == SR_OK) {
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+ g_variant_new_uint64(samplerate)) != SRD_OK) {
+ g_critical("Failed to configure decode session.");
+ break;
+ }
+ }
+ if (srd_session_start(srd_sess) != SRD_OK) {
+ g_critical("Failed to start decode session.");
break;
}
- samplerate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- srd_session_start(logic_probelist->len, unitsize, samplerate);
}
#endif
break;
case SR_CONF_SAMPLERATE:
samplerate = g_variant_get_uint64(src->data);
g_debug("cli: got samplerate %"PRIu64" Hz", samplerate);
+#ifdef HAVE_SRD
+ if (opt_pds) {
+ if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
+ g_variant_new_uint64(samplerate)) != SRD_OK) {
+ g_critical("Failed to pass samplerate to decoder.");
+ }
+ }
+#endif
break;
case SR_CONF_SAMPLE_INTERVAL:
samplerate = g_variant_get_uint64(src->data);
if (ret != SR_OK)
break;
- /* What comes out of the filter is guaranteed to be packed into the
+ /*
+ * What comes out of the filter is guaranteed to be packed into the
* minimum size needed to support the number of samples at this sample
- * size. however, the driver may have submitted too much -- cut off
+ * size. however, the driver may have submitted too much. Cut off
* the buffer of the last packet according to the sample limit.
*/
if (limit_samples && (received_samples + logic->length / sample_size >
} else {
if (opt_pds) {
#ifdef HAVE_SRD
- if (srd_session_send(received_samples, (uint8_t*)filter_out,
- filter_out_len) != SRD_OK)
+ end_sample = received_samples + filter_out_len / unitsize;
+ if (srd_session_send(srd_sess, received_samples, end_sample,
+ (uint8_t*)filter_out, filter_out_len) != SRD_OK)
sr_session_stop();
#endif
} else {
if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
gvar = g_variant_new_string(val_str);
} else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
- val_int = strtoll(val_str, &conv, 10);
+ val_int = strtoll(val_str, &conv, 0);
if (!conv || conv == val_str) {
g_critical("Protocol decoder '%s' option '%s' "
"requires a number.", dec->name, o->id);
(GDestroyNotify)g_variant_unref);
all_probes = g_slist_copy(dec->probes);
- all_probes = g_slist_concat(all_probes, dec->opt_probes);
+ all_probes = g_slist_concat(all_probes, g_slist_copy(dec->opt_probes));
for (l = all_probes; l; l = l->next) {
p = l->data;
if (!(val_str = g_hash_table_lookup(hash, p->id)))
break;
}
- if (!(di = srd_inst_new(pd_name, options))) {
+ if (!(di = srd_inst_new(srd_sess, pd_name, options))) {
g_critical("Failed to instantiate protocol decoder %s.", pd_name);
ret = 1;
break;
/* First PD goes at the bottom of the stack. */
ids = g_strsplit(pds[0], ":", 0);
- if (!(di_from = srd_inst_find_by_id(ids[0]))) {
+ if (!(di_from = srd_inst_find_by_id(srd_sess, ids[0]))) {
g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[0]);
/* Every subsequent PD goes on top. */
for (i = 1; pds[i]; i++) {
ids = g_strsplit(pds[i], ":", 0);
- if (!(di_to = srd_inst_find_by_id(ids[0]))) {
+ if (!(di_to = srd_inst_find_by_id(srd_sess, ids[0]))) {
g_strfreev(ids);
g_critical("Cannot stack protocol decoder '%s': "
"instance not found.", pds[i]);
return 1;
}
g_strfreev(ids);
- if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK)
+ if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK)
return 1;
/* Don't show annotation from this PD. Only the last PD in
ret = SR_ERR;
}
if (val)
- ret = sr_config_set(sdi, srci->key, val);
+ ret = sr_config_set(sdi, NULL, srci->key, val);
if (ret != SR_OK) {
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
gvar = g_variant_new_uint64(time_msec);
- if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
+ if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
g_critical("Failed to configure time limit.");
return SR_ERR;
}
} else if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
/* Convert to samples based on the samplerate. */
- sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, &gvar, sdi);
+ sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
limit_samples = (samplerate) * time_msec / (uint64_t)1000;
return SR_ERR;
}
gvar = g_variant_new_uint64(limit_samples);
- if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+ if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
g_critical("Failed to configure time-based sample limit.");
return SR_ERR;
}
return;
}
gvar = g_variant_new_uint64(limit_samples);
- if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+ if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
g_critical("Failed to configure sample limit.");
sr_session_destroy();
return;
return;
}
gvar = g_variant_new_uint64(limit_frames);
- if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
+ if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
g_critical("Failed to configure frame limit.");
sr_session_destroy();
return;
fprintf(stderr, "%s\n", message);
fflush(stderr);
}
+
+ if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL))
+ exit(1);
+
}
int main(int argc, char **argv)
if (opt_pds) {
if (srd_init(NULL) != SRD_OK)
goto done;
+ if (srd_session_new(&srd_sess) != SRD_OK) {
+ g_critical("Failed to create new decode session.");
+ goto done;
+ }
if (register_pds(NULL, opt_pds) != 0)
goto done;
- if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+ if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN,
show_pd_annotations, NULL) != SRD_OK)
goto done;
if (setup_pd_stack() != 0)
projects / sigrok-cli.git / blobdiff