This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cec: improve usage messages Author: Hans Verkuil <hans.verk...@cisco.com> Date: Wed Feb 28 20:52:02 2018 +0100 Drop the '=' separator between the option and the arguments in the usage message. It's confusing and not needed. Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> utils/cec-compliance/cec-compliance.1.in | 8 ++++---- utils/cec-compliance/cec-compliance.cpp | 8 ++++---- utils/cec-ctl/cec-ctl.1.in | 22 +++++++++++----------- utils/cec-ctl/cec-ctl.cpp | 30 +++++++++++++++--------------- utils/cec-ctl/msg2ctl.pl | 2 +- utils/cec-follower/cec-follower.1.in | 2 +- utils/cec-follower/cec-follower.cpp | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2294bebdd17a2bfbb4d2deaf1e137003a1fa5cf1 diff --git a/utils/cec-compliance/cec-compliance.1.in b/utils/cec-compliance/cec-compliance.1.in index b25ba50eaa37..ba4aa88b88d0 100644 --- a/utils/cec-compliance/cec-compliance.1.in +++ b/utils/cec-compliance/cec-compliance.1.in @@ -71,7 +71,7 @@ Some tests depend on other tests being successful. These are not run if the tests they depend on failed, and they will not be shown in the test listing. .SH OPTIONS .TP -\fB\-d\fR, \fB\-\-device\fR=\fI<dev>\fR +\fB\-d\fR, \fB\-\-device\fR \fI<dev>\fR Use device <dev> as the CEC device. If <dev> is a number, then /dev/cec<dev> is used. .TP \fB\-v\fR, \fB\-\-verbose\fR @@ -89,16 +89,16 @@ Show timestamps as wall-clock time. \fB\-n\fR, \fB\-\-no\-warnings\fR Turn off warning messages. .TP -\fB\-r\fR, \fB\-\-remote\fR=\fI<la>\fR +\fB\-r\fR, \fB\-\-remote\fR \fI<la>\fR As initiator test the remote logical address <la> or all LAs if no LA was given. .TP \fB\-i\fR, \fB\-\-interactive\fR Interactive mode when doing remote tests. .TP -\fB\-R\fR, \fB\-\-reply\-threshold\fR=\fI<timeout>\fR +\fB\-R\fR, \fB\-\-reply\-threshold\fR \fI<timeout>\fR Warn if replies take longer than this threshold (default 1000ms). .TP -\fB\-t\fR, \fB\-\-timeout\fR=\fI<secs>\fR +\fB\-t\fR, \fB\-\-timeout\fR \fI<secs>\fR Set the standby/resume timeout to the given number of seconds. Default is 60s. .TP \fB\-A\fR, \fB\-\-test\-adapter\fR diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp index 234dbca06fab..0adbbe78ce4d 100644 --- a/utils/cec-compliance/cec-compliance.cpp +++ b/utils/cec-compliance/cec-compliance.cpp @@ -160,13 +160,13 @@ static struct option long_options[] = { static void usage(void) { printf("Usage:\n" - " -d, --device=<dev> Use device <dev> instead of /dev/cec0\n" + " -d, --device <dev> Use device <dev> instead of /dev/cec0\n" " If <dev> starts with a digit, then /dev/cec<dev> is used.\n" - " -r, --remote[=<la>] As initiator test the remote logical address or all LAs if no LA was given\n" - " -R, --reply-threshold=<timeout>\n" + " -r, --remote [<la>] As initiator test the remote logical address or all LAs if no LA was given\n" + " -R, --reply-threshold <timeout>\n" " Warn if replies take longer than this threshold (default 1000ms)\n" " -i, --interactive Interactive mode when doing remote tests\n" - " -t, --timeout=<secs> Set the standby/resume timeout to <secs>. Default is 60s.\n" + " -t, --timeout <secs> Set the standby/resume timeout to <secs>. Default is 60s.\n" "\n" " -A, --test-adapter Test the CEC adapter API\n" " --test-core Test the core functionality\n" diff --git a/utils/cec-ctl/cec-ctl.1.in b/utils/cec-ctl/cec-ctl.1.in index bff08c59f6aa..9a94623e2818 100644 --- a/utils/cec-ctl/cec-ctl.1.in +++ b/utils/cec-ctl/cec-ctl.1.in @@ -10,7 +10,7 @@ any aspect of such devices covering the full CEC API. .SH OPTIONS .TP -\fB\-d\fR, \fB\-\-device\fR=\fI<dev>\fR +\fB\-d\fR, \fB\-\-device\fR \fI<dev>\fR Use device <dev> as the CEC device. If <dev> is a number, then /dev/cec<dev> is used. .TP \fB\-v\fR, \fB\-\-verbose\fR @@ -19,15 +19,15 @@ Turn on verbose reporting. \fB\-h\fR, \fB\-\-help\fR Prints the help message. .TP -\fB\-p\fR, \fB\-\-phys\-addr\fR=\fI<addr>\fR +\fB\-p\fR, \fB\-\-phys\-addr\fR \fI<addr>\fR Use this physical address. The address can be a number (e.g. 0 or 0x11b1) or formatted as a.b.c.d where each component is a hex value from 0-f (e.g. 0.0.0.0 or 1.1.b.1). .TP -\fB\-o\fR, \fB\-\-osd\-name\fR=\fI<name>\fR +\fB\-o\fR, \fB\-\-osd\-name\fR \fI<name>\fR Use this OSD name. The maximum length is 14 characters. .TP -\fB\-V\fR, \fB\-\-vendor\-id\fR=\fI<id>\fR +\fB\-V\fR, \fB\-\-vendor\-id\fR \fI<id>\fR Use this vendor ID. The vendor ID is a number from 0x0 to 0xffffff. .TP \fB\-l\fR, \fB\-\-logical\-address\fR @@ -46,10 +46,10 @@ By default when sending a CEC message that expects a reply this utility will wait for that reply. With this option it will just send it without waiting for the reply. .TP -\fB\-t\fR, \fB\-\-to\fR=\fI<la>\fR +\fB\-t\fR, \fB\-\-to\fR \fI<la>\fR Send the message to the given logical address (0-15). .TP -\fB\-f\fR, \fB\-\-from\fR=\fI<la>\fR +\fB\-f\fR, \fB\-\-from\fR \fI<la>\fR Send message from the given logical address. It is only necessary to use this option if multiple logical addresses are claimed. By default the first assigned logical address will be used. @@ -91,7 +91,7 @@ go to the follower that initiated the CEC message. But if you have other followers running as well, then by giving this option they will also receive the reply. .TP -\fB\-\-timeout\fR=\fI<ms>\fR +\fB\-\-timeout\fR \fI<ms>\fR Set the reply timeout in milliseconds (default is 1000 ms). .TP \fB\-\-list\-ui\-commands\fR @@ -186,20 +186,20 @@ possible if the device has the CEC_CAP_MONITOR_PIN capability. This option requi When in pin monitoring mode all 0->1 and 1->0 CEC pin transitions are monitored and analysed. This is effectively a cheap CEC bus analyzer. .TP -\fB\-\-monitor\-time\fR=\fI<secs>\fR +\fB\-\-monitor\-time\fR \fI<secs>\fR Monitor for the given number of seconds, then exit. The default (0) is to monitor forever. .TP -\fB\-\-ignore\fR=\fI<la>\fR,\fI<opcode>\fR +\fB\-\-ignore\fR \fI<la>\fR,\fI<opcode>\fR Ignore messages from logical address <la> and opcode <opcode> when monitoring. "all" can be used for <la> or <opcode> to match all logical addresses or opcodes. To ignore poll messages use "poll" as <opcode>. .TP -\fB\-\-store\-pin\fR=\fI<to>\fR +\fB\-\-store\-pin\fR \fI<to>\fR Store the CEC pin events to the given file. This can be read and analyzed later via the \fB\-\-analyze\-pin\fR option. Use \- to write to stdout instead of to a file. .TP -\fB\-\-analyze\-pin\fR=\fI<from>\fR +\fB\-\-analyze\-pin\fR \fI<from>\fR Read and analyze the CEC pin events from the given file. Use \- to read from stdin instead of from a file. .TP diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp index 94de42e3d227..539682506e67 100644 --- a/utils/cec-ctl/cec-ctl.cpp +++ b/utils/cec-ctl/cec-ctl.cpp @@ -496,13 +496,13 @@ static void log_htng_unknown_msg(const struct cec_msg *msg); static void log_unknown_msg(const struct cec_msg *msg); #define VENDOR_EXTRA \ - " --vendor-command=payload=<byte>[:<byte>]*\n" \ + " --vendor-command payload=<byte>[:<byte>]*\n" \ " Send VENDOR_COMMAND message (" xstr(CEC_MSG_VENDOR_COMMAND) ")\n" \ - " --vendor-command-with-id=vendor-id=<val>,cmd=<byte>[:<byte>]*\n" \ + " --vendor-command-with-id vendor-id=<val>,cmd=<byte>[:<byte>]*\n" \ " Send VENDOR_COMMAND_WITH_ID message (" xstr(CEC_MSG_VENDOR_COMMAND_WITH_ID) ")\n" \ - " --vendor-remote-button-down=rc-code=<byte>[:<byte>]*\n" \ + " --vendor-remote-button-down rc-code=<byte>[:<byte>]*\n" \ " Send VENDOR_REMOTE_BUTTON_DOWN message (" xstr(CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN) ")\n" \ - " --custom-command=cmd=<byte>,payload=<byte>[:<byte>]*\n" \ + " --custom-command cmd=<byte>,payload=<byte>[:<byte>]*\n" \ " Send custom message\n" #include "cec-ctl-gen.h" @@ -797,17 +797,17 @@ static struct option long_options[] = { static void usage(void) { printf("Usage:\n" - " -d, --device=<dev> Use device <dev> instead of /dev/cec0\n" + " -d, --device <dev> Use device <dev> instead of /dev/cec0\n" " If <dev> starts with a digit, then /dev/cec<dev> is used.\n" - " -p, --phys-addr=<addr> Use this physical address\n" - " -o, --osd-name=<name> Use this OSD name\n" - " -V, --vendor-id=<id> Use this vendor ID\n" + " -p, --phys-addr <addr> Use this physical address\n" + " -o, --osd-name <name> Use this OSD name\n" + " -V, --vendor-id <id> Use this vendor ID\n" " -l, --logical-address Show first configured logical address\n" " -L, --logical-addresses Show all configured logical addresses\n" " -C, --clear Clear all logical addresses\n" " -n, --no-reply Don't wait for a reply\n" - " -t, --to=<la> Send message to the given logical address\n" - " -f, --from=<la> Send message from the given logical address\n" + " -t, --to <la> Send message to the given logical address\n" + " -f, --from <la> Send message from the given logical address\n" " By default use the first assigned logical address\n" " -r, --show-raw Show the raw CEC message (hex values)\n" " -s, --skip-info Skip Driver Info output\n" @@ -823,7 +823,7 @@ static void usage(void) " --allow-unreg-fallback Allow fallback to Unregistered\n" " --no-rc-passthrough Disable the RC passthrough\n" " --reply-to-followers The reply will be sent to followers as well\n" - " --timeout=<ms> Set the reply timeout in milliseconds (default is 1000 ms)\n" + " --timeout <ms> Set the reply timeout in milliseconds (default is 1000 ms)\n" " --list-ui-commands List all UI commands that can be used with --user-control-pressed\n" " --list-devices List all cec devices\n" "\n" @@ -858,14 +858,14 @@ static void usage(void) " -m, --monitor Monitor CEC traffic\n" " -M, --monitor-all Monitor all CEC traffic\n" " --monitor-pin Monitor low-level CEC pin\n" - " --monitor-time=<secs> Monitor for <secs> seconds (default is forever)\n" - " --ignore=<la>,<opcode> Ignore messages from logical address <la> and opcode\n" + " --monitor-time <secs> Monitor for <secs> seconds (default is forever)\n" + " --ignore <la>,<opcode> Ignore messages from logical address <la> and opcode\n" " <opcode> when monitoring. 'all' can be used for <la>\n" " or <opcode> to match all logical addresses or opcodes.\n" " To ignore poll messages use 'poll' as <opcode>.\n" - " --store-pin=<to> Store the low-level CEC pin changes to the file <to>.\n" + " --store-pin <to> Store the low-level CEC pin changes to the file <to>.\n" " Use - for stdout.\n" - " --analyze-pin=<from> Analyze the low-level CEC pin changes from the file <from>.\n" + " --analyze-pin <from> Analyze the low-level CEC pin changes from the file <from>.\n" " Use - for stdin.\n" "\n" CEC_USAGE diff --git a/utils/cec-ctl/msg2ctl.pl b/utils/cec-ctl/msg2ctl.pl index 716a11baeb17..d795b07d5317 100755 --- a/utils/cec-ctl/msg2ctl.pl +++ b/utils/cec-ctl/msg2ctl.pl @@ -174,7 +174,7 @@ sub process_func $long_opts .= "\t{ \"$msg_dash_name\", required_argument, 0, Opt$opt }, \\\n"; $usage .= "\t\" --$msg_dash_name"; my $prefix = "\t\" " . sprintf("%-30s", " "); - my $sep = "="; + my $sep = " "; foreach (@args) { ($type, $name) = /(.*?) ?([a-zA-Z_]\w+)$/; $name =~ s/_/-/g; diff --git a/utils/cec-follower/cec-follower.1.in b/utils/cec-follower/cec-follower.1.in index 300810625452..9a1b3134d347 100644 --- a/utils/cec-follower/cec-follower.1.in +++ b/utils/cec-follower/cec-follower.1.in @@ -45,7 +45,7 @@ should be restarted if it is running, to initialize the emulated device with a clean and known initial state. .SH OPTIONS .TP -\fB\-d\fR, \fB\-\-device\fR=\fI<dev>\fR +\fB\-d\fR, \fB\-\-device\fR \fI<dev>\fR Use device <dev> as the CEC device. If <dev> is a number, then /dev/cec<dev> is used. .TP \fB\-v\fR, \fB\-\-verbose\fR diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp index 04f6d2d4c7a8..df29c0b52a30 100644 --- a/utils/cec-follower/cec-follower.cpp +++ b/utils/cec-follower/cec-follower.cpp @@ -68,7 +68,7 @@ static struct option long_options[] = { static void usage(void) { printf("Usage:\n" - " -d, --device=<dev> Use device <dev> instead of /dev/cec0\n" + " -d, --device <dev> Use device <dev> instead of /dev/cec0\n" " If <dev> starts with a digit, then /dev/cec<dev> is used.\n" " -h, --help Display this help message\n" " -n, --no-warnings Turn off warning messages\n" _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
