V4L/DVB (12595): common/ir: use a struct for keycode tables

Currently, V4L uses a scancode table whose index is the scancode and
the value is the keycode. While this works, it has some drawbacks:

1) It requires that the scancode to be at the range 00-7f;

2) keycodes should be masked on 7 bits in order for it to work;

3) due to the 7 bits approach, sometimes it is not possible to replace
the default keyboard to another one with a different encoding rule;

4) it is different than what is done with dvb-usb approach;

5) it requires a typedef for it to work. This is not a recommended
Linux CodingStyle.

This patch is part of a larger series of IR changes. It basically
replaces the IR_KEYTAB_TYPE tables by a structured table:
struct ir_scancode {
       u16     scancode;
       u32     keycode;
};

This is very close to what dvb does. So, a further integration with DVB
code will be easy.

While we've changed the tables, for now, the IR keycode handling is still
based on the old approach.

The only notable effect is the redution of about 35% of the ir-common
module size:

   text    data     bss     dec     hex filename
   6721   29208       4   35933    8c5d old/ir-common.ko
   5756   18040       4   23800    5cf8 new/ir-common.ko

In thesis, we could be using above u8 for scancode, reducing even more the size
of the module, but defining it as u16 is more convenient, since, on dvb, each
scancode has up to 16 bits, and we currently have a few troubles with rc5, as their
scancodes are defined with more than 8 bits.

This patch itself shouldn't be doing any functional changes.

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

1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 79c4408a6171..78b3635178af 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -191,7 +191,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 {
         struct cx88_IR *ir;
         struct input_dev *input_dev;
-        IR_KEYTAB_TYPE *ir_codes = NULL;
+        struct ir_scancode_table *ir_codes = NULL;
         int ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
 
@@ -207,14 +207,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_DNTV_LIVE_DVB_T:
         case CX88_BOARD_KWORLD_DVB_T:
         case CX88_BOARD_KWORLD_DVB_T_CX22702:
-                ir_codes = ir_codes_dntv_live_dvb_t;
+                ir_codes = &ir_codes_dntv_live_dvb_t_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x1f;
                 ir->mask_keyup = 0x60;
                 ir->polling = 50; /* ms */
                 break;
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
-                ir_codes = ir_codes_cinergy_1400;
+                ir_codes = &ir_codes_cinergy_1400_table;
                 ir_type = IR_TYPE_PD;
                 ir->sampling = 0xeb04; /* address */
                 break;
@@ -229,14 +229,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_PCHDTV_HD3000:
         case CX88_BOARD_PCHDTV_HD5500:
         case CX88_BOARD_HAUPPAUGE_IRONLY:
-                ir_codes = ir_codes_hauppauge_new;
+                ir_codes = &ir_codes_hauppauge_new_table;
                 ir_type = IR_TYPE_RC5;
                 ir->sampling = 1;
                 break;
         case CX88_BOARD_WINFAST_DTV2000H:
         case CX88_BOARD_WINFAST_DTV2000H_J:
         case CX88_BOARD_WINFAST_DTV1800H:
-                ir_codes = ir_codes_winfast;
+                ir_codes = &ir_codes_winfast_table;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0x8f8;
                 ir->mask_keyup = 0x100;
@@ -245,14 +245,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_WINFAST2000XP_EXPERT:
         case CX88_BOARD_WINFAST_DTV1000:
         case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL:
-                ir_codes = ir_codes_winfast;
+                ir_codes = &ir_codes_winfast_table;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0x8f8;
                 ir->mask_keyup = 0x100;
                 ir->polling = 1; /* ms */
                 break;
         case CX88_BOARD_IODATA_GVBCTV7E:
-                ir_codes = ir_codes_iodata_bctv7e;
+                ir_codes = &ir_codes_iodata_bctv7e_table;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0xfd;
                 ir->mask_keydown = 0x02;
@@ -260,7 +260,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 break;
         case CX88_BOARD_PROLINK_PLAYTVPVR:
         case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO:
-                ir_codes = ir_codes_pixelview;
+                ir_codes = &ir_codes_pixelview_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x1f;
                 ir->mask_keyup = 0x80;
@@ -268,28 +268,28 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 break;
         case CX88_BOARD_PROLINK_PV_8000GT:
         case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME:
-                ir_codes = ir_codes_pixelview_new;
+                ir_codes = &ir_codes_pixelview_new_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x3f;
                 ir->mask_keyup = 0x80;
                 ir->polling = 1; /* ms */
                 break;
         case CX88_BOARD_KWORLD_LTV883:
-                ir_codes = ir_codes_pixelview;
+                ir_codes = &ir_codes_pixelview_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x1f;
                 ir->mask_keyup = 0x60;
                 ir->polling = 1; /* ms */
                 break;
         case CX88_BOARD_ADSTECH_DVB_T_PCI:
-                ir_codes = ir_codes_adstech_dvb_t_pci;
+                ir_codes = &ir_codes_adstech_dvb_t_pci_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0xbf;
                 ir->mask_keyup = 0x40;
                 ir->polling = 50; /* ms */
                 break;
         case CX88_BOARD_MSI_TVANYWHERE_MASTER:
-                ir_codes = ir_codes_msi_tvanywhere;
+                ir_codes = &ir_codes_msi_tvanywhere_table;
                 ir->gpio_addr = MO_GP1_IO;
                 ir->mask_keycode = 0x1f;
                 ir->mask_keyup = 0x40;
@@ -297,40 +297,40 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 break;
         case CX88_BOARD_AVERTV_303:
         case CX88_BOARD_AVERTV_STUDIO_303:
-                ir_codes         = ir_codes_avertv_303;
+                ir_codes         = &ir_codes_avertv_303_table;
                 ir->gpio_addr    = MO_GP2_IO;
                 ir->mask_keycode = 0xfb;
                 ir->mask_keydown = 0x02;
                 ir->polling      = 50; /* ms */
                 break;
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
-                ir_codes = ir_codes_dntv_live_dvbt_pro;
-                ir_type = IR_TYPE_PD;
-                ir->sampling = 0xff00; /* address */
+                ir_codes         = &ir_codes_dntv_live_dvbt_pro_table;
+                ir_type          = IR_TYPE_PD;
+                ir->sampling     = 0xff00; /* address */
                 break;
         case CX88_BOARD_NORWOOD_MICRO:
-                ir_codes         = ir_codes_norwood;
+                ir_codes         = &ir_codes_norwood_table;
                 ir->gpio_addr    = MO_GP1_IO;
                 ir->mask_keycode = 0x0e;
                 ir->mask_keyup   = 0x80;
                 ir->polling      = 50; /* ms */
                 break;
         case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
-                ir_codes = ir_codes_npgtech;
-                ir->gpio_addr = MO_GP0_IO;
+                ir_codes         = &ir_codes_npgtech_table;
+                ir->gpio_addr    = MO_GP0_IO;
                 ir->mask_keycode = 0xfa;
-                ir->polling = 50; /* ms */
+                ir->polling      = 50; /* ms */
                 break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
-                ir_codes = ir_codes_pinnacle_pctv_hd;
-                ir_type = IR_TYPE_RC5;
-                ir->sampling = 1;
+                ir_codes         = &ir_codes_pinnacle_pctv_hd_table;
+                ir_type          = IR_TYPE_RC5;
+                ir->sampling     = 1;
                 break;
         case CX88_BOARD_POWERCOLOR_REAL_ANGEL:
-                ir_codes = ir_codes_powercolor_real_angel;
-                ir->gpio_addr = MO_GP2_IO;
+                ir_codes         = &ir_codes_powercolor_real_angel_table;
+                ir->gpio_addr    = MO_GP2_IO;
                 ir->mask_keycode = 0x7e;
-                ir->polling = 100; /* ms */
+                ir->polling      = 100; /* ms */
                 break;
         }