#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+static struct sr_context *sr_ctx = NULL;
+
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
static struct sr_output_format *output_format = NULL;
return NULL;
}
g_free(drvname);
- if (sr_driver_init(driver) != SR_OK) {
+ if (sr_driver_init(sr_ctx, driver) != SR_OK) {
g_critical("Failed to initialize driver.");
return NULL;
}
drivers = sr_driver_list();
for (i = 0; drivers[i]; i++) {
driver = drivers[i];
- if (sr_driver_init(driver) != SR_OK) {
+ if (sr_driver_init(sr_ctx, driver) != SR_OK) {
g_critical("Failed to initialize driver.");
return NULL;
}
if (sdi->probes) {
if (g_slist_length(sdi->probes) == 1) {
probe = sdi->probes->data;
- printf("with 1 probe: %s\n", probe->name);
+ printf("with 1 probe: %s", probe->name);
} else {
- printf("with %d probes:\n", g_slist_length(sdi->probes));
+ printf("with %d probes:", g_slist_length(sdi->probes));
for (l = sdi->probes; l; l = l->next) {
probe = l->data;
- printf(" %s\n", probe->name);
+ printf(" %s", probe->name);
}
}
- } else
- printf("\n");
+ }
+ printf("\n");
}
static void show_dev_list(void)
}
static void datafeed_in(const struct sr_dev_inst *sdi,
- struct sr_datafeed_packet *packet)
+ const struct sr_datafeed_packet *packet)
{
static struct sr_output *o = NULL;
static int logic_probelist[SR_MAX_NUM_PROBES] = { -1 };
static FILE *outfile = NULL;
static int num_analog_probes = 0;
struct sr_probe *probe;
- struct sr_datafeed_logic *logic;
- struct sr_datafeed_meta_logic *meta_logic;
- struct sr_datafeed_analog *analog;
- struct sr_datafeed_meta_analog *meta_analog;
+ const struct sr_datafeed_logic *logic;
+ const struct sr_datafeed_meta_logic *meta_logic;
+ const struct sr_datafeed_analog *analog;
+ const struct sr_datafeed_meta_analog *meta_analog;
static int num_enabled_analog_probes = 0;
int num_enabled_probes, sample_size, ret, i;
uint64_t output_len, filter_out_len;
int ret;
char **pdtokens, **pdtok, *pd_name;
- /* Avoid compiler warnings. */
(void)dev;
ret = 0;
static int select_probes(struct sr_dev_inst *sdi)
{
- char **probelist;
- int max_probes, i;
+ struct sr_probe *probe;
+ GSList *selected_probes, *l;
if (!opt_probes)
return SR_OK;
- /*
- * This only works because a device by default initializes
- * and enables all its probes.
- */
- max_probes = g_slist_length(sdi->probes);
- probelist = parse_probestring(max_probes, opt_probes);
- if (!probelist) {
+ if (!(selected_probes = parse_probestring(sdi, opt_probes)))
return SR_ERR;
- }
- for (i = 0; i < max_probes; i++) {
- if (probelist[i]) {
- sr_dev_probe_name_set(sdi, i, probelist[i]);
- g_free(probelist[i]);
- } else {
- sr_dev_probe_enable(sdi, i, FALSE);
- }
+ for (l = sdi->probes; l; l = l->next) {
+ probe = l->data;
+ if (g_slist_find(selected_probes, probe))
+ probe->enabled = TRUE;
+ else
+ probe->enabled = FALSE;
}
- g_free(probelist);
+ g_slist_free(selected_probes);
return SR_OK;
}
g_critical("Failed to set device option '%s'.", (char *)key);
return ret;
}
- else
- break;
}
return SR_OK;
static void logger(const gchar *log_domain, GLogLevelFlags log_level,
const gchar *message, gpointer cb_data)
{
- /* Avoid compiler warnings. */
(void)log_domain;
(void)cb_data;
int main(int argc, char **argv)
{
+ int ret = 1;
GOptionContext *context;
GError *error;
if (!g_option_context_parse(context, &argc, &argv, &error)) {
g_critical("%s", error->message);
- return 1;
+ goto done;
}
/* Set the loglevel (amount of messages to output) for libsigrok. */
if (sr_log_loglevel_set(opt_loglevel) != SR_OK)
- return 1;
+ goto done;
/* Set the loglevel (amount of messages to output) for libsigrokdecode. */
if (srd_log_loglevel_set(opt_loglevel) != SRD_OK)
- return 1;
+ goto done;
- if (sr_init() != SR_OK)
- return 1;
+ if (sr_init(&sr_ctx) != SR_OK)
+ goto done;
if (opt_pds) {
if (srd_init(NULL) != SRD_OK)
- return 1;
+ goto done;
if (register_pds(NULL, opt_pds) != 0)
- return 1;
+ goto done;
if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
show_pd_annotations, NULL) != SRD_OK)
- return 1;
+ goto done;
if (setup_pd_stack() != 0)
- return 1;
+ goto done;
if (setup_pd_annotations() != 0)
- return 1;
+ goto done;
}
if (setup_output_format() != 0)
- return 1;
+ goto done;
if (opt_version)
show_version();
if (opt_pds)
srd_exit();
+ ret = 0;
+
+done:
+ if (sr_ctx)
+ sr_exit(sr_ctx);
+
g_option_context_free(context);
- sr_exit();
- return 0;
+ return ret;
}