V4L/DVB: ir-core: Make use of the new IR keymap modules

Instead of using the ugly keymap sequences, use the new rc-*.ko keymap
files. For now, it is still needed to have one keymap loaded, for the
RC code to work. Later patches will remove this depenency.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 71a0047ca7b..f68717a4bde 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -248,7 +248,7 @@ static void bttv_ir_stop(struct bttv *btv)
 int bttv_input_init(struct bttv *btv)
 {
         struct card_ir *ir;
-        struct ir_scancode_table *ir_codes = NULL;
+        char *ir_codes = NULL;
         struct input_dev *input_dev;
         u64 ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
@@ -266,7 +266,7 @@ int bttv_input_init(struct bttv *btv)
         case BTTV_BOARD_AVERMEDIA:
         case BTTV_BOARD_AVPHONE98:
         case BTTV_BOARD_AVERMEDIA98:
-                ir_codes         = &IR_KEYTABLE(avermedia);
+                ir_codes         = RC_MAP_AVERMEDIA;
                 ir->mask_keycode = 0xf88000;
                 ir->mask_keydown = 0x010000;
                 ir->polling      = 50; // ms
@@ -274,14 +274,14 @@ int bttv_input_init(struct bttv *btv)
 
         case BTTV_BOARD_AVDVBT_761:
         case BTTV_BOARD_AVDVBT_771:
-                ir_codes         = &IR_KEYTABLE(avermedia_dvbt);
+                ir_codes         = RC_MAP_AVERMEDIA_DVBT;
                 ir->mask_keycode = 0x0f00c0;
                 ir->mask_keydown = 0x000020;
                 ir->polling      = 50; // ms
                 break;
 
         case BTTV_BOARD_PXELVWPLTVPAK:
-                ir_codes         = &IR_KEYTABLE(pixelview);
+                ir_codes         = RC_MAP_PIXELVIEW;
                 ir->mask_keycode = 0x003e00;
                 ir->mask_keyup   = 0x010000;
                 ir->polling      = 50; // ms
@@ -289,24 +289,24 @@ int bttv_input_init(struct bttv *btv)
         case BTTV_BOARD_PV_M4900:
         case BTTV_BOARD_PV_BT878P_9B:
         case BTTV_BOARD_PV_BT878P_PLUS:
-                ir_codes         = &IR_KEYTABLE(pixelview);
+                ir_codes         = RC_MAP_PIXELVIEW;
                 ir->mask_keycode = 0x001f00;
                 ir->mask_keyup   = 0x008000;
                 ir->polling      = 50; // ms
                 break;
 
         case BTTV_BOARD_WINFAST2000:
-                ir_codes         = &IR_KEYTABLE(winfast);
+                ir_codes         = RC_MAP_WINFAST;
                 ir->mask_keycode = 0x1f8;
                 break;
         case BTTV_BOARD_MAGICTVIEW061:
         case BTTV_BOARD_MAGICTVIEW063:
-                ir_codes         = &IR_KEYTABLE(winfast);
+                ir_codes         = RC_MAP_WINFAST;
                 ir->mask_keycode = 0x0008e000;
                 ir->mask_keydown = 0x00200000;
                 break;
         case BTTV_BOARD_APAC_VIEWCOMP:
-                ir_codes         = &IR_KEYTABLE(apac_viewcomp);
+                ir_codes         = RC_MAP_APAC_VIEWCOMP;
                 ir->mask_keycode = 0x001f00;
                 ir->mask_keyup   = 0x008000;
                 ir->polling      = 50; // ms
@@ -314,30 +314,30 @@ int bttv_input_init(struct bttv *btv)
         case BTTV_BOARD_ASKEY_CPH03X:
         case BTTV_BOARD_CONCEPTRONIC_CTVFMI2:
         case BTTV_BOARD_CONTVFMI:
-                ir_codes         = &IR_KEYTABLE(pixelview);
+                ir_codes         = RC_MAP_PIXELVIEW;
                 ir->mask_keycode = 0x001F00;
                 ir->mask_keyup   = 0x006000;
                 ir->polling      = 50; // ms
                 break;
         case BTTV_BOARD_NEBULA_DIGITV:
-                ir_codes = &IR_KEYTABLE(nebula);
+                ir_codes = RC_MAP_NEBULA;
                 btv->custom_irq = bttv_rc5_irq;
                 ir->rc5_gpio = 1;
                 break;
         case BTTV_BOARD_MACHTV_MAGICTV:
-                ir_codes         = &IR_KEYTABLE(apac_viewcomp);
+                ir_codes         = RC_MAP_APAC_VIEWCOMP;
                 ir->mask_keycode = 0x001F00;
                 ir->mask_keyup   = 0x004000;
                 ir->polling      = 50; /* ms */
                 break;
         case BTTV_BOARD_KOZUMI_KTV_01C:
-                ir_codes         = &IR_KEYTABLE(pctv_sedna);
+                ir_codes         = RC_MAP_PCTV_SEDNA;
                 ir->mask_keycode = 0x001f00;
                 ir->mask_keyup   = 0x006000;
                 ir->polling      = 50; /* ms */
                 break;
         case BTTV_BOARD_ENLTV_FM_2:
-                ir_codes         = &IR_KEYTABLE(encore_enltv2);
+                ir_codes         = RC_MAP_ENCORE_ENLTV2;
                 ir->mask_keycode = 0x00fd00;
                 ir->mask_keyup   = 0x000080;
                 ir->polling      = 1; /* ms */
@@ -392,7 +392,7 @@ int bttv_input_init(struct bttv *btv)
         bttv_ir_start(btv, ir);
 
         /* all done */
-        err = __ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);
+        err = ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);
         if (err)
                 goto err_out_stop;