X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=ad5f37925f7d0e156e9158e0865f813c2de6d70d;hp=c2a7c2602f189e814588f0b85d761107d591cfc3;hb=d75c85291a61a6d83386de95cff6ad279e853ebd;hpb=87e24fedeb35cb7d5b1c593150ac1a92cf10cf4d

diff --git a/parsers.c b/parsers.c
index c2a7c26..ad5f379 100644
--- a/parsers.c
+++ b/parsers.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <glib.h>
 
+extern struct sr_context *sr_ctx;
+
 struct sr_channel *find_channel(GSList *channellist, const char *channelname)
 {
 	struct sr_channel *ch;
@@ -294,6 +296,7 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
 	GVariant *gvar;
 	int i;
 	char *s;
+	gboolean b;
 
 	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 			(GDestroyNotify)g_variant_unref);
@@ -308,6 +311,10 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
 			gvar = g_variant_new_int32(strtoul(s, NULL, 10));
 			g_hash_table_insert(hash, g_strdup(opts[i]->id),
 					g_variant_ref_sink(gvar));
+		} else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT64)) {
+			gvar = g_variant_new_uint64(strtoul(s, NULL, 10));
+			g_hash_table_insert(hash, g_strdup(opts[i]->id),
+					g_variant_ref_sink(gvar));
 		} else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_DOUBLE)) {
 			gvar = g_variant_new_double(strtod(s, NULL));
 			g_hash_table_insert(hash, g_strdup(opts[i]->id),
@@ -316,6 +323,17 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg
 			gvar = g_variant_new_string(s);
 			g_hash_table_insert(hash, g_strdup(opts[i]->id),
 					g_variant_ref_sink(gvar));
+		} else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_BOOLEAN)) {
+			b = TRUE;
+			if (0 == strcmp(s, "false") || 0 == strcmp(s, "no")) {
+				b = FALSE;
+			} else if (!(0 == strcmp(s, "true") || 0 == strcmp(s, "yes"))) {
+				g_critical("Unable to convert '%s' to boolean!", s);
+			}
+
+			gvar = g_variant_new_boolean(b);
+			g_hash_table_insert(hash, g_strdup(opts[i]->id),
+					g_variant_ref_sink(gvar));
 		} else {
 			g_critical("Don't know GVariant type for option '%s'!", opts[i]->id);
 		 }
@@ -354,3 +372,73 @@ int canon_cmp(const char *str1, const char *str2)
 
 	return ret;
 }
+
+/* Convert driver options hash to GSList of struct sr_config. */
+static GSList *hash_to_hwopt(GHashTable *hash)
+{
+	struct sr_config *src;
+	GList *gl, *keys;
+	GSList *opts;
+	char *key;
+
+	keys = g_hash_table_get_keys(hash);
+	opts = NULL;
+	for (gl = keys; gl; gl = gl->next) {
+		key = gl->data;
+		src = g_malloc(sizeof(struct sr_config));
+		if (opt_to_gvar(key, g_hash_table_lookup(hash, key), src) != 0)
+			return NULL;
+		opts = g_slist_append(opts, src);
+	}
+	g_list_free(keys);
+
+	return opts;
+}
+
+int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
+{
+	struct sr_dev_driver **drivers;
+	GHashTable *drvargs;
+	int i;
+	char *drvname;
+
+	drvargs = parse_generic_arg(arg, TRUE);
+
+	drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
+	g_hash_table_remove(drvargs, "sigrok_key");
+	*driver = NULL;
+	drivers = sr_driver_list();
+	for (i = 0; drivers[i]; i++) {
+		if (strcmp(drivers[i]->name, drvname))
+			continue;
+		*driver = drivers[i];
+	}
+	if (!*driver) {
+		g_critical("Driver %s not found.", drvname);
+		g_hash_table_destroy(drvargs);
+		g_free(drvname);
+		return FALSE;
+	}
+	g_free(drvname);
+	if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+		g_critical("Failed to initialize driver.");
+		g_hash_table_destroy(drvargs);
+		return FALSE;
+	}
+
+	if (drvopts) {
+		*drvopts = NULL;
+		if (g_hash_table_size(drvargs) > 0) {
+			if (!(*drvopts = hash_to_hwopt(drvargs))) {
+				/* Unknown options, already logged. */
+				g_hash_table_destroy(drvargs);
+				return FALSE;
+			}
+		}
+	}
+
+	g_hash_table_destroy(drvargs);
+
+	return TRUE;
+}
+