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

[mv-sheeva.git] / drivers / media / rc / keymaps / rc-rc5-hauppauge-new.c

diff --git a/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
similarity index 70%
rename from drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c
rename to drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
index cc6b8f5487473cb17d3cec4550e96a99af4e89a7..dfc9b15f43a9e65f04b67686a052dfb18a7a9165 100644 (file)
--- a/drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c
+++ b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
@@ -19,7 +19,7 @@
  * This table contains the complete RC5 code, instead of just the data part
  */
 
-static struct ir_scancode rc5_hauppauge_new[] = {
+static struct rc_map_table rc5_hauppauge_new[] = {
        /* Keys 0 to 9 */
        { 0x1e00, KEY_0 },
        { 0x1e01, KEY_1 },
@@ -75,25 +75,63 @@ static struct ir_scancode rc5_hauppauge_new[] = {
        { 0x1e3b, KEY_SELECT },         /* top right button */
        { 0x1e3c, KEY_ZOOM },           /* full */
        { 0x1e3d, KEY_POWER },          /* system power (green button) */
+
+       /* Keycodes for DSR-0112 remote bundled with Haupauge MiniStick */
+       { 0x1d00, KEY_0 },
+       { 0x1d01, KEY_1 },
+       { 0x1d02, KEY_2 },
+       { 0x1d03, KEY_3 },
+       { 0x1d04, KEY_4 },
+       { 0x1d05, KEY_5 },
+       { 0x1d06, KEY_6 },
+       { 0x1d07, KEY_7 },
+       { 0x1d08, KEY_8 },
+       { 0x1d09, KEY_9 },
+       { 0x1d0a, KEY_TEXT },
+       { 0x1d0d, KEY_MENU },
+       { 0x1d0f, KEY_MUTE },
+       { 0x1d10, KEY_VOLUMEUP },
+       { 0x1d11, KEY_VOLUMEDOWN },
+       { 0x1d12, KEY_PREVIOUS },        /* Prev.Ch .. ??? */
+       { 0x1d14, KEY_UP },
+       { 0x1d15, KEY_DOWN },
+       { 0x1d16, KEY_LEFT },
+       { 0x1d17, KEY_RIGHT },
+       { 0x1d1c, KEY_TV },
+       { 0x1d1e, KEY_NEXT },           /* >|             */
+       { 0x1d1f, KEY_EXIT },
+       { 0x1d20, KEY_CHANNELUP },
+       { 0x1d21, KEY_CHANNELDOWN },
+       { 0x1d24, KEY_LAST },           /* <|             */
+       { 0x1d25, KEY_OK },
+       { 0x1d30, KEY_PAUSE },
+       { 0x1d32, KEY_REWIND },
+       { 0x1d34, KEY_FASTFORWARD },
+       { 0x1d35, KEY_PLAY },
+       { 0x1d36, KEY_STOP },
+       { 0x1d37, KEY_RECORD },
+       { 0x1d3b, KEY_GOTO },
+       { 0x1d3d, KEY_POWER },
+       { 0x1d3f, KEY_HOME },
 };
 
-static struct rc_keymap rc5_hauppauge_new_map = {
+static struct rc_map_list rc5_hauppauge_new_map = {
        .map = {
                .scan    = rc5_hauppauge_new,
                .size    = ARRAY_SIZE(rc5_hauppauge_new),
-               .ir_type = IR_TYPE_RC5,
+               .rc_type = RC_TYPE_RC5,
                .name    = RC_MAP_RC5_HAUPPAUGE_NEW,
        }
 };
 
 static int __init init_rc_map_rc5_hauppauge_new(void)
 {
-       return ir_register_map(&rc5_hauppauge_new_map);
+       return rc_map_register(&rc5_hauppauge_new_map);
 }
 
 static void __exit exit_rc_map_rc5_hauppauge_new(void)
 {
-       ir_unregister_map(&rc5_hauppauge_new_map);
+       rc_map_unregister(&rc5_hauppauge_new_map);
 }
 
 module_init(init_rc_map_rc5_hauppauge_new)