From: Uwe Hermann <redacted>
Date: Wed, 21 Mar 2012 18:58:56 +0000 (+0100)
Subject: cli: Fix -V/-h output a bit.
X-Git-Tag: libsigrok-0.1.0~34
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2e7cb0040a64062cb4b13fdff72995f4b5dc8769;p=libsigrok.git

cli: Fix -V/-h output a bit.

Options and their defaults should not be documented there, but rather in
the manpage or such.
---

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index ddf2f0dc..3ad0d671 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -699,7 +699,7 @@ static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 
 SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
 	.name = "fx2lafw",
-	.longname = "fx2lafw",
+	.longname = "fx2lafw (generic driver for FX2 based LAs)",
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
diff --git a/output/analog.c b/output/analog.c
index 20f680f0..da42b39c 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -456,7 +456,7 @@ static int data_ascii(struct sr_output *o, const char *data_in,
 
 SR_PRIV struct sr_output_format output_analog_bits = {
 	.id = "analog_bits",
-	.description = "Bits (takes argument, default 64)",
+	.description = "Bits",
 	.df_type = SR_DF_ANALOG,
 	.init = init_bits,
 	.data = data_bits,
@@ -466,7 +466,7 @@ SR_PRIV struct sr_output_format output_analog_bits = {
 #if 0
 struct sr_output_format output_analog_hex = {
 	.id = "analog_hex",
-	.description = "Hexadecimal (takes argument, default 192)",
+	.description = "Hexadecimal",
 	.df_type = SR_DF_ANALOG,
 	.init = init_hex,
 	.data = data_hex,
@@ -475,7 +475,7 @@ struct sr_output_format output_analog_hex = {
 
 struct sr_output_format output_analog_ascii = {
 	.id = "analog_ascii",
-	.description = "ASCII (takes argument, default 74)",
+	.description = "ASCII",
 	.df_type = SR_DF_ANALOG,
 	.init = init_ascii,
 	.data = data_ascii,
diff --git a/output/text/ascii.c b/output/text/ascii.c
index 1f7064c8..3b4f87d8 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -120,7 +120,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const char *data_in,
 
 SR_PRIV struct sr_output_format output_text_ascii = {
 	.id = "ascii",
-	.description = "ASCII (takes argument, default 74)",
+	.description = "ASCII",
 	.df_type = SR_DF_LOGIC,
 	.init = init_ascii,
 	.data = data_ascii,
diff --git a/output/text/bits.c b/output/text/bits.c
index 7e2d665a..89359bb2 100644
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -106,7 +106,7 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
 
 SR_PRIV struct sr_output_format output_text_bits = {
 	.id = "bits",
-	.description = "Bits (takes argument, default 64)",
+	.description = "Bits",
 	.df_type = SR_DF_LOGIC,
 	.init = init_bits,
 	.data = data_bits,
diff --git a/output/text/hex.c b/output/text/hex.c
index fb5ca007..0d2c0778 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -94,7 +94,7 @@ SR_PRIV int data_hex(struct sr_output *o, const char *data_in,
 
 SR_PRIV struct sr_output_format output_text_hex = {
 	.id = "hex",
-	.description = "Hexadecimal (takes argument, default 192)",
+	.description = "Hexadecimal",
 	.df_type = SR_DF_LOGIC,
 	.init = init_hex,
 	.data = data_hex,