/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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)
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
return;
}
- if (!g_datalist_get_data(&pd_ann_visible, pdata->pdo->proto_id)) {
+ 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;
}
}
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;