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

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
...@@ -253,6 +253,7 @@ static int ir_jvc_register(struct input_dev *input_dev) ...@@ -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 ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct decoder_data *data; struct decoder_data *data;
u64 ir_type = ir_dev->rc_tab.ir_type;
int rc; int rc;
rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group); 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) ...@@ -266,7 +267,8 @@ static int ir_jvc_register(struct input_dev *input_dev)
} }
data->ir_dev = ir_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); spin_lock(&decoder_lock);
list_add_tail(&data->list, &decoder_list); list_add_tail(&data->list, &decoder_list);
......
...@@ -260,6 +260,7 @@ static int ir_nec_register(struct input_dev *input_dev) ...@@ -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 ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct decoder_data *data; struct decoder_data *data;
u64 ir_type = ir_dev->rc_tab.ir_type;
int rc; int rc;
rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group); 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) ...@@ -273,7 +274,8 @@ static int ir_nec_register(struct input_dev *input_dev)
} }
data->ir_dev = ir_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); spin_lock(&decoder_lock);
list_add_tail(&data->list, &decoder_list); list_add_tail(&data->list, &decoder_list);
......
...@@ -256,6 +256,7 @@ static int ir_rc5_register(struct input_dev *input_dev) ...@@ -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 ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct decoder_data *data; struct decoder_data *data;
u64 ir_type = ir_dev->rc_tab.ir_type;
int rc; int rc;
rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group); 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) ...@@ -269,7 +270,8 @@ static int ir_rc5_register(struct input_dev *input_dev)
} }
data->ir_dev = ir_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); spin_lock(&decoder_lock);
list_add_tail(&data->list, &decoder_list); list_add_tail(&data->list, &decoder_list);
......
...@@ -352,6 +352,7 @@ static int ir_rc6_register(struct input_dev *input_dev) ...@@ -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 ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct decoder_data *data; struct decoder_data *data;
u64 ir_type = ir_dev->rc_tab.ir_type;
int rc; int rc;
rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group); 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) ...@@ -365,7 +366,8 @@ static int ir_rc6_register(struct input_dev *input_dev)
} }
data->ir_dev = ir_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); spin_lock(&decoder_lock);
list_add_tail(&data->list, &decoder_list); list_add_tail(&data->list, &decoder_list);
......
...@@ -245,6 +245,7 @@ static int ir_sony_register(struct input_dev *input_dev) ...@@ -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 ir_input_dev *ir_dev = input_get_drvdata(input_dev);
struct decoder_data *data; struct decoder_data *data;
u64 ir_type = ir_dev->rc_tab.ir_type;
int rc; int rc;
rc = sysfs_create_group(&ir_dev->dev.kobj, &decoder_attribute_group); 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) ...@@ -258,7 +259,8 @@ static int ir_sony_register(struct input_dev *input_dev)
} }
data->ir_dev = ir_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); spin_lock(&decoder_lock);
list_add_tail(&data->list, &decoder_list); list_add_tail(&data->list, &decoder_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment