X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=c2a7c2602f189e814588f0b85d761107d591cfc3;hp=63a5acd424715b0d313827e9b6d622b7dd7429e2;hb=47f97410b41a4d83d49f3b6c82209e51c5a762a8;hpb=6b27bde46ccb02784a327b51b3e7beeb2f9c681a

diff --git a/parsers.c b/parsers.c
index 63a5acd..c2a7c26 100644
--- a/parsers.c
+++ b/parsers.c
@@ -177,10 +177,10 @@ int parse_trigger_match(char c)
 	return match;
 }
 
-int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
+int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
+		struct sr_trigger **trigger)
 {
 	struct sr_channel *ch;
-	struct sr_trigger *trigger;
 	struct sr_trigger_stage *stage;
 	GVariant *gvar;
 	GSList *l;
@@ -199,7 +199,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
 	}
 	matches = g_variant_get_fixed_array(gvar, &num_matches, sizeof(int32_t));
 
-	trigger = sr_trigger_new(NULL);
+	*trigger = sr_trigger_new(NULL);
 	error = FALSE;
 	tokens = g_strsplit(s, ",", -1);
 	for (i = 0; tokens[i]; i++) {
@@ -241,8 +241,8 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
 			}
 			/* Make sure this ends up in the right stage, creating
 			 * them as needed. */
-			while (!(stage = g_slist_nth_data(trigger->stages, t)))
-				sr_trigger_stage_new(trigger);
+			while (!(stage = g_slist_nth_data((*trigger)->stages, t)))
+				sr_trigger_stage_add(*trigger);
 			if (sr_trigger_match_add(stage, ch, match, 0) != SR_OK) {
 				error = TRUE;
 				break;
@@ -253,9 +253,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
 	g_variant_unref(gvar);
 
 	if (error)
-		sr_trigger_free(trigger);
-	else
-		error = sr_session_trigger_set(trigger) != SR_OK;
+		sr_trigger_free(*trigger);
 
 	return !error;
 }
@@ -290,6 +288,42 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
 	return hash;
 }
 
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
+{
+	GHashTable *hash;
+	GVariant *gvar;
+	int i;
+	char *s;
+
+	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+			(GDestroyNotify)g_variant_unref);
+	for (i = 0; opts[i]; i++) {
+		if (!(s = g_hash_table_lookup(genargs, opts[i]->id)))
+			continue;
+		if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT32)) {
+			gvar = g_variant_new_uint32(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_INT32)) {
+			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_DOUBLE)) {
+			gvar = g_variant_new_double(strtod(s, NULL));
+			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_STRING)) {
+			gvar = g_variant_new_string(s);
+			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);
+		 }
+	}
+
+	return hash;
+}
+
 static char *strcanon(const char *str)
 {
 	int p0, p1;