aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/rc-map.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 20:40:11 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 20:40:11 -0200
commit5b7b4a428d5afb641fd95ee7570ac7978704f685 (patch)
tree1b6a60d019fa33ef22a9f3099392c197c56ced70 /include/media/rc-map.h
parent6bca481b3badcf0299c18987a713ca80586f978f (diff)
parent6880444e3aed4c8c52d502f70c4275a63edba601 (diff)
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: (138 commits) [media] rc-core: Initialize return value to zero [media] bttv: remove custom_irq and gpioq from bttv struct [media] [FOR, 2.6.37] Revert "V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit" [media] cx231xx: stray unlock on error path [media] rc: fix sysfs entry for mceusb and streamzap [media] streamzap: merge timeout space with trailing space [media] drivers/media: nuvoton: fix chip id probe v2 [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata [media] drivers/media/video: Remove unnecessary semicolons [media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid tuner [media] mx2_camera: fix pixel clock polarity configuration [media] timblogiw: fix kconfig & build error [media] Fix parameter description for disable_ir [media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core [media] lirc_dev: fixes in lirc_dev_fop_read() [media] lirc_dev: add some __user annotations [media] lirc_dev: stray unlock in lirc_dev_fop_poll() [media] rc-core: fix some leftovers from the renaming patches [media] bttv: merge ir decoding timers [media] bttv: rename struct card_ir to bttv_ir ...
Diffstat (limited to 'include/media/rc-map.h')
-rw-r--r--include/media/rc-map.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 528301845773..aa4b0b2af4c7 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -11,45 +11,45 @@
#include <linux/input.h>
-#define IR_TYPE_UNKNOWN 0
-#define IR_TYPE_RC5 (1 << 0) /* Philips RC5 protocol */
-#define IR_TYPE_NEC (1 << 1)
-#define IR_TYPE_RC6 (1 << 2) /* Philips RC6 protocol */
-#define IR_TYPE_JVC (1 << 3) /* JVC protocol */
-#define IR_TYPE_SONY (1 << 4) /* Sony12/15/20 protocol */
-#define IR_TYPE_RC5_SZ (1 << 5) /* RC5 variant used by Streamzap */
-#define IR_TYPE_LIRC (1 << 30) /* Pass raw IR to lirc userspace */
-#define IR_TYPE_OTHER (1u << 31)
+#define RC_TYPE_UNKNOWN 0
+#define RC_TYPE_RC5 (1 << 0) /* Philips RC5 protocol */
+#define RC_TYPE_NEC (1 << 1)
+#define RC_TYPE_RC6 (1 << 2) /* Philips RC6 protocol */
+#define RC_TYPE_JVC (1 << 3) /* JVC protocol */
+#define RC_TYPE_SONY (1 << 4) /* Sony12/15/20 protocol */
+#define RC_TYPE_RC5_SZ (1 << 5) /* RC5 variant used by Streamzap */
+#define RC_TYPE_LIRC (1 << 30) /* Pass raw IR to lirc userspace */
+#define RC_TYPE_OTHER (1u << 31)
-#define IR_TYPE_ALL (IR_TYPE_RC5 | IR_TYPE_NEC | IR_TYPE_RC6 | \
- IR_TYPE_JVC | IR_TYPE_SONY | IR_TYPE_LIRC | \
- IR_TYPE_RC5_SZ | IR_TYPE_OTHER)
+#define RC_TYPE_ALL (RC_TYPE_RC5 | RC_TYPE_NEC | RC_TYPE_RC6 | \
+ RC_TYPE_JVC | RC_TYPE_SONY | RC_TYPE_LIRC | \
+ RC_TYPE_RC5_SZ | RC_TYPE_OTHER)
-struct ir_scancode {
+struct rc_map_table {
u32 scancode;
u32 keycode;
};
-struct ir_scancode_table {
- struct ir_scancode *scan;
+struct rc_map {
+ struct rc_map_table *scan;
unsigned int size; /* Max number of entries */
unsigned int len; /* Used number of entries */
unsigned int alloc; /* Size of *scan in bytes */
- u64 ir_type;
+ u64 rc_type;
const char *name;
spinlock_t lock;
};
-struct rc_keymap {
+struct rc_map_list {
struct list_head list;
- struct ir_scancode_table map;
+ struct rc_map map;
};
/* Routines from rc-map.c */
-int ir_register_map(struct rc_keymap *map);
-void ir_unregister_map(struct rc_keymap *map);
-struct ir_scancode_table *get_rc_map(const char *name);
+int rc_map_register(struct rc_map_list *map);
+void rc_map_unregister(struct rc_map_list *map);
+struct rc_map *rc_map_get(const char *name);
void rc_map_init(void);
/* Names of the several keytables defined in-kernel */

Privacy Policy