github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 11:33:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ngene: add proper polling to the dvbdev_ci file ops

Browse Source 
Implement the poll callback for the dvbdev_ci file ops. The ts_poll()
function queries the DVB ring buffers for available data and space, and
reports this as appropriate. Also, set the dvb_device readers, writers
and users to proper values (one reader, one writer, two users).

This fixes the raw CI TS transport in conjunction with TVheadend's
DDCI functionality.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Daniel Scheller 2018-02-25 12:06:56 -05:00 committed by Mauro Carvalho Chehab
parent 96c7bc8c7e
commit 6294513dbe
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/pci/ngene/ngene-dvb.c
View File

@ -84,18 +84,41 @@ static ssize_t ts_read(struct file *file, char __user *buf,
return count; return count;
} }
static __poll_t ts_poll(struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = file->private_data;
struct ngene_channel *chan = dvbdev->priv;
struct ngene *dev = chan->dev;
struct dvb_ringbuffer *rbuf = &dev->tsin_rbuf;
struct dvb_ringbuffer *wbuf = &dev->tsout_rbuf;
__poll_t mask = 0;
poll_wait(file, &rbuf->queue, wait);
poll_wait(file, &wbuf->queue, wait);
if (!dvb_ringbuffer_empty(rbuf))
mask |= EPOLLIN | EPOLLRDNORM;
if (dvb_ringbuffer_free(wbuf) >= 188)
mask |= EPOLLOUT | EPOLLWRNORM;
return mask;
}
static const struct file_operations ci_fops = { static const struct file_operations ci_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = ts_read, .read = ts_read,
.write = ts_write, .write = ts_write,
.open = dvb_generic_open, .open = dvb_generic_open,
.release = dvb_generic_release, .release = dvb_generic_release,
.poll = ts_poll,
.mmap = NULL,
}; };
struct dvb_device ngene_dvbdev_ci = { struct dvb_device ngene_dvbdev_ci = {
.readers = -1, .priv = NULL,
.writers = -1, .readers = 1,
.users = -1, .writers = 1,
.users = 2,
.fops = &ci_fops, .fops = &ci_fops,
}; };