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>

2 files changed, 14 insertions, 14 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b184d482c497..f46b8a5c3a61 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -562,7 +562,7 @@ struct em28xx_board em28xx_boards[] = {
                 .name         = "Gadmei UTV330+",
                 .tuner_type   = TUNER_TNF_5335MF,
                 .tda9887_conf = TDA9887_PRESENT,
-                .ir_codes     = ir_codes_gadmei_rm008z,
+                .ir_codes     = &ir_codes_gadmei_rm008z_table,
                 .decoder      = EM28XX_SAA711X,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input        = { {
@@ -736,7 +736,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
-                .ir_codes     = ir_codes_hauppauge_new,
+                .ir_codes     = &ir_codes_hauppauge_new_table,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -761,7 +761,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .mts_firmware = 1,
-                .ir_codes     = ir_codes_hauppauge_new,
+                .ir_codes     = &ir_codes_hauppauge_new_table,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -787,7 +787,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = ir_codes_hauppauge_new,
+                .ir_codes       = &ir_codes_hauppauge_new_table,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -813,7 +813,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = ir_codes_hauppauge_new,
+                .ir_codes       = &ir_codes_hauppauge_new_table,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -839,7 +839,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = ir_codes_pinnacle_pctv_hd,
+                .ir_codes       = &ir_codes_pinnacle_pctv_hd_table,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -865,7 +865,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = ir_codes_ati_tv_wonder_hd_600,
+                .ir_codes       = &ir_codes_ati_tv_wonder_hd_600_table,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -891,7 +891,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_TVP5150,
                 .has_dvb        = 1,
                 .dvb_gpio       = default_digital,
-                .ir_codes       = ir_codes_terratec_cinergy_xs,
+                .ir_codes       = &ir_codes_terratec_cinergy_xs_table,
                 .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1443,7 +1443,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .decoder      = EM28XX_TVP5150,
                 .tuner_gpio   = default_tuner_gpio,
-                .ir_codes     = ir_codes_kaiomy,
+                .ir_codes     = &ir_codes_kaiomy_table,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1543,7 +1543,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = evga_indtube_digital,
-                .ir_codes     = ir_codes_evga_indtube,
+                .ir_codes     = &ir_codes_evga_indtube_table,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -2217,17 +2217,17 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 break;
         case (EM2800_BOARD_TERRATEC_CINERGY_200):
         case (EM2820_BOARD_TERRATEC_CINERGY_250):
-                init_data.ir_codes = ir_codes_em_terratec;
+                init_data.ir_codes = &ir_codes_em_terratec_table;
                 init_data.get_key = em28xx_get_key_terratec;
                 init_data.name = "i2c IR (EM28XX Terratec)";
                 break;
         case (EM2820_BOARD_PINNACLE_USB_2):
-                init_data.ir_codes = ir_codes_pinnacle_grey;
+                init_data.ir_codes = &ir_codes_pinnacle_grey_table;
                 init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
                 init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
-                init_data.ir_codes = ir_codes_hauppauge_new;
+                init_data.ir_codes = &ir_codes_hauppauge_new_table;
                 init_data.get_key = em28xx_get_key_em_haup;
                 init_data.name = "i2c IR (EM2840 Hauppauge)";
                 break;
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 23f34dd691e9..217f948e03d7 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -409,7 +409,7 @@ struct em28xx_board {
 
         struct em28xx_input       input[MAX_EM28XX_INPUT];
         struct em28xx_input       radio;
-        IR_KEYTAB_TYPE            *ir_codes;
+        struct ir_scancode_table  *ir_codes;
 };
 
 struct em28xx_eeprom {