aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2019-02-19 09:48:59 (GMT)
committerSean Young <sean@mess.org>2019-02-21 20:33:04 (GMT)
commit5da0a28799f730f8f795ebdc06de633de5237aea (patch)
tree8aa83d13384585b97f670ffc575a23daaa85bb6b
parent104049962f021ba363b51acc6917ce73155b1ff8 (diff)
ir-ctl/keytable: rc-mm protocol support
Signed-off-by: Sean Young <sean@mess.org>
-rw-r--r--utils/common/ir-encode.c3
-rw-r--r--utils/ir-ctl/ir-ctl.1.in3
-rw-r--r--utils/keytable/ir-keytable.1.in4
-rw-r--r--utils/keytable/keytable.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/utils/common/ir-encode.c b/utils/common/ir-encode.c
index ccc7503..4bd1b69 100644
--- a/utils/common/ir-encode.c
+++ b/utils/common/ir-encode.c
@@ -372,6 +372,9 @@ static const struct {
[RC_PROTO_XMP] = { "xmp" },
[RC_PROTO_CEC] = { "cec" },
[RC_PROTO_IMON] = { "imon", 0x7fffffff },
+ [RC_PROTO_RCMM12] = { "rc-mm-12", 0x0fff },
+ [RC_PROTO_RCMM24] = { "rc-mm-24", 0xffffff },
+ [RC_PROTO_RCMM32] = { "rc-mm-32", 0xffffffff },
};
static bool str_like(const char *a, const char *b)
diff --git a/utils/ir-ctl/ir-ctl.1.in b/utils/ir-ctl/ir-ctl.1.in
index b9a401e..c3ab118 100644
--- a/utils/ir-ctl/ir-ctl.1.in
+++ b/utils/ir-ctl/ir-ctl.1.in
@@ -181,7 +181,8 @@ pulse and space file. The following protocols are supported:
\fBrc5\fR, \fBrc5x_20\fR, \fBrc5_sz\fR, \fBjvc\fR, \fBsony12\fR,
\fBsony\fB15\fR, \fBsony20\fR, \fBnec\fR, \fBnecx\fR, \fBnec32\fR,
\fBsanyo\fR, \fBrc6_0\fR, \fBrc6_6a_20\fR, \fBrc6_6a_24\fR, \fBrc6_6a_32\fR,
-\fBrc6_mce\fR, \fBsharp\fR, \fBimon\fR.
+\fBrc6_mce\fR, \fBsharp\fR, \fBimon\fR, \fBrc_mm_12\fR, \fBrc_mm_24\fR,
+\fBrc_mm_32\fR.
If the scancode starts with 0x it will be interpreted as a
hexadecimal number, and if it starts with 0 it will be interpreted as an
octal number.
diff --git a/utils/keytable/ir-keytable.1.in b/utils/keytable/ir-keytable.1.in
index ef4aabc..47fa1df 100644
--- a/utils/keytable/ir-keytable.1.in
+++ b/utils/keytable/ir-keytable.1.in
@@ -85,8 +85,8 @@ a set of scancode1=keycode1,scancode2=keycode2.. value pairs
Comma separated list of kernel protocols to be enabled (case insensitive).
Supported kernel protocols are: \fBnec\fR, \fBrc\-5\fR, \fBrc\-6\fR, \fBjvc\fR,
\fBsony\fR, \fBsanyo\fR, \fBrc\-5\-sz\fR, \fBsharp\fR, \fBmce\-kbd\fR,
-\fBxmp\fR, \fBimon\fR, \fBother\fR, \fBall\fR. It can also be a BPF protocol,
-e.g. \fBmanchester\fR, \fBrc_mm\fR, \fBpulse_distance\fR, \fBpulse_length\fR.
+\fBxmp\fR, \fBimon\fR, \fBrc\-mm\fR, \fBother\fR, \fBall\fR. It can also be a BPF protocol,
+e.g. \fBmanchester\fR, \fBpulse_distance\fR, \fBpulse_length\fR.
If it does not match any of these, it is taken to be the path of BPF decoder
to be loaded.
.IP \fIPARAMETERS\fR
diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
index 0aceb01..0726e5f 100644
--- a/utils/keytable/keytable.c
+++ b/utils/keytable/keytable.c
@@ -127,6 +127,7 @@ enum sysfs_protocols {
SYSFS_XMP = (1 << 12),
SYSFS_CEC = (1 << 13),
SYSFS_IMON = (1 << 14),
+ SYSFS_RCMM = (1 << 15),
SYSFS_INVALID = 0,
};
@@ -161,6 +162,7 @@ const struct protocol_map_entry protocol_map[] = {
{ "xmp", "/xmp_decoder", SYSFS_XMP },
{ "cec", NULL, SYSFS_CEC },
{ "imon", NULL, SYSFS_IMON },
+ { "rc-mm", NULL, SYSFS_RCMM },
{ NULL, NULL, SYSFS_INVALID },
};

Privacy Policy