X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=65cc2918d37adf0a95e0a49f0226479636e69806;hp=e5c7d5d24193e4fc2d34a84d485fbaf4a107651e;hb=4c6a77987e2bbda7c4e9c6f3568ccb7b65226d6c;hpb=b4eece7c5f666690fdbe1923cd3bdc7cf9425d98

diff --git a/session.c b/session.c
index e5c7d5d..65cc291 100644
--- a/session.c
+++ b/session.c
@@ -71,28 +71,12 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-struct sr_output_format *find_output_module(char *name)
+const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
-	struct sr_output_format **outputs, *omod;
-	int i;
-
-	omod = NULL;
-	outputs = sr_output_list();
-	for (i = 0; outputs[i]; i++) {
-		if (!strcmp(outputs[i]->id, name)) {
-			omod = outputs[i];
-			break;
-		}
-	}
-
-	return omod;
-}
-
-struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
-{
-	struct sr_output_format *omod;
-	GHashTable *fmtargs;
-	struct sr_output *o;
+	const struct sr_output_module *omod;
+	const struct sr_option **options;
+	const struct sr_output *o;
+	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
 
 	if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
@@ -114,10 +98,17 @@ struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
 	if (!fmtspec)
 		g_critical("Invalid output format.");
-	if (!(omod = find_output_module(fmtspec)))
-		g_critical("Unknown output format '%s'.", fmtspec);
+	if (!(omod = sr_output_find(fmtspec)))
+		g_critical("Unknown output module '%s'.", fmtspec);
 	g_hash_table_remove(fmtargs, "sigrok_key");
-	o = sr_output_new(omod, fmtargs, sdi);
+	if ((options = sr_output_options_get(omod))) {
+		fmtopts = generic_arg_to_opt(options, fmtargs);
+		sr_output_options_free(options);
+	} else
+		fmtopts = NULL;
+	o = sr_output_new(omod, fmtopts, sdi);
+	if (fmtopts)
+		g_hash_table_destroy(fmtopts);
 	g_hash_table_destroy(fmtargs);
 
 	return o;
@@ -132,8 +123,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	struct sr_session *session;
 	struct sr_config *src;
 	struct sr_channel *ch;
-	static struct sr_output *o = NULL;
-	static struct sr_output *oa = NULL;
+	static const struct sr_output *o = NULL;
+	static const struct sr_output *oa = NULL;
 	static uint64_t rcvd_samples_logic = 0;
 	static uint64_t rcvd_samples_analog = 0;
 	static uint64_t samplerate = 0;
@@ -155,10 +146,11 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	switch (packet->type) {
 	case SR_DF_HEADER:
 		g_debug("cli: Received SR_DF_HEADER.");
-		o = setup_output_format(sdi);
+		if (!(o = setup_output_format(sdi)))
+			g_critical("Failed to initialize output module.");
 
 		/* Set up backup analog output module. */
-		oa = sr_output_new(find_output_module("analog"), NULL, sdi);
+		oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
 
 		/* Prepare non-stdout output. */
 		outfile = stdout;
@@ -257,7 +249,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 				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)
+					if (ch->type == SR_CHANNEL_LOGIC)
 						channels[i++] = ch->name;
 				}
 				channels[i] = NULL;
@@ -466,26 +458,61 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 
 void run_session(void)
 {
-	GSList *devices;
+	GSList *devices, *real_devices, *sd;
 	GHashTable *devargs;
 	GVariant *gvar;
 	struct sr_session *session;
 	struct sr_trigger *trigger;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
+	gsize n_elements, i;
+	const uint32_t *dev_opts;
+	int is_demo_dev;
 
 	devices = device_scan();
 	if (!devices) {
 		g_critical("No devices found.");
 		return;
 	}
+
+	real_devices = NULL;
+	for (sd = devices; sd; sd = sd->next) {
+		sdi = sd->data;
+
+		if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
+			g_critical("Failed to query sr_config_list(SR_CONF_DEVICE_OPTIONS).");
+			return;
+		}
+
+		dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
+
+		is_demo_dev = 0;
+		for (i = 0; i < n_elements; i++) {
+			if (dev_opts[i] == SR_CONF_DEMO_DEV)
+				is_demo_dev = 1;
+		}
+
+		g_variant_unref(gvar);
+
+		if (!is_demo_dev)
+			real_devices = g_slist_append(real_devices, sdi);
+	}
+
 	if (g_slist_length(devices) > 1) {
-		g_critical("sigrok-cli only supports one device for capturing.");
-		g_slist_free(devices);
-		return;
+		if (g_slist_length(real_devices) != 1) {
+			g_critical("sigrok-cli only supports one device for capturing.");
+			return;
+		} else {
+			/* We only have one non-demo device. */
+			g_slist_free(devices);
+			devices = real_devices;
+			real_devices = NULL;
+		}
 	}
+
 	sdi = devices->data;
 	g_slist_free(devices);
+	g_slist_free(real_devices);
 
 	sr_session_new(&session);
 	sr_session_datafeed_callback_add(session, datafeed_in, NULL);