if (opt_pds) {
if (srd_session_feed(received_samples, (uint8_t*)filter_out,
filter_out_len) != SRD_OK)
- abort();
+ sr_session_halt();
} else {
output_len = 0;
if (o->format->data && packet->type == o->format->df_type)
*/
static int register_pds(struct sr_device *device, const char *pdstring)
{
- GHashTable *pd;
+ GHashTable *pd_opthash;
struct srd_decoder_instance *di;
char **pdtokens, **pdtok, *pd_name;
g_datalist_init(&pd_ann_visible);
pdtokens = g_strsplit(pdstring, ",", -1);
- pd = NULL;
+ pd_opthash = NULL;
pd_name = NULL;
for (pdtok = pdtokens; *pdtok; pdtok++) {
- if (!(pd = parse_generic_arg(*pdtok))) {
+ if (!(pd_opthash = parse_generic_arg(*pdtok))) {
fprintf(stderr, "Invalid protocol decoder option '%s'.\n", *pdtok);
goto err_out;
}
- pd_name = g_strdup(g_hash_table_lookup(pd, "sigrok_key"));
- g_hash_table_remove(pd, "sigrok_key");
- if (!(di = srd_instance_new(pd_name, pd))) {
+ pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key"));
+ g_hash_table_remove(pd_opthash, "sigrok_key");
+ if (!(di = srd_instance_new(pd_name, pd_opthash))) {
fprintf(stderr, "Failed to instantiate PD %s\n", pd_name);
goto err_out;
}
- g_datalist_set_data(&pd_ann_visible, pd_name, pd_name);
- }
+ g_datalist_set_data(&pd_ann_visible, di->instance_id, pd_name);
- /* Any keys left in the options hash are probes, where the key
- * is the probe name as specified in the decoder class, and the
- * value is the probe number i.e. the order in which the PD's
- * incoming samples are arranged. */
- if (srd_instance_set_probes(di, pd) != SRD_OK)
- return 1;
+ /* Any keys left in the options hash are probes, where the key
+ * is the probe name as specified in the decoder class, and the
+ * value is the probe number i.e. the order in which the PD's
+ * incoming samples are arranged. */
+ if (srd_instance_set_probes(di, pd_opthash) != SRD_OK)
+ goto err_out;
+ g_hash_table_destroy(pd_opthash);
+ pd_opthash = NULL;
+ }
err_out:
g_strfreev(pdtokens);
- if (pd)
- g_hash_table_destroy(pd);
+ if (pd_opthash)
+ g_hash_table_destroy(pd_opthash);
if (pd_name)
g_free(pd_name);
int i;
char **annotations;
- annotations = pdata->data;
if (pdata->ann_format != 0) {
- /* CLI only shows the default annotation format */
+ /* CLI only shows the default annotation format. */
return;
}
- if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
- /* not in the list of PDs whose annotations we're showing */
+ if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->di->instance_id)) {
+ /* Not in the list of PDs whose annotations we're showing. */
return;
}
+ annotations = pdata->data;
if (opt_loglevel > SR_LOG_WARN)
printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
printf("%s: ", pdata->pdo->proto_id);
}
if (opt_pd_stack) {
- pds = g_strsplit(opt_pd_stack, ":", 0);
+ pds = g_strsplit(opt_pd_stack, ",", 0);
if (g_strv_length(pds) < 2) {
printf("Specify at least two protocol decoders to stack.\n");
return 1;
}
- if (!(di_from = srd_instance_find(pds[0]))) {
+ if (!(di_from = srd_instance_find_by_id(pds[0]))) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[0]);
return 1;
}
for (i = 1; pds[i]; i++) {
- if (!(di_to = srd_instance_find(pds[i]))) {
+ if (!(di_to = srd_instance_find_by_id(pds[i]))) {
printf("Cannot stack protocol decoder '%s': instance not found.\n", pds[i]);
return 1;
}