Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7366646e authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: IR: only initially registers protocol that matches loaded keymap 



Rather than registering all IR protocol decoders as enabled when bringing
up a new device, only enable the IR protocol decoder that matches the
keymap being loaded. Additional decoders can be enabled on the fly by
those that need to, either by twiddling sysfs bits or by using the
ir-keytable util from v4l-utils.

Functional testing done with the mceusb driver, and it behaves as expected,
only the rc6 decoder is enabled, keys are all handled properly, etc.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c2284261

drivers/media/IR/ir-jvc-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ static int ir_jvc_register(struct input_dev *input_dev) 
{

	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);

	struct decoder_data *data;

	u64 ir_type = ir_dev->rc_tab.ir_type;

	int rc;



	rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -266,6 +267,7 @@ static int ir_jvc_register(struct input_dev *input_dev) 
	}



	data->ir_dev = ir_dev;

	if (ir_type == IR_TYPE_JVC || ir_type == IR_TYPE_UNKNOWN)

		data->enabled = 1;



	spin_lock(&decoder_lock);

drivers/media/IR/ir-nec-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static int ir_nec_register(struct input_dev *input_dev) 
{

	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);

	struct decoder_data *data;

	u64 ir_type = ir_dev->rc_tab.ir_type;

	int rc;



	rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -273,6 +274,7 @@ static int ir_nec_register(struct input_dev *input_dev) 
	}



	data->ir_dev = ir_dev;

	if (ir_type == IR_TYPE_NEC || ir_type == IR_TYPE_UNKNOWN)

		data->enabled = 1;



	spin_lock(&decoder_lock);

drivers/media/IR/ir-rc5-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static int ir_rc5_register(struct input_dev *input_dev) 
{

	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);

	struct decoder_data *data;

	u64 ir_type = ir_dev->rc_tab.ir_type;

	int rc;



	rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -269,6 +270,7 @@ static int ir_rc5_register(struct input_dev *input_dev) 
	}



	data->ir_dev = ir_dev;

	if (ir_type == IR_TYPE_RC5 || ir_type == IR_TYPE_UNKNOWN)

		data->enabled = 1;



	spin_lock(&decoder_lock);

drivers/media/IR/ir-rc6-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static int ir_rc6_register(struct input_dev *input_dev) 
{

	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);

	struct decoder_data *data;

	u64 ir_type = ir_dev->rc_tab.ir_type;

	int rc;



	rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -365,6 +366,7 @@ static int ir_rc6_register(struct input_dev *input_dev) 
	}



	data->ir_dev = ir_dev;

	if (ir_type == IR_TYPE_RC6 || ir_type == IR_TYPE_UNKNOWN)

		data->enabled = 1;



	spin_lock(&decoder_lock);

drivers/media/IR/ir-sony-decoder.c

+3 −1
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static int ir_sony_register(struct input_dev *input_dev) 
{

	struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);

	struct decoder_data *data;

	u64 ir_type = ir_dev->rc_tab.ir_type;

	int rc;



	rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group);
@@ -258,6 +259,7 @@ static int ir_sony_register(struct input_dev *input_dev) 
	}



	data->ir_dev = ir_dev;

	if (ir_type == IR_TYPE_SONY || ir_type == IR_TYPE_UNKNOWN)

		data->enabled = 1;



	spin_lock(&decoder_lock);