aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-07-03 00:08:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 14:18:02 -0400
commit15f135d0cfc1ce762889bb804549da4081087597 (patch)
treee99508f4cb74a906bd58051ac90c91f67408c740
parent30eb1be718a4753dd1912eb35af4cdaa25cefea9 (diff)
V4L/DVB: IR: add empty lirc pseudo-keymap
Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/IR/keymaps/Makefile1
-rw-r--r--drivers/media/IR/keymaps/rc-lirc.c41
-rw-r--r--include/media/rc-map.h1
3 files changed, 43 insertions, 0 deletions
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index c3def729d759..86d3d1f2eaa9 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
37 rc-kaiomy.o \ 37 rc-kaiomy.o \
38 rc-kworld-315u.o \ 38 rc-kworld-315u.o \
39 rc-kworld-plus-tv-analog.o \ 39 rc-kworld-plus-tv-analog.o \
40 rc-lirc.o \
40 rc-manli.o \ 41 rc-manli.o \
41 rc-msi-tvanywhere.o \ 42 rc-msi-tvanywhere.o \
42 rc-msi-tvanywhere-plus.o \ 43 rc-msi-tvanywhere-plus.o \
diff --git a/drivers/media/IR/keymaps/rc-lirc.c b/drivers/media/IR/keymaps/rc-lirc.c
new file mode 100644
index 000000000000..43fcf9035082
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-lirc.c
@@ -0,0 +1,41 @@
1/* rc-lirc.c - Empty dummy keytable, for use when its preferred to pass
2 * all raw IR data to the lirc userspace decoder.
3 *
4 * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.com>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 */
11
12#include <media/ir-core.h>
13
14static struct ir_scancode lirc[] = {
15 { },
16};
17
18static struct rc_keymap lirc_map = {
19 .map = {
20 .scan = lirc,
21 .size = ARRAY_SIZE(lirc),
22 .ir_type = IR_TYPE_LIRC,
23 .name = RC_MAP_LIRC,
24 }
25};
26
27static int __init init_rc_map_lirc(void)
28{
29 return ir_register_map(&lirc_map);
30}
31
32static void __exit exit_rc_map_lirc(void)
33{
34 ir_unregister_map(&lirc_map);
35}
36
37module_init(init_rc_map_lirc)
38module_exit(exit_rc_map_lirc)
39
40MODULE_LICENSE("GPL");
41MODULE_AUTHOR("Jarod Wilson <jarod@redhat.com>");
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index f982144685e7..a329858c4b42 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -92,6 +92,7 @@ void rc_map_init(void);
92#define RC_MAP_KAIOMY "rc-kaiomy" 92#define RC_MAP_KAIOMY "rc-kaiomy"
93#define RC_MAP_KWORLD_315U "rc-kworld-315u" 93#define RC_MAP_KWORLD_315U "rc-kworld-315u"
94#define RC_MAP_KWORLD_PLUS_TV_ANALOG "rc-kworld-plus-tv-analog" 94#define RC_MAP_KWORLD_PLUS_TV_ANALOG "rc-kworld-plus-tv-analog"
95#define RC_MAP_LIRC "rc-lirc"
95#define RC_MAP_MANLI "rc-manli" 96#define RC_MAP_MANLI "rc-manli"
96#define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus" 97#define RC_MAP_MSI_TVANYWHERE_PLUS "rc-msi-tvanywhere-plus"
97#define RC_MAP_MSI_TVANYWHERE "rc-msi-tvanywhere" 98#define RC_MAP_MSI_TVANYWHERE "rc-msi-tvanywhere"