[media] media: lirc_dev: merge struct irctl into struct lirc_dev
The use of two separate structs (lirc_dev aka lirc_driver and irctl) makes it much harder to follow the proper lifetime of the various structs and necessitates hacks such as keeping a copy of struct lirc_dev inside struct irctl. Merging the two structs means that lirc_dev can properly manage the lifetime of the resulting struct and simplifies the code at the same time. [mchehab@s-opensource.com: fix merge conflict] Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
David Härdeman
Mauro Carvalho Chehab
parent
13f96555d6
commit
b15e39379f
|
|
@ -35,7 +35,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
|||
struct lirc_codec *lirc = &dev->raw->lirc;
|
||||
int sample;
|
||||
|
||||
if (!dev->raw->lirc.ldev || !dev->raw->lirc.ldev->rbuf)
|
||||
if (!dev->raw->lirc.ldev || !dev->raw->lirc.ldev->buf)
|
||||
return -EINVAL;
|
||||
|
||||
/* Packet start */
|
||||
|
|
@ -84,7 +84,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
|||
(u64)LIRC_VALUE_MASK);
|
||||
|
||||
gap_sample = LIRC_SPACE(lirc->gap_duration);
|
||||
lirc_buffer_write(dev->raw->lirc.ldev->rbuf,
|
||||
lirc_buffer_write(dev->raw->lirc.ldev->buf,
|
||||
(unsigned char *)&gap_sample);
|
||||
lirc->gap = false;
|
||||
}
|
||||
|
|
@ -95,9 +95,9 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
|
|||
TO_US(ev.duration), TO_STR(ev.pulse));
|
||||
}
|
||||
|
||||
lirc_buffer_write(dev->raw->lirc.ldev->rbuf,
|
||||
lirc_buffer_write(dev->raw->lirc.ldev->buf,
|
||||
(unsigned char *) &sample);
|
||||
wake_up(&dev->raw->lirc.ldev->rbuf->wait_poll);
|
||||
wake_up(&dev->raw->lirc.ldev->buf->wait_poll);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -384,12 +384,12 @@ static int ir_lirc_register(struct rc_dev *dev)
|
|||
dev->driver_name);
|
||||
ldev->features = features;
|
||||
ldev->data = &dev->raw->lirc;
|
||||
ldev->rbuf = NULL;
|
||||
ldev->buf = NULL;
|
||||
ldev->code_length = sizeof(struct ir_raw_event) * 8;
|
||||
ldev->chunk_size = sizeof(int);
|
||||
ldev->buffer_size = LIRCBUF_SIZE;
|
||||
ldev->fops = &lirc_fops;
|
||||
ldev->dev = &dev->dev;
|
||||
ldev->dev.parent = &dev->dev;
|
||||
ldev->rdev = dev;
|
||||
ldev->owner = THIS_MODULE;
|
||||
|
||||
|
|
@ -402,7 +402,7 @@ static int ir_lirc_register(struct rc_dev *dev)
|
|||
return 0;
|
||||
|
||||
out:
|
||||
kfree(ldev);
|
||||
lirc_free_device(ldev);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -411,7 +411,6 @@ static int ir_lirc_unregister(struct rc_dev *dev)
|
|||
struct lirc_codec *lirc = &dev->raw->lirc;
|
||||
|
||||
lirc_unregister_device(lirc->ldev);
|
||||
kfree(lirc->ldev);
|
||||
lirc->ldev = NULL;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -34,19 +34,6 @@
|
|||
|
||||
static dev_t lirc_base_dev;
|
||||
|
||||
struct irctl {
|
||||
struct lirc_dev d;
|
||||
bool attached;
|
||||
int open;
|
||||
|
||||
struct mutex mutex; /* protect from simultaneous accesses */
|
||||
struct lirc_buffer *buf;
|
||||
bool buf_internal;
|
||||
|
||||
struct device dev;
|
||||
struct cdev cdev;
|
||||
};
|
||||
|
||||
/* Used to keep track of allocated lirc devices */
|
||||
#define LIRC_MAX_DEVICES 256
|
||||
static DEFINE_IDA(lirc_ida);
|
||||
|
|
@ -54,71 +41,74 @@ static DEFINE_IDA(lirc_ida);
|
|||
/* Only used for sysfs but defined to void otherwise */
|
||||
static struct class *lirc_class;
|
||||
|
||||
static void lirc_free_buffer(struct irctl *ir)
|
||||
static void lirc_release_device(struct device *ld)
|
||||
{
|
||||
put_device(ir->dev.parent);
|
||||
struct lirc_dev *d = container_of(ld, struct lirc_dev, dev);
|
||||
|
||||
if (ir->buf_internal) {
|
||||
lirc_buffer_free(ir->buf);
|
||||
kfree(ir->buf);
|
||||
ir->buf = NULL;
|
||||
put_device(d->dev.parent);
|
||||
|
||||
if (d->buf_internal) {
|
||||
lirc_buffer_free(d->buf);
|
||||
kfree(d->buf);
|
||||
d->buf = NULL;
|
||||
}
|
||||
kfree(d);
|
||||
module_put(THIS_MODULE);
|
||||
}
|
||||
|
||||
static void lirc_release(struct device *ld)
|
||||
static int lirc_allocate_buffer(struct lirc_dev *d)
|
||||
{
|
||||
struct irctl *ir = container_of(ld, struct irctl, dev);
|
||||
int err;
|
||||
|
||||
lirc_free_buffer(ir);
|
||||
kfree(ir);
|
||||
}
|
||||
|
||||
static int lirc_allocate_buffer(struct irctl *ir)
|
||||
{
|
||||
int err = 0;
|
||||
struct lirc_dev *d = &ir->d;
|
||||
|
||||
if (d->rbuf) {
|
||||
ir->buf = d->rbuf;
|
||||
ir->buf_internal = false;
|
||||
} else {
|
||||
ir->buf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
|
||||
if (!ir->buf) {
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
err = lirc_buffer_init(ir->buf, d->chunk_size, d->buffer_size);
|
||||
if (err) {
|
||||
kfree(ir->buf);
|
||||
ir->buf = NULL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ir->buf_internal = true;
|
||||
d->rbuf = ir->buf;
|
||||
if (d->buf) {
|
||||
d->buf_internal = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
out:
|
||||
return err;
|
||||
d->buf = kmalloc(sizeof(*d->buf), GFP_KERNEL);
|
||||
if (!d->buf)
|
||||
return -ENOMEM;
|
||||
|
||||
err = lirc_buffer_init(d->buf, d->chunk_size, d->buffer_size);
|
||||
if (err) {
|
||||
kfree(d->buf);
|
||||
d->buf = NULL;
|
||||
return err;
|
||||
}
|
||||
|
||||
d->buf_internal = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct lirc_dev *
|
||||
lirc_allocate_device(void)
|
||||
{
|
||||
return kzalloc(sizeof(struct lirc_dev), GFP_KERNEL);
|
||||
struct lirc_dev *d;
|
||||
|
||||
d = kzalloc(sizeof(*d), GFP_KERNEL);
|
||||
if (d) {
|
||||
mutex_init(&d->mutex);
|
||||
device_initialize(&d->dev);
|
||||
d->dev.class = lirc_class;
|
||||
d->dev.release = lirc_release_device;
|
||||
__module_get(THIS_MODULE);
|
||||
}
|
||||
|
||||
return d;
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_allocate_device);
|
||||
|
||||
void lirc_free_device(struct lirc_dev *d)
|
||||
{
|
||||
kfree(d);
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
put_device(&d->dev);
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_free_device);
|
||||
|
||||
int lirc_register_device(struct lirc_dev *d)
|
||||
{
|
||||
struct irctl *ir;
|
||||
int minor;
|
||||
int err;
|
||||
|
||||
|
|
@ -127,8 +117,8 @@ int lirc_register_device(struct lirc_dev *d)
|
|||
return -EBADRQC;
|
||||
}
|
||||
|
||||
if (!d->dev) {
|
||||
pr_err("dev pointer not filled in!\n");
|
||||
if (!d->dev.parent) {
|
||||
pr_err("dev parent pointer not filled in!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -137,25 +127,25 @@ int lirc_register_device(struct lirc_dev *d)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!d->rbuf && d->chunk_size < 1) {
|
||||
if (!d->buf && d->chunk_size < 1) {
|
||||
pr_err("chunk_size must be set!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!d->rbuf && d->buffer_size < 1) {
|
||||
if (!d->buf && d->buffer_size < 1) {
|
||||
pr_err("buffer_size must be set!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (d->code_length < 1 || d->code_length > (BUFLEN * 8)) {
|
||||
dev_err(d->dev, "code length must be less than %d bits\n",
|
||||
BUFLEN * 8);
|
||||
dev_err(&d->dev, "code length must be less than %d bits\n",
|
||||
BUFLEN * 8);
|
||||
return -EBADRQC;
|
||||
}
|
||||
|
||||
if (!d->rbuf && !(d->fops && d->fops->read &&
|
||||
d->fops->poll && d->fops->unlocked_ioctl)) {
|
||||
dev_err(d->dev, "undefined read, poll, ioctl\n");
|
||||
if (!d->buf && !(d->fops && d->fops->read &&
|
||||
d->fops->poll && d->fops->unlocked_ioctl)) {
|
||||
dev_err(&d->dev, "undefined read, poll, ioctl\n");
|
||||
return -EBADRQC;
|
||||
}
|
||||
|
||||
|
|
@ -165,55 +155,34 @@ int lirc_register_device(struct lirc_dev *d)
|
|||
if (d->features == 0)
|
||||
d->features = LIRC_CAN_REC_LIRCCODE;
|
||||
|
||||
ir = kzalloc(sizeof(*ir), GFP_KERNEL);
|
||||
if (!ir)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_init(&ir->mutex);
|
||||
ir->d = *d;
|
||||
|
||||
if (LIRC_CAN_REC(d->features)) {
|
||||
err = lirc_allocate_buffer(ir);
|
||||
if (err) {
|
||||
kfree(ir);
|
||||
err = lirc_allocate_buffer(d);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
d->rbuf = ir->buf;
|
||||
}
|
||||
|
||||
minor = ida_simple_get(&lirc_ida, 0, LIRC_MAX_DEVICES, GFP_KERNEL);
|
||||
if (minor < 0) {
|
||||
lirc_free_buffer(ir);
|
||||
kfree(ir);
|
||||
if (minor < 0)
|
||||
return minor;
|
||||
}
|
||||
|
||||
d->irctl = ir;
|
||||
d->minor = minor;
|
||||
ir->d.minor = minor;
|
||||
d->dev.devt = MKDEV(MAJOR(lirc_base_dev), d->minor);
|
||||
dev_set_name(&d->dev, "lirc%d", d->minor);
|
||||
|
||||
device_initialize(&ir->dev);
|
||||
ir->dev.devt = MKDEV(MAJOR(lirc_base_dev), ir->d.minor);
|
||||
ir->dev.class = lirc_class;
|
||||
ir->dev.parent = d->dev;
|
||||
ir->dev.release = lirc_release;
|
||||
dev_set_name(&ir->dev, "lirc%d", ir->d.minor);
|
||||
cdev_init(&d->cdev, d->fops);
|
||||
d->cdev.owner = d->owner;
|
||||
d->attached = true;
|
||||
|
||||
cdev_init(&ir->cdev, d->fops);
|
||||
ir->cdev.owner = ir->d.owner;
|
||||
ir->attached = true;
|
||||
|
||||
err = cdev_device_add(&ir->cdev, &ir->dev);
|
||||
err = cdev_device_add(&d->cdev, &d->dev);
|
||||
if (err) {
|
||||
ida_simple_remove(&lirc_ida, minor);
|
||||
put_device(&ir->dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
get_device(ir->dev.parent);
|
||||
get_device(d->dev.parent);
|
||||
|
||||
dev_info(ir->d.dev, "lirc_dev: driver %s registered at minor = %d\n",
|
||||
ir->d.name, ir->d.minor);
|
||||
dev_info(&d->dev, "lirc_dev: driver %s registered at minor = %d\n",
|
||||
d->name, d->minor);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -221,88 +190,83 @@ EXPORT_SYMBOL(lirc_register_device);
|
|||
|
||||
void lirc_unregister_device(struct lirc_dev *d)
|
||||
{
|
||||
struct irctl *ir;
|
||||
|
||||
if (!d || !d->irctl)
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
ir = d->irctl;
|
||||
|
||||
dev_dbg(ir->d.dev, "lirc_dev: driver %s unregistered from minor = %d\n",
|
||||
dev_dbg(&d->dev, "lirc_dev: driver %s unregistered from minor = %d\n",
|
||||
d->name, d->minor);
|
||||
|
||||
cdev_device_del(&ir->cdev, &ir->dev);
|
||||
mutex_lock(&d->mutex);
|
||||
|
||||
mutex_lock(&ir->mutex);
|
||||
|
||||
ir->attached = false;
|
||||
if (ir->open) {
|
||||
dev_dbg(ir->d.dev, LOGHEAD "releasing opened driver\n",
|
||||
d->attached = false;
|
||||
if (d->open) {
|
||||
dev_dbg(&d->dev, LOGHEAD "releasing opened driver\n",
|
||||
d->name, d->minor);
|
||||
wake_up_interruptible(&ir->buf->wait_poll);
|
||||
wake_up_interruptible(&d->buf->wait_poll);
|
||||
}
|
||||
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
|
||||
cdev_device_del(&d->cdev, &d->dev);
|
||||
ida_simple_remove(&lirc_ida, d->minor);
|
||||
put_device(&ir->dev);
|
||||
put_device(&d->dev);
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_unregister_device);
|
||||
|
||||
int lirc_dev_fop_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct irctl *ir = container_of(inode->i_cdev, struct irctl, cdev);
|
||||
struct lirc_dev *d = container_of(inode->i_cdev, struct lirc_dev, cdev);
|
||||
int retval;
|
||||
|
||||
dev_dbg(ir->d.dev, LOGHEAD "open called\n", ir->d.name, ir->d.minor);
|
||||
dev_dbg(&d->dev, LOGHEAD "open called\n", d->name, d->minor);
|
||||
|
||||
retval = mutex_lock_interruptible(&ir->mutex);
|
||||
retval = mutex_lock_interruptible(&d->mutex);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
if (!ir->attached) {
|
||||
if (!d->attached) {
|
||||
retval = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (ir->open) {
|
||||
if (d->open) {
|
||||
retval = -EBUSY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (ir->d.rdev) {
|
||||
retval = rc_open(ir->d.rdev);
|
||||
if (d->rdev) {
|
||||
retval = rc_open(d->rdev);
|
||||
if (retval)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (ir->buf)
|
||||
lirc_buffer_clear(ir->buf);
|
||||
if (d->buf)
|
||||
lirc_buffer_clear(d->buf);
|
||||
|
||||
ir->open++;
|
||||
d->open++;
|
||||
|
||||
lirc_init_pdata(inode, file);
|
||||
nonseekable_open(inode, file);
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
|
||||
return 0;
|
||||
|
||||
out:
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
return retval;
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_dev_fop_open);
|
||||
|
||||
int lirc_dev_fop_close(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct irctl *ir = file->private_data;
|
||||
struct lirc_dev *d = file->private_data;
|
||||
|
||||
mutex_lock(&ir->mutex);
|
||||
mutex_lock(&d->mutex);
|
||||
|
||||
rc_close(ir->d.rdev);
|
||||
ir->open--;
|
||||
rc_close(d->rdev);
|
||||
d->open--;
|
||||
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -310,24 +274,24 @@ EXPORT_SYMBOL(lirc_dev_fop_close);
|
|||
|
||||
unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
|
||||
{
|
||||
struct irctl *ir = file->private_data;
|
||||
struct lirc_dev *d = file->private_data;
|
||||
unsigned int ret;
|
||||
|
||||
if (!ir->attached)
|
||||
if (!d->attached)
|
||||
return POLLHUP | POLLERR;
|
||||
|
||||
if (ir->buf) {
|
||||
poll_wait(file, &ir->buf->wait_poll, wait);
|
||||
if (d->buf) {
|
||||
poll_wait(file, &d->buf->wait_poll, wait);
|
||||
|
||||
if (lirc_buffer_empty(ir->buf))
|
||||
if (lirc_buffer_empty(d->buf))
|
||||
ret = 0;
|
||||
else
|
||||
ret = POLLIN | POLLRDNORM;
|
||||
} else
|
||||
} else {
|
||||
ret = POLLERR;
|
||||
}
|
||||
|
||||
dev_dbg(ir->d.dev, LOGHEAD "poll result = %d\n",
|
||||
ir->d.name, ir->d.minor, ret);
|
||||
dev_dbg(&d->dev, LOGHEAD "poll result = %d\n", d->name, d->minor, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -335,44 +299,44 @@ EXPORT_SYMBOL(lirc_dev_fop_poll);
|
|||
|
||||
long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct irctl *ir = file->private_data;
|
||||
struct lirc_dev *d = file->private_data;
|
||||
__u32 mode;
|
||||
int result;
|
||||
|
||||
dev_dbg(ir->d.dev, LOGHEAD "ioctl called (0x%x)\n",
|
||||
ir->d.name, ir->d.minor, cmd);
|
||||
dev_dbg(&d->dev, LOGHEAD "ioctl called (0x%x)\n",
|
||||
d->name, d->minor, cmd);
|
||||
|
||||
result = mutex_lock_interruptible(&ir->mutex);
|
||||
result = mutex_lock_interruptible(&d->mutex);
|
||||
if (result)
|
||||
return result;
|
||||
|
||||
if (!ir->attached) {
|
||||
if (!d->attached) {
|
||||
result = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
switch (cmd) {
|
||||
case LIRC_GET_FEATURES:
|
||||
result = put_user(ir->d.features, (__u32 __user *)arg);
|
||||
result = put_user(d->features, (__u32 __user *)arg);
|
||||
break;
|
||||
case LIRC_GET_REC_MODE:
|
||||
if (!LIRC_CAN_REC(ir->d.features)) {
|
||||
if (!LIRC_CAN_REC(d->features)) {
|
||||
result = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
|
||||
result = put_user(LIRC_REC2MODE
|
||||
(ir->d.features & LIRC_CAN_REC_MASK),
|
||||
(d->features & LIRC_CAN_REC_MASK),
|
||||
(__u32 __user *)arg);
|
||||
break;
|
||||
case LIRC_SET_REC_MODE:
|
||||
if (!LIRC_CAN_REC(ir->d.features)) {
|
||||
if (!LIRC_CAN_REC(d->features)) {
|
||||
result = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
|
||||
result = get_user(mode, (__u32 __user *)arg);
|
||||
if (!result && !(LIRC_MODE2REC(mode) & ir->d.features))
|
||||
if (!result && !(LIRC_MODE2REC(mode) & d->features))
|
||||
result = -EINVAL;
|
||||
/*
|
||||
* FIXME: We should actually set the mode somehow but
|
||||
|
|
@ -380,32 +344,32 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
*/
|
||||
break;
|
||||
case LIRC_GET_LENGTH:
|
||||
result = put_user(ir->d.code_length, (__u32 __user *)arg);
|
||||
result = put_user(d->code_length, (__u32 __user *)arg);
|
||||
break;
|
||||
case LIRC_GET_MIN_TIMEOUT:
|
||||
if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
||||
ir->d.min_timeout == 0) {
|
||||
if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
||||
d->min_timeout == 0) {
|
||||
result = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
|
||||
result = put_user(ir->d.min_timeout, (__u32 __user *)arg);
|
||||
result = put_user(d->min_timeout, (__u32 __user *)arg);
|
||||
break;
|
||||
case LIRC_GET_MAX_TIMEOUT:
|
||||
if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
||||
ir->d.max_timeout == 0) {
|
||||
if (!(d->features & LIRC_CAN_SET_REC_TIMEOUT) ||
|
||||
d->max_timeout == 0) {
|
||||
result = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
|
||||
result = put_user(ir->d.max_timeout, (__u32 __user *)arg);
|
||||
result = put_user(d->max_timeout, (__u32 __user *)arg);
|
||||
break;
|
||||
default:
|
||||
result = -ENOTTY;
|
||||
}
|
||||
|
||||
out:
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
return result;
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_dev_fop_ioctl);
|
||||
|
|
@ -415,34 +379,34 @@ ssize_t lirc_dev_fop_read(struct file *file,
|
|||
size_t length,
|
||||
loff_t *ppos)
|
||||
{
|
||||
struct irctl *ir = file->private_data;
|
||||
struct lirc_dev *d = file->private_data;
|
||||
unsigned char *buf;
|
||||
int ret, written = 0;
|
||||
DECLARE_WAITQUEUE(wait, current);
|
||||
|
||||
dev_dbg(ir->d.dev, LOGHEAD "read called\n", ir->d.name, ir->d.minor);
|
||||
|
||||
buf = kzalloc(ir->buf->chunk_size, GFP_KERNEL);
|
||||
buf = kzalloc(d->buf->chunk_size, GFP_KERNEL);
|
||||
if (!buf)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = mutex_lock_interruptible(&ir->mutex);
|
||||
dev_dbg(&d->dev, LOGHEAD "read called\n", d->name, d->minor);
|
||||
|
||||
ret = mutex_lock_interruptible(&d->mutex);
|
||||
if (ret) {
|
||||
kfree(buf);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (!ir->attached) {
|
||||
if (!d->attached) {
|
||||
ret = -ENODEV;
|
||||
goto out_locked;
|
||||
}
|
||||
|
||||
if (!LIRC_CAN_REC(ir->d.features)) {
|
||||
if (!LIRC_CAN_REC(d->features)) {
|
||||
ret = -EINVAL;
|
||||
goto out_locked;
|
||||
}
|
||||
|
||||
if (length % ir->buf->chunk_size) {
|
||||
if (length % d->buf->chunk_size) {
|
||||
ret = -EINVAL;
|
||||
goto out_locked;
|
||||
}
|
||||
|
|
@ -452,14 +416,14 @@ ssize_t lirc_dev_fop_read(struct file *file,
|
|||
* to avoid losing scan code (in case when queue is awaken somewhere
|
||||
* between while condition checking and scheduling)
|
||||
*/
|
||||
add_wait_queue(&ir->buf->wait_poll, &wait);
|
||||
add_wait_queue(&d->buf->wait_poll, &wait);
|
||||
|
||||
/*
|
||||
* while we didn't provide 'length' bytes, device is opened in blocking
|
||||
* mode and 'copy_to_user' is happy, wait for data.
|
||||
*/
|
||||
while (written < length && ret == 0) {
|
||||
if (lirc_buffer_empty(ir->buf)) {
|
||||
if (lirc_buffer_empty(d->buf)) {
|
||||
/* According to the read(2) man page, 'written' can be
|
||||
* returned as less than 'length', instead of blocking
|
||||
* again, returning -EWOULDBLOCK, or returning
|
||||
|
|
@ -476,36 +440,36 @@ ssize_t lirc_dev_fop_read(struct file *file,
|
|||
break;
|
||||
}
|
||||
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
schedule();
|
||||
set_current_state(TASK_RUNNING);
|
||||
|
||||
ret = mutex_lock_interruptible(&ir->mutex);
|
||||
ret = mutex_lock_interruptible(&d->mutex);
|
||||
if (ret) {
|
||||
remove_wait_queue(&ir->buf->wait_poll, &wait);
|
||||
remove_wait_queue(&d->buf->wait_poll, &wait);
|
||||
goto out_unlocked;
|
||||
}
|
||||
|
||||
if (!ir->attached) {
|
||||
if (!d->attached) {
|
||||
ret = -ENODEV;
|
||||
goto out_locked;
|
||||
}
|
||||
} else {
|
||||
lirc_buffer_read(ir->buf, buf);
|
||||
lirc_buffer_read(d->buf, buf);
|
||||
ret = copy_to_user((void __user *)buffer+written, buf,
|
||||
ir->buf->chunk_size);
|
||||
d->buf->chunk_size);
|
||||
if (!ret)
|
||||
written += ir->buf->chunk_size;
|
||||
written += d->buf->chunk_size;
|
||||
else
|
||||
ret = -EFAULT;
|
||||
}
|
||||
}
|
||||
|
||||
remove_wait_queue(&ir->buf->wait_poll, &wait);
|
||||
remove_wait_queue(&d->buf->wait_poll, &wait);
|
||||
|
||||
out_locked:
|
||||
mutex_unlock(&ir->mutex);
|
||||
mutex_unlock(&d->mutex);
|
||||
|
||||
out_unlocked:
|
||||
kfree(buf);
|
||||
|
|
@ -516,17 +480,17 @@ EXPORT_SYMBOL(lirc_dev_fop_read);
|
|||
|
||||
void lirc_init_pdata(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct irctl *ir = container_of(inode->i_cdev, struct irctl, cdev);
|
||||
struct lirc_dev *d = container_of(inode->i_cdev, struct lirc_dev, cdev);
|
||||
|
||||
file->private_data = ir;
|
||||
file->private_data = d;
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_init_pdata);
|
||||
|
||||
void *lirc_get_pdata(struct file *file)
|
||||
{
|
||||
struct irctl *ir = file->private_data;
|
||||
struct lirc_dev *d = file->private_data;
|
||||
|
||||
return ir->d.data;
|
||||
return d->data;
|
||||
}
|
||||
EXPORT_SYMBOL(lirc_get_pdata);
|
||||
|
||||
|
|
|
|||
|
|
@ -184,10 +184,8 @@ static void release_ir_device(struct kref *ref)
|
|||
* ir->open_count == 0 - happens on final close()
|
||||
* ir_lock, tx_ref_lock, rx_ref_lock, all released
|
||||
*/
|
||||
if (ir->l) {
|
||||
if (ir->l)
|
||||
lirc_unregister_device(ir->l);
|
||||
lirc_free_device(ir->l);
|
||||
}
|
||||
|
||||
if (kfifo_initialized(&ir->rbuf.fifo))
|
||||
lirc_buffer_free(&ir->rbuf);
|
||||
|
|
@ -318,7 +316,7 @@ static int add_to_buf(struct IR *ir)
|
|||
int ret;
|
||||
int failures = 0;
|
||||
unsigned char sendbuf[1] = { 0 };
|
||||
struct lirc_buffer *rbuf = ir->l->rbuf;
|
||||
struct lirc_buffer *rbuf = ir->l->buf;
|
||||
struct IR_rx *rx;
|
||||
struct IR_tx *tx;
|
||||
|
||||
|
|
@ -464,7 +462,7 @@ static int add_to_buf(struct IR *ir)
|
|||
static int lirc_thread(void *arg)
|
||||
{
|
||||
struct IR *ir = arg;
|
||||
struct lirc_buffer *rbuf = ir->l->rbuf;
|
||||
struct lirc_buffer *rbuf = ir->l->buf;
|
||||
|
||||
dev_dbg(ir->dev, "poll thread started\n");
|
||||
|
||||
|
|
@ -885,7 +883,7 @@ static ssize_t read(struct file *filep, char __user *outbuf, size_t n,
|
|||
{
|
||||
struct IR *ir = lirc_get_pdata(filep);
|
||||
struct IR_rx *rx;
|
||||
struct lirc_buffer *rbuf = ir->l->rbuf;
|
||||
struct lirc_buffer *rbuf = ir->l->buf;
|
||||
int ret = 0, written = 0, retries = 0;
|
||||
unsigned int m;
|
||||
DECLARE_WAITQUEUE(wait, current);
|
||||
|
|
@ -1203,7 +1201,7 @@ static unsigned int poll(struct file *filep, poll_table *wait)
|
|||
{
|
||||
struct IR *ir = lirc_get_pdata(filep);
|
||||
struct IR_rx *rx;
|
||||
struct lirc_buffer *rbuf = ir->l->rbuf;
|
||||
struct lirc_buffer *rbuf = ir->l->buf;
|
||||
unsigned int ret;
|
||||
|
||||
dev_dbg(ir->dev, "%s called\n", __func__);
|
||||
|
|
@ -1449,6 +1447,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
ir->l->code_length = 13;
|
||||
ir->l->fops = &lirc_fops;
|
||||
ir->l->owner = THIS_MODULE;
|
||||
ir->l->dev.parent = &adap->dev;
|
||||
|
||||
/*
|
||||
* FIXME this is a pointer reference to us, but no refcount.
|
||||
|
|
@ -1456,13 +1455,12 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
* This OK for now, since lirc_dev currently won't touch this
|
||||
* buffer as we provide our own lirc_fops.
|
||||
*
|
||||
* Currently our own lirc_fops rely on this ir->l->rbuf pointer
|
||||
* Currently our own lirc_fops rely on this ir->l->buf pointer
|
||||
*/
|
||||
ir->l->rbuf = &ir->rbuf;
|
||||
ir->l->dev = &adap->dev;
|
||||
ir->l->buf = &ir->rbuf;
|
||||
/* This will be returned by lirc_get_pdata() */
|
||||
ir->l->data = ir;
|
||||
ret = lirc_buffer_init(ir->l->rbuf, 2, BUFLEN / 2);
|
||||
ret = lirc_buffer_init(ir->l->buf, 2, BUFLEN / 2);
|
||||
if (ret) {
|
||||
lirc_free_device(ir->l);
|
||||
ir->l = NULL;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
#include <linux/poll.h>
|
||||
#include <linux/kfifo.h>
|
||||
#include <media/lirc.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/cdev.h>
|
||||
|
||||
struct lirc_buffer {
|
||||
wait_queue_head_t wait_poll;
|
||||
|
|
@ -127,14 +129,19 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
|
|||
* LIRC_CAN_SET_REC_TIMEOUT is defined.
|
||||
* @max_timeout: Maximum timeout for record. Valid only if
|
||||
* LIRC_CAN_SET_REC_TIMEOUT is defined.
|
||||
* @rbuf: if not NULL, it will be used as a read buffer, you will
|
||||
* @buf: if %NULL, lirc_dev will allocate and manage the buffer,
|
||||
* otherwise allocated by the caller which will
|
||||
* have to write to the buffer by other means, like irq's
|
||||
* (see also lirc_serial.c).
|
||||
* @buf_internal: whether lirc_dev has allocated the read buffer or not
|
||||
* @rdev: &struct rc_dev associated with the device
|
||||
* @fops: &struct file_operations for the device
|
||||
* @dev: &struct device assigned to the device
|
||||
* @owner: the module owning this struct
|
||||
* @irctl: &struct irctl assigned to the device
|
||||
* @attached: if the device is still live
|
||||
* @open: open count for the device's chardev
|
||||
* @mutex: serialises file_operations calls
|
||||
* @dev: &struct device assigned to the device
|
||||
* @cdev: &struct cdev assigned to the device
|
||||
*/
|
||||
struct lirc_dev {
|
||||
char name[40];
|
||||
|
|
@ -144,16 +151,23 @@ struct lirc_dev {
|
|||
|
||||
unsigned int buffer_size; /* in chunks holding one code each */
|
||||
unsigned int chunk_size;
|
||||
struct lirc_buffer *buf;
|
||||
bool buf_internal;
|
||||
|
||||
void *data;
|
||||
int min_timeout;
|
||||
int max_timeout;
|
||||
struct lirc_buffer *rbuf;
|
||||
struct rc_dev *rdev;
|
||||
const struct file_operations *fops;
|
||||
struct device *dev;
|
||||
struct module *owner;
|
||||
struct irctl *irctl;
|
||||
|
||||
bool attached;
|
||||
int open;
|
||||
|
||||
struct mutex mutex; /* protect from simultaneous accesses */
|
||||
|
||||
struct device dev;
|
||||
struct cdev cdev;
|
||||
};
|
||||
|
||||
struct lirc_dev *lirc_allocate_device(void);
|
||||
|
|
|
|||
Loading…
Reference in New Issue