X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=1a79367108c90a95cdbb99702086dd6240cd7e86;hp=c60d3bb1bb144a46be5e139ec38ce8e3f1b1f11a;hb=4cc804fff331bce08672107c0ece2b3f8dd9410e;hpb=d80c8dd0c8b6a7507ff8e16ba46734da394acecf

diff --git a/sigrok-cli.c b/sigrok-cli.c
index c60d3bb..1a79367 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -60,6 +60,7 @@ static gchar *opt_output_file = NULL;
 static gchar *opt_drv = NULL;
 static gchar *opt_config = NULL;
 static gchar *opt_probes = NULL;
+static gchar *opt_probe_group = NULL;
 static gchar *opt_triggers = NULL;
 static gchar *opt_pds = NULL;
 #ifdef HAVE_SRD
@@ -94,6 +95,8 @@ static GOptionEntry optargs[] = {
 			"Output format", NULL},
 	{"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes,
 			"Probes to use", NULL},
+	{"probe-group", 'g', 0, G_OPTION_ARG_STRING, &opt_probe_group,
+			"Probe groups", NULL},
 	{"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers,
 			"Trigger configuration", NULL},
 	{"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger,
@@ -151,6 +154,29 @@ static GSList *hash_to_hwopt(GHashTable *hash)
 	return opts;
 }
 
+static struct sr_probe_group *select_probe_group(struct sr_dev_inst *sdi)
+{
+	struct sr_probe_group *pg;
+	GSList *l;
+
+	if (!opt_probe_group)
+		return NULL;
+
+	if (!sdi->probe_groups) {
+		g_critical("This device does not have any probe groups.");
+		return NULL;
+	}
+
+	for (l = sdi->probe_groups; l; l = l->next) {
+		pg = l->data;
+		if (!strcasecmp(opt_probe_group, pg->name)) {
+			return pg;
+		}
+	}
+
+	return NULL;
+}
+
 static void free_drvopts(struct sr_config *src)
 {
 	g_variant_unref(src->data);
@@ -178,11 +204,14 @@ static GSList *device_scan(void)
 		}
 		if (!driver) {
 			g_critical("Driver %s not found.", drvname);
+			g_hash_table_destroy(drvargs);
+			g_free(drvname);
 			return NULL;
 		}
 		g_free(drvname);
 		if (sr_driver_init(sr_ctx, driver) != SR_OK) {
 			g_critical("Failed to initialize driver.");
+			g_hash_table_destroy(drvargs);
 			return NULL;
 		}
 		drvopts = NULL;
@@ -193,7 +222,7 @@ static GSList *device_scan(void)
 				return NULL;
 			}
 		}
-		g_hash_table_destroy(drvargs); 
+		g_hash_table_destroy(drvargs);
 		devices = sr_driver_scan(driver, drvopts);
 		g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
 	} else {
@@ -282,7 +311,7 @@ static void print_dev_line(const struct sr_dev_inst *sdi)
 
 	s = g_string_sized_new(128);
 	g_string_assign(s, sdi->driver->name);
-	if (sr_config_get(sdi->driver, SR_CONF_CONN, &gvar, sdi) == SR_OK) {
+	if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_CONN, &gvar) == SR_OK) {
 		g_string_append(s, ":conn=");
 		g_string_append(s, g_variant_get_string(gvar, NULL));
 		g_variant_unref(gvar);
@@ -333,7 +362,9 @@ static void show_dev_detail(void)
 {
 	struct sr_dev_inst *sdi;
 	const struct sr_config_info *srci;
-	GSList *devices;
+	struct sr_probe *probe;
+	struct sr_probe_group *probe_group, *pg;
+	GSList *devices, *pgl, *prl;
 	GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
 	gsize num_opts, num_elements;
 	const uint64_t *uint64, p, q, low, high;
@@ -364,8 +395,8 @@ static void show_dev_detail(void)
 		return;
 	}
 
-	if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, &gvar_opts,
-			NULL) == SR_OK)) {
+	if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS,
+			&gvar_opts) == SR_OK)) {
 		opts = g_variant_get_fixed_array(gvar_opts, &num_elements,
 				sizeof(int32_t));
 		printf("Supported driver options:\n");
@@ -377,20 +408,42 @@ static void show_dev_detail(void)
 		g_variant_unref(gvar_opts);
 	}
 
-	if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, &gvar_opts,
-			sdi) != SR_OK))
+	probe_group = select_probe_group(sdi);
+	if ((sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_DEVICE_OPTIONS,
+			&gvar_opts)) != SR_OK)
 		/* Driver supports no device instance options. */
 		return;
 
-	printf("Supported configuration options:\n");
+	if (sdi->probe_groups) {
+		printf("Probe groups:\n");
+		for (pgl = sdi->probe_groups; pgl; pgl = pgl->next) {
+			pg = pgl->data;
+			printf("    %s: channel%s", pg->name,
+					g_slist_length(pg->probes) > 1 ? "s" : "");
+			for (prl = pg->probes; prl; prl = prl->next) {
+				probe = prl->data;
+				printf(" %s", probe->name);
+			}
+			printf("\n");
+		}
+	}
+
+	printf("Supported configuration options");
+	if (sdi->probe_groups) {
+		if (!probe_group)
+			printf(" across all probe groups");
+		else
+			printf(" on probe group %s", probe_group->name);
+	}
+	printf(":\n");
 	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t));
 	for (o = 0; o < num_opts; o++) {
 		if (!(srci = sr_config_info_get(opts[o])))
 			continue;
 
 		if (srci->key == SR_CONF_TRIGGER_TYPE) {
-			if (sr_config_list(sdi->driver, srci->key, &gvar,
-					sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -406,8 +459,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_PATTERN_MODE) {
 			/* Pattern generator modes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, srci->key, &gvar,
-					sdi) == SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+					&gvar) == SR_OK) {
 				printf(" - supported patterns:\n");
 				stropts = g_variant_get_strv(gvar, &num_elements);
 				for (i = 0; i < num_elements; i++)
@@ -420,8 +473,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_SAMPLERATE) {
 			/* Supported samplerates */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-					&gvar_dict, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE,
+					&gvar_dict) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -463,8 +516,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_BUFFERSIZE) {
 			/* Supported buffer sizes */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group,
+					SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -478,8 +531,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_TIMEBASE) {
 			/* Supported time bases */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group,
+					SR_CONF_TIMEBASE, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -497,8 +550,8 @@ static void show_dev_detail(void)
 		} else if (srci->key == SR_CONF_VDIV) {
 			/* Supported volts/div values */
 			printf("    %s", srci->id);
-			if (sr_config_list(sdi->driver, SR_CONF_VDIV,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group,
+					SR_CONF_VDIV, &gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -515,15 +568,15 @@ static void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_CHAR) {
 			printf("    %s: ", srci->id);
-			if (sr_config_get(sdi->driver, srci->key,
-					&gvar, sdi) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, probe_group, srci->key,
+					&gvar) == SR_OK) {
 				tmp_str = g_strdup(g_variant_get_string(gvar, NULL));
 				g_variant_unref(gvar);
 			} else
 				tmp_str = NULL;
 
-			if (sr_config_list(sdi->driver, srci->key,
-					&gvar, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+					&gvar) != SR_OK) {
 				printf("\n");
 				continue;
 			}
@@ -543,13 +596,13 @@ static void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_UINT64_RANGE) {
 			printf("    %s: ", srci->id);
-			if (sr_config_list(sdi->driver, srci->key,
-					&gvar_list, sdi) != SR_OK) {
+			if (sr_config_list(sdi->driver, sdi, probe_group, srci->key,
+					&gvar_list) != SR_OK) {
 				printf("\n");
 				continue;
 			}
 
-			if (sr_config_get(sdi->driver, srci->key, &gvar, sdi) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) {
 				g_variant_get(gvar, "(tt)", &cur_low, &cur_high);
 				g_variant_unref(gvar);
 			} else {
@@ -573,8 +626,8 @@ static void show_dev_detail(void)
 
 		} else if (srci->datatype == SR_T_BOOL) {
 			printf("    %s: ", srci->id);
-			if (sr_config_get(sdi->driver, srci->key,
-					&gvar, sdi) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, NULL, srci->key,
+					&gvar) == SR_OK) {
 				if (g_variant_get_boolean(gvar))
 					printf("on (current), off\n");
 				else
@@ -753,8 +806,8 @@ static void datafeed_in(const struct sr_dev_inst *sdi,
 #ifdef HAVE_SRD
 		GVariant *gvar;
 		if (opt_pds && logic_probelist->len) {
-			if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-					&gvar, sdi) == SR_OK) {
+			if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
+					&gvar) == SR_OK) {
 				samplerate = g_variant_get_uint64(gvar);
 				g_variant_unref(gvar);
 				if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE,
@@ -1246,9 +1299,9 @@ int setup_pd_annotations(void)
 
 void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 {
-	int i;
-	char **annotations;
+	struct srd_proto_data_annotation *pda;
 	gpointer ann_format;
+	int i;
 
 	/* 'cb_data' is not used in this specific callback. */
 	(void)cb_data;
@@ -1261,16 +1314,16 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		/* Not in the list of PDs whose annotations we're showing. */
 		return;
 
-	if (pdata->ann_format != GPOINTER_TO_INT(ann_format))
+	pda = pdata->data;
+	if (pda->ann_format != GPOINTER_TO_INT(ann_format))
 		/* We don't want this particular format from the PD. */
 		return;
 
-	annotations = pdata->data;
 	if (opt_loglevel > SR_LOG_WARN)
 		printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
 	printf("%s: ", pdata->pdo->proto_id);
-	for (i = 0; annotations[i]; i++)
-		printf("\"%s\" ", annotations[i]);
+	for (i = 0; pda->ann_text[i]; i++)
+		printf("\"%s\" ", pda->ann_text[i]);
 	printf("\n");
 	fflush(stdout);
 }
@@ -1492,6 +1545,7 @@ static void load_input_file(void)
 static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 {
 	const struct sr_config_info *srci;
+	struct sr_probe_group *pg;
 	GHashTableIter iter;
 	gpointer key, value;
 	int ret;
@@ -1561,8 +1615,10 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
 		default:
 			ret = SR_ERR;
 		}
-		if (val)
-			ret = sr_config_set(sdi, srci->key, val);
+		if (val) {
+			pg = select_probe_group(sdi);
+			ret = sr_config_set(sdi, pg, srci->key, val);
+		}
 		if (ret != SR_OK) {
 			g_critical("Failed to set device option '%s'.", (char *)key);
 			return ret;
@@ -1618,13 +1674,13 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 
 	if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
 		gvar = g_variant_new_uint64(time_msec);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			return SR_ERR;
 		}
 	} else if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
 		/* Convert to samples based on the samplerate.  */
-		sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, &gvar, sdi);
+		sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
 		samplerate = g_variant_get_uint64(gvar);
 		g_variant_unref(gvar);
 		limit_samples = (samplerate) * time_msec / (uint64_t)1000;
@@ -1633,7 +1689,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 			return SR_ERR;
 		}
 		gvar = g_variant_new_uint64(limit_samples);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
 			g_critical("Failed to configure time-based sample limit.");
 			return SR_ERR;
 		}
@@ -1730,7 +1786,7 @@ static void run_session(void)
 			return;
 		}
 		gvar = g_variant_new_uint64(limit_samples);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
 			g_critical("Failed to configure sample limit.");
 			sr_session_destroy();
 			return;
@@ -1744,7 +1800,7 @@ static void run_session(void)
 			return;
 		}
 		gvar = g_variant_new_uint64(limit_frames);
-		if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
+		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
 			g_critical("Failed to configure frame limit.");
 			sr_session_destroy();
 			return;