aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2019-03-26 23:12:02 +0100
committerSean Young <sean@mess.org>2019-04-01 12:41:25 +0200
commitc9932ff4c23198301b821c06224235859c215bbb (patch)
tree8f1c93702dd56cb50e30f0b87db333ae0df24b4e
parent0dbe0b725a245b9be9b1347f0cb7ac0f16df8c70 (diff)
keytable: no need to explain -s option separately
Signed-off-by: Sean Young <sean@mess.org>
-rw-r--r--utils/keytable/ir-keytable.1.in15
-rw-r--r--utils/keytable/keytable.c14
2 files changed, 12 insertions, 17 deletions
diff --git a/utils/keytable/ir-keytable.1.in b/utils/keytable/ir-keytable.1.in
index a717b8da..3ea7ea51 100644
--- a/utils/keytable/ir-keytable.1.in
+++ b/utils/keytable/ir-keytable.1.in
@@ -3,10 +3,7 @@
ir\-keytable \- a swiss\-knife tool to handle Remote Controllers.
.SH SYNOPSIS
.B ir\-keytable
-[\fIOPTION\fR]... \fI\-\-sysdev\fR [\fIrc class (f. ex. rc0)\fR]
-.br
-.B ir\-keytable
-[\fIOPTION\fR]... [\fIfor using the rc0 sysdev\fR]
+[\fIOPTION\fR]...
.SH DESCRIPTION
ir\-keytable is a tool that lists the Remote Controller devices, allows one to
get/set rc keycode/scancode tables, set protocol decoder, test events
@@ -17,7 +14,7 @@ options to work.
.SH OPTIONS
.TP
\fB\-a\fR, \fB\-\-auto\-load\fR=\fICFGFILE\fR
-Auto\-load a table, based on a configuration file. Only works with
+Auto\-load keymaps, based on a configuration file. Only works with
\fB\-\-sysdev\fR.
.TP
\fB\-c\fR, \fB\-\-clear\fR
@@ -43,7 +40,7 @@ Sets the period to repeat a keystroke.
Read and show the current scancode to keycode mapping.
.TP
\fB\-s\fR, \fB\-\-sysdev\fR=\fISYSDEV\fR
-rc device to control
+rc device to control, defaults to \fIrc0\fR if not specified.
.TP
\fB\-t\fR, \fB\-\-test\fR
test if the rc device is generating events
@@ -68,7 +65,7 @@ Mandatory or optional arguments to long options are also mandatory or optional
for any corresponding short options. Options can be combined together.
.SS The options arguments are:
.IP \fISYSDEV\fR
-the rc class as found at /sys/class/rc
+the rc device as found at /sys/class/rc
.IP \fIKEYMAP\fR
a toml keymap file with a list of protocols and scancodes to keycode mappings.
The format is described in rc_keymap(5).
@@ -89,7 +86,7 @@ Delay before repeating a keystroke
.IP \fIPERIOD\fR
Period to repeat a keystroke
.IP \fICFGFILE\fR
-configuration file that associates a driver/table name with a keymap file
+configuration file that associates a driver/keymap name with a keymap file
.SH EXIT STATUS
On success, it returns 0. Otherwise, it will return the error code.
.SH EXAMPLES
@@ -97,7 +94,7 @@ To list all connected Remote Controller devices:
.br
\fBir\-keytable\fR
.PP
-To clean the keycode table and use a newer one:
+To clean the keycode mapping and use a newer one:
.br
\fBir\-keytable \-c \-w /etc/rc_keymaps/nec_terratec_cinergy_xs.toml\fR
.PP
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
index ec0e25fe..2ad36d87 100644
--- a/utils/keytable/keytable.c
+++ b/utils/keytable/keytable.c
@@ -230,7 +230,7 @@ static const char doc[] = N_(
"\nAllows get/set IR keycode/scancode tables\n"
"You need to have read permissions on /dev/input for the program to work\n"
"\nOn the options below, the arguments are:\n"
- " SYSDEV - the rc class as found at /sys/class/rc\n"
+ " SYSDEV - the rc device as found at /sys/class/rc\n"
" KEYMAP - a keymap file with protocols and scancode to keycode mappings\n"
" SCANKEY - a set of scancode1=keycode1,scancode2=keycode2.. value pairs\n"
" PROTOCOL - protocol name (nec, rc-5, rc-6, jvc, sony, sanyo, rc-5-sz, lirc,\n"
@@ -245,26 +245,24 @@ static const char doc[] = N_(
static const struct argp_option options[] = {
{"verbose", 'v', 0, 0, N_("enables debug messages"), 0},
- {"clear", 'c', 0, 0, N_("clears the old table"), 0},
- {"sysdev", 's', N_("SYSDEV"), 0, N_("rc class device to control"), 0},
+ {"clear", 'c', 0, 0, N_("Clears the scancode to keycode mappings"), 0},
+ {"sysdev", 's', N_("SYSDEV"), 0, N_("rc device to control, defaults to rc0 if not specified"), 0},
{"test", 't', 0, 0, N_("test if IR is generating events"), 0},
- {"read", 'r', 0, 0, N_("reads the current scancode/keycode table"), 0},
+ {"read", 'r', 0, 0, N_("reads the current scancode/keycode mapping"), 0},
{"write", 'w', N_("KEYMAP"), 0, N_("write (adds) the keymap from the specified file"), 0},
{"set-key", 'k', N_("SCANKEY"), 0, N_("Change scan/key pairs"), 0},
{"protocol", 'p', N_("PROTOCOL"), 0, N_("Protocol to enable (the other ones will be disabled). To enable more than one, use the option more than one time"), 0},
{"parameter", 'e', N_("PARAMETER"), 0, N_("Set a parameter for the protocol decoder")},
{"delay", 'D', N_("DELAY"), 0, N_("Sets the delay before repeating a keystroke"), 0},
{"period", 'P', N_("PERIOD"), 0, N_("Sets the period to repeat a keystroke"), 0},
- {"auto-load", 'a', N_("CFGFILE"), 0, N_("Auto-load a table, based on a configuration file. Only works with sysdev."), 0},
+ {"auto-load", 'a', N_("CFGFILE"), 0, N_("Auto-load keymaps, based on a configuration file. Only works with --sysdev."), 0},
{"help", '?', 0, 0, N_("Give this help list"), -1},
{"usage", -3, 0, 0, N_("Give a short usage message")},
{"version", 'V', 0, 0, N_("Print program version"), -1},
{ 0, 0, 0, 0, 0, 0 }
};
-static const char args_doc[] = N_(
- "--sysdev [rc class (f. ex. rc0)]\n"
- "[for using the rc0 sysdev]");
+static const char args_doc[] = N_("");
/* Static vars to store the parameters */
static char *devclass = NULL;

Privacy Policy