Skip to content

Commit

Permalink
[media] rc-core: add support for IR raw transmitters
Browse files Browse the repository at this point in the history
IR raw transmitter driver type is specified in the enum
rc_driver_type as RC_DRIVER_IR_RAW_TX which includes all those
devices that transmit raw stream of bit to a receiver.

The data are provided by userspace applications, therefore they
don't need any input device allocation, but still they need to be
registered as raw devices.

Suggested-by: Sean Young <sean@mess.org>
Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Andi Shyti authored and Mauro Carvalho Chehab committed Jan 30, 2017
1 parent 7ff2c2b commit d34aee1
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 20 deletions.
42 changes: 25 additions & 17 deletions drivers/media/rc/rc-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1585,20 +1585,24 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type type)
if (!dev)
return NULL;

dev->input_dev = input_allocate_device();
if (!dev->input_dev) {
kfree(dev);
return NULL;
}
if (type != RC_DRIVER_IR_RAW_TX) {
dev->input_dev = input_allocate_device();
if (!dev->input_dev) {
kfree(dev);
return NULL;
}

dev->input_dev->getkeycode = ir_getkeycode;
dev->input_dev->setkeycode = ir_setkeycode;
input_set_drvdata(dev->input_dev, dev);

dev->input_dev->getkeycode = ir_getkeycode;
dev->input_dev->setkeycode = ir_setkeycode;
input_set_drvdata(dev->input_dev, dev);
setup_timer(&dev->timer_keyup, ir_timer_keyup,
(unsigned long)dev);

spin_lock_init(&dev->rc_map.lock);
spin_lock_init(&dev->keylock);
spin_lock_init(&dev->rc_map.lock);
spin_lock_init(&dev->keylock);
}
mutex_init(&dev->lock);
setup_timer(&dev->timer_keyup, ir_timer_keyup, (unsigned long)dev);

dev->dev.type = &rc_dev_type;
dev->dev.class = &rc_class;
Expand Down Expand Up @@ -1727,7 +1731,7 @@ static int rc_setup_rx_device(struct rc_dev *dev)

static void rc_free_rx_device(struct rc_dev *dev)
{
if (!dev)
if (!dev || dev->driver_type == RC_DRIVER_IR_RAW_TX)
return;

ir_free_table(&dev->rc_map);
Expand Down Expand Up @@ -1757,7 +1761,8 @@ int rc_register_device(struct rc_dev *dev)
atomic_set(&dev->initialized, 0);

dev->dev.groups = dev->sysfs_groups;
dev->sysfs_groups[attr++] = &rc_dev_protocol_attr_grp;
if (dev->driver_type != RC_DRIVER_IR_RAW_TX)
dev->sysfs_groups[attr++] = &rc_dev_protocol_attr_grp;
if (dev->s_filter)
dev->sysfs_groups[attr++] = &rc_dev_filter_attr_grp;
if (dev->s_wakeup_filter)
Expand All @@ -1773,11 +1778,14 @@ int rc_register_device(struct rc_dev *dev)
dev->input_name ?: "Unspecified device", path ?: "N/A");
kfree(path);

rc = rc_setup_rx_device(dev);
if (rc)
goto out_dev;
if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
rc = rc_setup_rx_device(dev);
if (rc)
goto out_dev;
}

if (dev->driver_type == RC_DRIVER_IR_RAW) {
if (dev->driver_type == RC_DRIVER_IR_RAW ||
dev->driver_type == RC_DRIVER_IR_RAW_TX) {
if (!raw_init) {
request_module_nowait("ir-lirc-codec");
raw_init = true;
Expand Down
9 changes: 6 additions & 3 deletions include/media/rc-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@ do { \
/**
* enum rc_driver_type - type of the RC output
*
* @RC_DRIVER_SCANCODE: Driver or hardware generates a scancode
* @RC_DRIVER_IR_RAW: Driver or hardware generates pulse/space sequences.
* It needs a Infra-Red pulse/space decoder
* @RC_DRIVER_SCANCODE: Driver or hardware generates a scancode
* @RC_DRIVER_IR_RAW: Driver or hardware generates pulse/space sequences.
* It needs a Infra-Red pulse/space decoder
* @RC_DRIVER_IR_RAW_TX: Device transmitter only,
* driver requires pulse/space data sequence.
*/
enum rc_driver_type {
RC_DRIVER_SCANCODE = 0,
RC_DRIVER_IR_RAW,
RC_DRIVER_IR_RAW_TX,
};

/**
Expand Down

0 comments on commit d34aee1

Please sign in to comment.