X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=300c621b967acbfe32c3a7bc8ac865bd0b9a2cde;hp=56882ff77e12f0740f8a63854a0c6a93bc27cc01;hb=b64d15a340c131950dd0ec21247e1a64aff25281;hpb=78912cc19a4b64e6a477dff5cd917614f7b9f7c3

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 56882ff..300c621 100644
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -56,7 +56,7 @@ static gchar *opt_probes = NULL;
 static gchar *opt_triggers = NULL;
 static gchar *opt_pds = NULL;
 static gchar *opt_pd_stack = NULL;
-static gchar *opt_pd_annotation = NULL;
+static gchar *opt_pd_annotations = NULL;
 static gchar *opt_input_format = NULL;
 static gchar *opt_output_format = NULL;
 static gchar *opt_time = NULL;
@@ -67,7 +67,7 @@ static GOptionEntry optargs[] = {
 	{"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version,
 			"Show version and support list", NULL},
 	{"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel,
-			"Select libsigrok/libsigrokdecode loglevel", NULL},
+			"Set libsigrok/libsigrokdecode loglevel", NULL},
 	{"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs,
 			"Scan for devices", NULL},
 	{"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev,
@@ -90,8 +90,8 @@ static GOptionEntry optargs[] = {
 			"Protocol decoders to run", NULL},
 	{"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack,
 			"Protocol decoder stack", NULL},
-	{"protocol-decoder-annotation", 0, 0, G_OPTION_ARG_STRING, &opt_pd_annotation,
-			"Protocol decoder annotation to show", NULL},
+	{"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations,
+			"Protocol decoder annotation(s) to show", NULL},
 	{"time", 0, 0, G_OPTION_ARG_STRING, &opt_time,
 			"How long to sample (ms)", NULL},
 	{"samples", 0, 0, G_OPTION_ARG_STRING, &opt_samples,
@@ -551,8 +551,9 @@ static int register_pds(struct sr_dev *dev, const char *pdstring)
 		 * This will be pared down later to leave only the last PD
 		 * in the stack.
 		 */
-		if (!opt_pd_annotation)
-			g_hash_table_insert(pd_ann_visible, g_strdup(di->inst_id), NULL);
+		if (!opt_pd_annotations)
+			g_hash_table_insert(pd_ann_visible,
+					    g_strdup(di->inst_id), NULL);
 
 		/* Any keys left in the options hash are probes, where the key
 		 * is the probe name as specified in the decoder class, and the
@@ -614,8 +615,9 @@ int setup_pd_stack(void)
 			 * the stack will be left on the annotation list (unless
 			 * the annotation list was specifically provided).
 			 */
-			if (!opt_pd_annotation)
-				g_hash_table_remove(pd_ann_visible, di_from->inst_id);
+			if (!opt_pd_annotations)
+				g_hash_table_remove(pd_ann_visible,
+						    di_from->inst_id);
 
 			di_from = di_to;
 		}
@@ -633,8 +635,8 @@ int setup_pd_annotations(void)
 	char **pds, **pdtok, **keyval, **ann_descr;
 
 	/* Set up custom list of PDs and annotations to show. */
-	if (opt_pd_annotation) {
-		pds = g_strsplit(opt_pd_annotation, ",", 0);
+	if (opt_pd_annotations) {
+		pds = g_strsplit(opt_pd_annotations, ",", 0);
 		for (pdtok = pds; *pdtok && **pdtok; pdtok++) {
 			ann = 0;
 			keyval = g_strsplit(*pdtok, "=", 0);
@@ -715,7 +717,7 @@ int setup_output_format(void)
 	return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
+void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 {
 	int i;
 	char **annotations;
@@ -1192,7 +1194,7 @@ int main(int argc, char **argv)
 		if (register_pds(NULL, opt_pds) != 0)
 			return 1;
 		if (srd_pd_output_callback_add(SRD_OUTPUT_ANN,
-				show_pd_annotation, NULL) != SRD_OK)
+				show_pd_annotations, NULL) != SRD_OK)
 			return 1;
 		if (setup_pd_stack() != 0)
 			return 1;