Commit 667c9ebe authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: ir-core: centralize sysfs raw decoder enabling/disabling 



With the current logic, each raw decoder needs to add a copy of the exact
same sysfs code. This is both unnecessary and also means that (re)loading
an IR driver after raw decoder modules have been loaded won't work as
expected.

This patch moves that logic into ir-raw-event and adds a single sysfs
file per device.

Reading that file returns something like:

	"rc5 [rc6] nec jvc [sony]"

(with enabled protocols in [] brackets)

Writing either "+protocol" or "-protocol" to that file will
enable or disable the according protocol decoder.

An additional benefit is that the disabling of a decoder will be
remembered across module removal/insertion so a previously
disabled decoder won't suddenly be activated again. The default
setting is to enable all decoders.

This is also necessary for the next patch which moves even more decoder
state into the central raw decoding structs.

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Acked-by: default avatarJarod Wilson <jarod@redhat.com>
Tested-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0dc50942

drivers/media/IR/ir-core-priv.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
struct ir_raw_handler {

	struct list_head list;



	u64 protocols; /* which are handled by this handler */

	int (*decode)(struct input_dev *input_dev, struct ir_raw_event event);

	int (*raw_register)(struct input_dev *input_dev);

	int (*raw_unregister)(struct input_dev *input_dev);
@@ -33,6 +34,7 @@ struct ir_raw_event_ctrl { 
	ktime_t				last_event;	/* when last event occurred */

	enum raw_event_type		last_type;	/* last event type */

	struct input_dev		*input_dev;	/* pointer to the parent input_dev */

	u64				enabled_protocols; /* enabled raw protocol decoders */

};



/* macros for IR decoders */
@@ -74,6 +76,7 @@ void ir_unregister_class(struct input_dev *input_dev); 
/*

 * Routines from ir-raw-event.c to be used internally and by decoders

 */

u64 ir_raw_get_allowed_protocols(void);

int ir_raw_event_register(struct input_dev *input_dev);

void ir_raw_event_unregister(struct input_dev *input_dev);

int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);

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

+3 −62
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ enum jvc_state { 
struct decoder_data {

	struct list_head	list;

	struct ir_input_dev	*ir_dev;

	int			enabled:1;



	/* State machine control */

	enum jvc_state		state;
@@ -72,53 +71,6 @@ static struct decoder_data *get_decoder_data(struct ir_input_dev *ir_dev) 
	return data;

}



static ssize_t store_enabled(struct device *d,

			     struct device_attribute *mattr,

			     const char *buf,

			     size_t len)

{

	unsigned long value;

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (strict_strtoul(buf, 10, &value) || value > 1)

		return -EINVAL;



	data->enabled = value;



	return len;

}



static ssize_t show_enabled(struct device *d,

			     struct device_attribute *mattr, char *buf)

{

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (data->enabled)

		return sprintf(buf, "1\n");

	else

	return sprintf(buf, "0\n");

}



static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);



static struct attribute *decoder_attributes[] = {

	&dev_attr_enabled.attr,

	NULL

};



static struct attribute_group decoder_attribute_group = {

	.name	= "jvc_decoder",

	.attrs	= decoder_attributes,

};



/**

 * ir_jvc_decode() - Decode one JVC pulse or space

 * @input_dev:	the struct input_dev descriptor of the device
@@ -135,7 +87,7 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev) 
	if (!data)

		return -EINVAL;



	if (!data->enabled)

	if (!(ir_dev->raw->enabled_protocols & IR_TYPE_JVC))

		return 0;



	if (IS_RESET(ev)) {
@@ -253,22 +205,12 @@ 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);

	if (rc < 0)

		return rc;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data) {

		sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);

	if (!data)

		return -ENOMEM;

	}



	data->ir_dev = ir_dev;

	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);
@@ -286,8 +228,6 @@ static int ir_jvc_unregister(struct input_dev *input_dev) 
	if (!data)

		return 0;



	sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);



	spin_lock(&decoder_lock);

	list_del(&data->list);

	spin_unlock(&decoder_lock);
@@ -296,6 +236,7 @@ static int ir_jvc_unregister(struct input_dev *input_dev) 
}



static struct ir_raw_handler jvc_handler = {

	.protocols	= IR_TYPE_JVC,

	.decode		= ir_jvc_decode,

	.raw_register	= ir_jvc_register,

	.raw_unregister	= ir_jvc_unregister,

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

+3 −62
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ enum nec_state { 
struct decoder_data {

	struct list_head	list;

	struct ir_input_dev	*ir_dev;

	int			enabled:1;



	/* State machine control */

	enum nec_state		state;
@@ -71,53 +70,6 @@ static struct decoder_data *get_decoder_data(struct ir_input_dev *ir_dev) 
	return data;

}



static ssize_t store_enabled(struct device *d,

			     struct device_attribute *mattr,

			     const char *buf,

			     size_t len)

{

	unsigned long value;

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (strict_strtoul(buf, 10, &value) || value > 1)

		return -EINVAL;



	data->enabled = value;



	return len;

}



static ssize_t show_enabled(struct device *d,

			     struct device_attribute *mattr, char *buf)

{

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (data->enabled)

		return sprintf(buf, "1\n");

	else

	return sprintf(buf, "0\n");

}



static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);



static struct attribute *decoder_attributes[] = {

	&dev_attr_enabled.attr,

	NULL

};



static struct attribute_group decoder_attribute_group = {

	.name	= "nec_decoder",

	.attrs	= decoder_attributes,

};



/**

 * ir_nec_decode() - Decode one NEC pulse or space

 * @input_dev:	the struct input_dev descriptor of the device
@@ -136,7 +88,7 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev) 
	if (!data)

		return -EINVAL;



	if (!data->enabled)

	if (!(ir_dev->raw->enabled_protocols & IR_TYPE_NEC))

		return 0;



	if (IS_RESET(ev)) {
@@ -260,22 +212,12 @@ 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);

	if (rc < 0)

		return rc;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data) {

		sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);

	if (!data)

		return -ENOMEM;

	}



	data->ir_dev = ir_dev;

	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);
@@ -293,8 +235,6 @@ static int ir_nec_unregister(struct input_dev *input_dev) 
	if (!data)

		return 0;



	sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);



	spin_lock(&decoder_lock);

	list_del(&data->list);

	spin_unlock(&decoder_lock);
@@ -303,6 +243,7 @@ static int ir_nec_unregister(struct input_dev *input_dev) 
}



static struct ir_raw_handler nec_handler = {

	.protocols	= IR_TYPE_NEC,

	.decode		= ir_nec_decode,

	.raw_register	= ir_nec_register,

	.raw_unregister	= ir_nec_unregister,

drivers/media/IR/ir-raw-event.c

+65 −47
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
#define MAX_IR_EVENT_SIZE      512



/* Used to handle IR raw handler extensions */

static LIST_HEAD(ir_raw_handler_list);

static DEFINE_SPINLOCK(ir_raw_handler_lock);

static LIST_HEAD(ir_raw_handler_list);

static u64 available_protocols;



/**

 * RUN_DECODER()	- runs an operation on all IR decoders
@@ -64,52 +65,6 @@ static void ir_raw_event_work(struct work_struct *work) 
		RUN_DECODER(decode, raw->input_dev, ev);

}



int ir_raw_event_register(struct input_dev *input_dev)

{

	struct ir_input_dev *ir = input_get_drvdata(input_dev);

	int rc;



	ir->raw = kzalloc(sizeof(*ir->raw), GFP_KERNEL);

	if (!ir->raw)

		return -ENOMEM;



	ir->raw->input_dev = input_dev;

	INIT_WORK(&ir->raw->rx_work, ir_raw_event_work);



	rc = kfifo_alloc(&ir->raw->kfifo, sizeof(s64) * MAX_IR_EVENT_SIZE,

			 GFP_KERNEL);

	if (rc < 0) {

		kfree(ir->raw);

		ir->raw = NULL;

		return rc;

	}



	rc = RUN_DECODER(raw_register, input_dev);

	if (rc < 0) {

		kfifo_free(&ir->raw->kfifo);

		kfree(ir->raw);

		ir->raw = NULL;

		return rc;

	}



	return rc;

}



void ir_raw_event_unregister(struct input_dev *input_dev)

{

	struct ir_input_dev *ir = input_get_drvdata(input_dev);



	if (!ir->raw)

		return;



	cancel_work_sync(&ir->raw->rx_work);

	RUN_DECODER(raw_unregister, input_dev);



	kfifo_free(&ir->raw->kfifo);

	kfree(ir->raw);

	ir->raw = NULL;

}



/**

 * ir_raw_event_store() - pass a pulse/space duration to the raw ir decoders

 * @input_dev:	the struct input_dev device descriptor
@@ -203,6 +158,66 @@ void ir_raw_event_handle(struct input_dev *input_dev) 
}

EXPORT_SYMBOL_GPL(ir_raw_event_handle);



/* used internally by the sysfs interface */

u64

ir_raw_get_allowed_protocols()

{

	u64 protocols;

	spin_lock(&ir_raw_handler_lock);

	protocols = available_protocols;

	spin_unlock(&ir_raw_handler_lock);

	return protocols;

}



/*

 * Used to (un)register raw event clients

 */

int ir_raw_event_register(struct input_dev *input_dev)

{

	struct ir_input_dev *ir = input_get_drvdata(input_dev);

	int rc;



	ir->raw = kzalloc(sizeof(*ir->raw), GFP_KERNEL);

	if (!ir->raw)

		return -ENOMEM;



	ir->raw->input_dev = input_dev;

	INIT_WORK(&ir->raw->rx_work, ir_raw_event_work);

	ir->raw->enabled_protocols = ~0;

	rc = kfifo_alloc(&ir->raw->kfifo, sizeof(s64) * MAX_IR_EVENT_SIZE,

			 GFP_KERNEL);

	if (rc < 0) {

		kfree(ir->raw);

		ir->raw = NULL;

		return rc;

	}



	rc = RUN_DECODER(raw_register, input_dev);

	if (rc < 0) {

		kfifo_free(&ir->raw->kfifo);

		kfree(ir->raw);

		ir->raw = NULL;

		return rc;

	}



	return rc;

}



void ir_raw_event_unregister(struct input_dev *input_dev)

{

	struct ir_input_dev *ir = input_get_drvdata(input_dev);



	if (!ir->raw)

		return;



	cancel_work_sync(&ir->raw->rx_work);

	RUN_DECODER(raw_unregister, input_dev);



	kfifo_free(&ir->raw->kfifo);

	kfree(ir->raw);

	ir->raw = NULL;

}



/*

 * Extension interface - used to register the IR decoders

 */
@@ -211,7 +226,9 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler) 
{

	spin_lock(&ir_raw_handler_lock);

	list_add_tail(&ir_raw_handler->list, &ir_raw_handler_list);

	available_protocols |= ir_raw_handler->protocols;

	spin_unlock(&ir_raw_handler_lock);



	return 0;

}

EXPORT_SYMBOL(ir_raw_handler_register);
@@ -220,6 +237,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) 
{

	spin_lock(&ir_raw_handler_lock);

	list_del(&ir_raw_handler->list);

	available_protocols &= ~ir_raw_handler->protocols;

	spin_unlock(&ir_raw_handler_lock);

}

EXPORT_SYMBOL(ir_raw_handler_unregister);

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

+4 −63
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ enum rc5_state { 
struct decoder_data {

	struct list_head	list;

	struct ir_input_dev	*ir_dev;

	int			enabled:1;



	/* State machine control */

	enum rc5_state		state;
@@ -76,53 +75,6 @@ static struct decoder_data *get_decoder_data(struct ir_input_dev *ir_dev) 
	return data;

}



static ssize_t store_enabled(struct device *d,

			     struct device_attribute *mattr,

			     const char *buf,

			     size_t len)

{

	unsigned long value;

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (strict_strtoul(buf, 10, &value) || value > 1)

		return -EINVAL;



	data->enabled = value;



	return len;

}



static ssize_t show_enabled(struct device *d,

			     struct device_attribute *mattr, char *buf)

{

	struct ir_input_dev *ir_dev = dev_get_drvdata(d);

	struct decoder_data *data = get_decoder_data(ir_dev);



	if (!data)

		return -EINVAL;



	if (data->enabled)

		return sprintf(buf, "1\n");

	else

	return sprintf(buf, "0\n");

}



static DEVICE_ATTR(enabled, S_IRUGO | S_IWUSR, show_enabled, store_enabled);



static struct attribute *decoder_attributes[] = {

	&dev_attr_enabled.attr,

	NULL

};



static struct attribute_group decoder_attribute_group = {

	.name	= "rc5_decoder",

	.attrs	= decoder_attributes,

};



/**

 * ir_rc5_decode() - Decode one RC-5 pulse or space

 * @input_dev:	the struct input_dev descriptor of the device
@@ -141,7 +93,7 @@ static int ir_rc5_decode(struct input_dev *input_dev, struct ir_raw_event ev) 
	if (!data)

		return -EINVAL;



	if (!data->enabled)

        if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC5))

                return 0;



	if (IS_RESET(ev)) {
@@ -256,22 +208,12 @@ 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);

	if (rc < 0)

		return rc;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data) {

		sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);

	if (!data)

		return -ENOMEM;

	}



	data->ir_dev = ir_dev;

	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);
@@ -289,8 +231,6 @@ static int ir_rc5_unregister(struct input_dev *input_dev) 
	if (!data)

		return 0;



	sysfs_remove_group(&ir_dev->dev.kobj, &decoder_attribute_group);



	spin_lock(&decoder_lock);

	list_del(&data->list);

	spin_unlock(&decoder_lock);
@@ -299,6 +239,7 @@ static int ir_rc5_unregister(struct input_dev *input_dev) 
}



static struct ir_raw_handler rc5_handler = {

	.protocols	= IR_TYPE_RC5,

	.decode		= ir_rc5_decode,

	.raw_register	= ir_rc5_register,

	.raw_unregister	= ir_rc5_unregister,

CRA Git | Maintained and supported by SUSTech CRA and CCSE