X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=device.c;h=cfd456609f30bf63ec333d9d178cb4eb580e5958;hp=28184ce1e5451e732b410fa1ffc9eaefd1a0c456;hb=8e301dd26c1ff7703918e0ece7f3530f4ae76f24;hpb=20fb52e08416238c60392b410f69856cc7d98650

diff --git a/device.c b/device.c
index 28184ce..cfd4566 100644
--- a/device.c
+++ b/device.c
@@ -20,6 +20,7 @@
 #include "sigrok-cli.h"
 #include "config.h"
 #include <glib.h>
+#include <string.h>
 
 extern struct sr_context *sr_ctx;
 extern gchar *opt_drv;
@@ -28,24 +29,18 @@ extern gchar *opt_probe_group;
 /* Convert driver options hash to GSList of struct sr_config. */
 static GSList *hash_to_hwopt(GHashTable *hash)
 {
-	const struct sr_config_info *srci;
 	struct sr_config *src;
 	GList *gl, *keys;
 	GSList *opts;
-	char *key, *value;
+	char *key;
 
 	keys = g_hash_table_get_keys(hash);
 	opts = NULL;
 	for (gl = keys; gl; gl = gl->next) {
 		key = gl->data;
-		if (!(srci = sr_config_info_name_get(key))) {
-			g_critical("Unknown option %s", key);
+		src = g_malloc(sizeof(struct sr_config));
+		if (opt_to_gvar(key, g_hash_table_lookup(hash, key), src) != 0)
 			return NULL;
-		}
-		src = g_try_malloc(sizeof(struct sr_config));
-		src->key = srci->key;
-		value = g_hash_table_lookup(hash, key);
-		src->data = g_variant_new_string(value);
 		opts = g_slist_append(opts, src);
 	}
 	g_list_free(keys);