Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / media / rc-map.h

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index e0f17edf38ed58a6d9bb1289b286ba220289b82a..ee9e2f747c76a5f12f8ff21f718417478e9bd92b 100644 (file)
--- 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 */
@@ -119,6 +119,7 @@ void rc_map_init(void);
 #define RC_MAP_PINNACLE_PCTV_HD          "rc-pinnacle-pctv-hd"
 #define RC_MAP_PIXELVIEW_NEW             "rc-pixelview-new"
 #define RC_MAP_PIXELVIEW                 "rc-pixelview"
+#define RC_MAP_PIXELVIEW_002T           "rc-pixelview-002t"
 #define RC_MAP_PIXELVIEW_MK12            "rc-pixelview-mk12"
 #define RC_MAP_POWERCOLOR_REAL_ANGEL     "rc-powercolor-real-angel"
 #define RC_MAP_PROTEUS_2309              "rc-proteus-2309"
@@ -137,6 +138,7 @@ void rc_map_init(void);
 #define RC_MAP_TREKSTOR                  "rc-trekstor"
 #define RC_MAP_TT_1500                   "rc-tt-1500"
 #define RC_MAP_TWINHAN_VP1027_DVBS       "rc-twinhan1027"
+#define RC_MAP_VIDEOMATE_M1F             "rc-videomate-m1f"
 #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
 #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 #define RC_MAP_WINFAST                   "rc-winfast"