X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=131d46f1aa7e9508aacc744d2e89fbbcefdbcede;hp=ab7e67488fdb519c431faa63dddf81351d338d6b;hb=ac3dcd3e26b7657e3ae16a95c03d6d2a43a28e54;hpb=b61a8850b1396aecb59da1ff51f1c874b1cce01f

diff --git a/session.c b/session.c
index ab7e674..131d46f 100644
--- a/session.c
+++ b/session.c
@@ -71,38 +71,10 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
-{
-	GHashTable *hash;
-	GVariant *gvar;
-	const struct sr_option *opt;
-	char *s;
-
-	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-			(GDestroyNotify)g_variant_unref);
-	for (opt = opts[0]; opt; opt++) {
-		if (!(s = g_hash_table_lookup(genargs, opt->id)))
-			continue;
-		if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
-			gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
-			g_hash_table_insert(hash, g_strdup(opt->id),
-					g_variant_ref_sink(gvar));
-		} else if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_DOUBLE)) {
-			gvar = g_variant_new_double(strtod(s, NULL));
-			g_hash_table_insert(hash, g_strdup(opt->id),
-					g_variant_ref_sink(gvar));
-		} else {
-			g_critical("Don't know GVariant type for option '%s'!", opt->id);
-		 }
-	}
-
-	return hash;
-}
-
 const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
 	const struct sr_output_module *omod;
-	const struct sr_option **opts;
+	const struct sr_option **options;
 	const struct sr_output *o;
 	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
@@ -127,11 +99,11 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	if (!fmtspec)
 		g_critical("Invalid output format.");
 	if (!(omod = sr_output_find(fmtspec)))
-		g_critical("Unknown output format '%s'.", fmtspec);
+		g_critical("Unknown output module '%s'.", fmtspec);
 	g_hash_table_remove(fmtargs, "sigrok_key");
-	if ((opts = sr_output_options_get(omod))) {
-		fmtopts = generic_arg_to_opt(opts, fmtargs);
-		sr_output_options_free(opts);
+	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);
@@ -486,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);