From 7366646e20f8800433333a7102e3ce488215e33f Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Tue, 1 Jun 2010 17:27:07 -0300 Subject: [PATCH] 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: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab --- drivers/media/IR/ir-jvc-decoder.c | 4 +++- drivers/media/IR/ir-nec-decoder.c | 4 +++- drivers/media/IR/ir-rc5-decoder.c | 4 +++- drivers/media/IR/ir-rc6-decoder.c | 4 +++- drivers/media/IR/ir-sony-decoder.c | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/media/IR/ir-jvc-decoder.c b/drivers/media/IR/ir-jvc-decoder.c index 0b804944cbb..b02e8013b9b 100644 --- a/drivers/media/IR/ir-jvc-decoder.c +++ b/drivers/media/IR/ir-jvc-decoder.c @@ -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,7 +267,8 @@ static int ir_jvc_register(struct input_dev *input_dev) } data->ir_dev = ir_dev; - data->enabled = 1; + if (ir_type == IR_TYPE_JVC || ir_type == IR_TYPE_UNKNOWN) + data->enabled = 1; spin_lock(&decoder_lock); list_add_tail(&data->list, &decoder_list); diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c index ba79233112e..6059a1f1e15 100644 --- a/drivers/media/IR/ir-nec-decoder.c +++ b/drivers/media/IR/ir-nec-decoder.c @@ -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,7 +274,8 @@ static int ir_nec_register(struct input_dev *input_dev) } data->ir_dev = ir_dev; - data->enabled = 1; + if (ir_type == IR_TYPE_NEC || ir_type == IR_TYPE_UNKNOWN) + data->enabled = 1; spin_lock(&decoder_lock); list_add_tail(&data->list, &decoder_list); diff --git a/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/IR/ir-rc5-decoder.c index 23cdb1b1a3b..4aa797bc69f 100644 --- a/drivers/media/IR/ir-rc5-decoder.c +++ b/drivers/media/IR/ir-rc5-decoder.c @@ -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,7 +270,8 @@ static int ir_rc5_register(struct input_dev *input_dev) } data->ir_dev = ir_dev; - data->enabled = 1; + if (ir_type == IR_TYPE_RC5 || ir_type == IR_TYPE_UNKNOWN) + data->enabled = 1; spin_lock(&decoder_lock); list_add_tail(&data->list, &decoder_list); diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/IR/ir-rc6-decoder.c index 2bf479f4f1b..9f61da29fac 100644 --- a/drivers/media/IR/ir-rc6-decoder.c +++ b/drivers/media/IR/ir-rc6-decoder.c @@ -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,7 +366,8 @@ static int ir_rc6_register(struct input_dev *input_dev) } data->ir_dev = ir_dev; - data->enabled = 1; + if (ir_type == IR_TYPE_RC6 || ir_type == IR_TYPE_UNKNOWN) + data->enabled = 1; spin_lock(&decoder_lock); list_add_tail(&data->list, &decoder_list); diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/IR/ir-sony-decoder.c index 9f440c5c060..219075ffd6b 100644 --- a/drivers/media/IR/ir-sony-decoder.c +++ b/drivers/media/IR/ir-sony-decoder.c @@ -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,7 +259,8 @@ static int ir_sony_register(struct input_dev *input_dev) } data->ir_dev = ir_dev; - data->enabled = 1; + if (ir_type == IR_TYPE_SONY || ir_type == IR_TYPE_UNKNOWN) + data->enabled = 1; spin_lock(&decoder_lock); list_add_tail(&data->list, &decoder_list); -- 2.41.0