Commit 715a2233 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 47f7f6fb

drivers/media/common/ir-functions.c

+13 −2
Original line number Diff line number Diff line
@@ -58,13 +58,24 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir) 
/* -------------------------------------------------------------------------- */



void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,

		   int ir_type, IR_KEYTAB_TYPE *ir_codes)

		   int ir_type, struct ir_scancode_table *ir_codes)

{

	int i;



	ir->ir_type = ir_type;



	memset(ir->ir_codes, sizeof(ir->ir_codes), 0);



	/*

	 * FIXME: This is a temporary workaround to use the new IR tables

	 * with the old approach. Later patches will replace this to a

	 * proper method

	 */



	if (ir_codes)

		memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));

		for (i = 0; i < ir_codes->size; i++)

			if (ir_codes->scan[i].scancode < IR_KEYTAB_SIZE)

				ir->ir_codes[ir_codes->scan[i].scancode] = ir_codes->scan[i].keycode;



	dev->keycode     = ir->ir_codes;

	dev->keycodesize = sizeof(IR_KEYTAB_TYPE);

drivers/media/common/ir-keymaps.c

+2681 −2404

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/dvb/dm1105/dm1105.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static irqreturn_t dm1105dvb_irq(int irq, void *dev_id) 
int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)

{

	struct input_dev *input_dev;

	IR_KEYTAB_TYPE *ir_codes = ir_codes_dm1105_nec;

	struct ir_scancode_table *ir_codes = &ir_codes_dm1105_nec_table;

	int ir_type = IR_TYPE_OTHER;

	int err = -ENOMEM;

drivers/media/dvb/ttpci/budget-ci.c

+3 −3
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	case 0x1012:

		/* The hauppauge keymap is a superset of these remotes */

		ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, ir_codes_hauppauge_new);

			      IR_TYPE_RC5, &ir_codes_hauppauge_new_table);



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = 0x1f;
@@ -237,7 +237,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	case 0x101a:

		/* for the Technotrend 1500 bundled remote */

		ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, ir_codes_tt_1500);

			      IR_TYPE_RC5, &ir_codes_tt_1500_table);



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = IR_DEVICE_ANY;
@@ -247,7 +247,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	default:

		/* unknown remote */

		ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, ir_codes_budget_ci_old);

			      IR_TYPE_RC5, &ir_codes_budget_ci_old_table);



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = IR_DEVICE_ANY;

drivers/media/video/bt8xx/bttv-input.c

+13 −13
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void bttv_ir_stop(struct bttv *btv) 
int bttv_input_init(struct bttv *btv)

{

	struct card_ir *ir;

	IR_KEYTAB_TYPE *ir_codes = NULL;

	struct ir_scancode_table *ir_codes = NULL;

	struct input_dev *input_dev;

	int ir_type = IR_TYPE_OTHER;

	int err = -ENOMEM;
@@ -263,7 +263,7 @@ int bttv_input_init(struct bttv *btv) 
	case BTTV_BOARD_AVERMEDIA:

	case BTTV_BOARD_AVPHONE98:

	case BTTV_BOARD_AVERMEDIA98:

		ir_codes         = ir_codes_avermedia;

		ir_codes         = &ir_codes_avermedia_table;

		ir->mask_keycode = 0xf88000;

		ir->mask_keydown = 0x010000;

		ir->polling      = 50; // ms
@@ -271,14 +271,14 @@ int bttv_input_init(struct bttv *btv) 


	case BTTV_BOARD_AVDVBT_761:

	case BTTV_BOARD_AVDVBT_771:

		ir_codes         = ir_codes_avermedia_dvbt;

		ir_codes         = &ir_codes_avermedia_dvbt_table;

		ir->mask_keycode = 0x0f00c0;

		ir->mask_keydown = 0x000020;

		ir->polling      = 50; // ms

		break;



	case BTTV_BOARD_PXELVWPLTVPAK:

		ir_codes         = ir_codes_pixelview;

		ir_codes         = &ir_codes_pixelview_table;

		ir->mask_keycode = 0x003e00;

		ir->mask_keyup   = 0x010000;

		ir->polling      = 50; // ms
@@ -286,24 +286,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_codes_pixelview;

		ir_codes         = &ir_codes_pixelview_table;

		ir->mask_keycode = 0x001f00;

		ir->mask_keyup   = 0x008000;

		ir->polling      = 50; // ms

		break;



	case BTTV_BOARD_WINFAST2000:

		ir_codes         = ir_codes_winfast;

		ir_codes         = &ir_codes_winfast_table;

		ir->mask_keycode = 0x1f8;

		break;

	case BTTV_BOARD_MAGICTVIEW061:

	case BTTV_BOARD_MAGICTVIEW063:

		ir_codes         = ir_codes_winfast;

		ir_codes         = &ir_codes_winfast_table;

		ir->mask_keycode = 0x0008e000;

		ir->mask_keydown = 0x00200000;

		break;

	case BTTV_BOARD_APAC_VIEWCOMP:

		ir_codes         = ir_codes_apac_viewcomp;

		ir_codes         = &ir_codes_apac_viewcomp_table;

		ir->mask_keycode = 0x001f00;

		ir->mask_keyup   = 0x008000;

		ir->polling      = 50; // ms
@@ -311,30 +311,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_codes_pixelview;

		ir_codes         = &ir_codes_pixelview_table;

		ir->mask_keycode = 0x001F00;

		ir->mask_keyup   = 0x006000;

		ir->polling      = 50; // ms

		break;

	case BTTV_BOARD_NEBULA_DIGITV:

		ir_codes = ir_codes_nebula;

		ir_codes = &ir_codes_nebula_table;

		btv->custom_irq = bttv_rc5_irq;

		ir->rc5_gpio = 1;

		break;

	case BTTV_BOARD_MACHTV_MAGICTV:

		ir_codes         = ir_codes_apac_viewcomp;

		ir_codes         = &ir_codes_apac_viewcomp_table;

		ir->mask_keycode = 0x001F00;

		ir->mask_keyup   = 0x004000;

		ir->polling      = 50; /* ms */

		break;

	case BTTV_BOARD_KOZUMI_KTV_01C:

		ir_codes         = ir_codes_pctv_sedna;

		ir_codes         = &ir_codes_pctv_sedna_table;

		ir->mask_keycode = 0x001f00;

		ir->mask_keyup   = 0x006000;

		ir->polling      = 50; /* ms */

		break;

	case BTTV_BOARD_ENLTV_FM_2:

		ir_codes         = ir_codes_encore_enltv2;

		ir_codes         = &ir_codes_encore_enltv2_table;

		ir->mask_keycode = 0x00fd00;

		ir->mask_keyup   = 0x000080;

		ir->polling      = 1; /* ms */

CRA Git | Maintained and supported by SUSTech CRA and CCSE