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-behold.c

diff --git a/drivers/media/IR/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c
similarity index 68%
rename from drivers/media/IR/keymaps/rc-behold.c
rename to drivers/media/rc/keymaps/rc-behold.c
index abc140b2098b505c4c6556f2202fdb251e95e17c..0ee1f149364ce4bf3937f478f11b9d1b7279cb2b 100644 (file)
--- a/drivers/media/IR/keymaps/rc-behold.c
+++ b/drivers/media/rc/keymaps/rc-behold.c
@@ -24,13 +24,13 @@
  * helps to descide which keycodes to assign to the buttons.
  */
 
-static struct ir_scancode behold[] = {
+static struct rc_map_table behold[] = {
 
        /*  0x1c            0x12  *
         *  TV/FM          POWER  *
         *                        */
-       { 0x1c, KEY_TUNER },    /* XXX KEY_TV / KEY_RADIO */
-       { 0x12, KEY_POWER },
+       { 0x6b861c, KEY_TUNER },        /* XXX KEY_TV / KEY_RADIO */
+       { 0x6b8612, KEY_POWER },
 
        /*  0x01    0x02    0x03  *
         *   1       2       3    *
@@ -41,28 +41,28 @@ static struct ir_scancode behold[] = {
         *  0x07    0x08    0x09  *
         *   7       8       9    *
         *                        */
-       { 0x01, KEY_1 },
-       { 0x02, KEY_2 },
-       { 0x03, KEY_3 },
-       { 0x04, KEY_4 },
-       { 0x05, KEY_5 },
-       { 0x06, KEY_6 },
-       { 0x07, KEY_7 },
-       { 0x08, KEY_8 },
-       { 0x09, KEY_9 },
+       { 0x6b8601, KEY_1 },
+       { 0x6b8602, KEY_2 },
+       { 0x6b8603, KEY_3 },
+       { 0x6b8604, KEY_4 },
+       { 0x6b8605, KEY_5 },
+       { 0x6b8606, KEY_6 },
+       { 0x6b8607, KEY_7 },
+       { 0x6b8608, KEY_8 },
+       { 0x6b8609, KEY_9 },
 
        /*  0x0a    0x00    0x17  *
         * RECALL    0      MODE  *
         *                        */
-       { 0x0a, KEY_AGAIN },
-       { 0x00, KEY_0 },
-       { 0x17, KEY_MODE },
+       { 0x6b860a, KEY_AGAIN },
+       { 0x6b8600, KEY_0 },
+       { 0x6b8617, KEY_MODE },
 
        /*  0x14          0x10    *
         * ASPECT      FULLSCREEN *
         *                        */
-       { 0x14, KEY_SCREEN },
-       { 0x10, KEY_ZOOM },
+       { 0x6b8614, KEY_SCREEN },
+       { 0x6b8610, KEY_ZOOM },
 
        /*          0x0b          *
         *           Up           *
@@ -73,17 +73,17 @@ static struct ir_scancode behold[] = {
         *         0x015          *
         *         Down           *
         *                        */
-       { 0x0b, KEY_CHANNELUP },
-       { 0x18, KEY_VOLUMEDOWN },
-       { 0x16, KEY_OK },               /* XXX KEY_ENTER */
-       { 0x0c, KEY_VOLUMEUP },
-       { 0x15, KEY_CHANNELDOWN },
+       { 0x6b860b, KEY_CHANNELUP },
+       { 0x6b8618, KEY_VOLUMEDOWN },
+       { 0x6b8616, KEY_OK },           /* XXX KEY_ENTER */
+       { 0x6b860c, KEY_VOLUMEUP },
+       { 0x6b8615, KEY_CHANNELDOWN },
 
        /*  0x11            0x0d  *
         *  MUTE            INFO  *
         *                        */
-       { 0x11, KEY_MUTE },
-       { 0x0d, KEY_INFO },
+       { 0x6b8611, KEY_MUTE },
+       { 0x6b860d, KEY_INFO },
 
        /*  0x0f    0x1b    0x1a  *
         * RECORD PLAY/PAUSE STOP *
@@ -92,46 +92,46 @@ static struct ir_scancode behold[] = {
         *TELETEXT  AUDIO  SOURCE *
         *           RED   YELLOW *
         *                        */
-       { 0x0f, KEY_RECORD },
-       { 0x1b, KEY_PLAYPAUSE },
-       { 0x1a, KEY_STOP },
-       { 0x0e, KEY_TEXT },
-       { 0x1f, KEY_RED },      /*XXX KEY_AUDIO */
-       { 0x1e, KEY_YELLOW },   /*XXX KEY_SOURCE        */
+       { 0x6b860f, KEY_RECORD },
+       { 0x6b861b, KEY_PLAYPAUSE },
+       { 0x6b861a, KEY_STOP },
+       { 0x6b860e, KEY_TEXT },
+       { 0x6b861f, KEY_RED },  /*XXX KEY_AUDIO */
+       { 0x6b861e, KEY_YELLOW },       /*XXX KEY_SOURCE        */
 
        /*  0x1d   0x13     0x19  *
         * SLEEP  PREVIEW   DVB   *
         *         GREEN    BLUE  *
         *                        */
-       { 0x1d, KEY_SLEEP },
-       { 0x13, KEY_GREEN },
-       { 0x19, KEY_BLUE },     /* XXX KEY_SAT  */
+       { 0x6b861d, KEY_SLEEP },
+       { 0x6b8613, KEY_GREEN },
+       { 0x6b8619, KEY_BLUE }, /* XXX KEY_SAT  */
 
        /*  0x58           0x5c   *
         * FREEZE        SNAPSHOT *
         *                        */
-       { 0x58, KEY_SLOW },
-       { 0x5c, KEY_CAMERA },
+       { 0x6b8658, KEY_SLOW },
+       { 0x6b865c, KEY_CAMERA },
 
 };
 
-static struct rc_keymap behold_map = {
+static struct rc_map_list behold_map = {
        .map = {
                .scan    = behold,
                .size    = ARRAY_SIZE(behold),
-               .ir_type = IR_TYPE_UNKNOWN,     /* Legacy IR type */
+               .rc_type = RC_TYPE_NEC,
                .name    = RC_MAP_BEHOLD,
        }
 };
 
 static int __init init_rc_map_behold(void)
 {
-       return ir_register_map(&behold_map);
+       return rc_map_register(&behold_map);
 }
 
 static void __exit exit_rc_map_behold(void)
 {
-       ir_unregister_map(&behold_map);
+       rc_map_unregister(&behold_map);
 }
 
 module_init(init_rc_map_behold)