From: Issa Gorissen <flop.m@usa.net>
To: linux-media@vger.kernel.org
Subject: [PATCH] ngene: blocking and nonblocking io for sec0
Date: Thu, 12 May 2011 15:47:09 +0200 [thread overview]
Message-ID: <4DCBE4DD.1040202@usa.net> (raw)
Patch allows for blocking or nonblocking io on the ngene sec0 device.
It also enforces one reader and one writer at a time.
Signed-off-by: Issa Gorissen <flop.m@usa.net>
--
--- a/linux/drivers/media/dvb/ngene/ngene-dvb.c 2011-05-10 19:11:21.000000000 +0200
+++ b/linux/drivers/media/dvb/ngene/ngene-dvb.c 2011-05-12 15:28:53.573185365 +0200
@@ -53,15 +53,29 @@ static ssize_t ts_write(struct file *fil
struct dvb_device *dvbdev = file->private_data;
struct ngene_channel *chan = dvbdev->priv;
struct ngene *dev = chan->dev;
+ int avail = 0;
+ char nonblock = file->f_flags & O_NONBLOCK;
- if (wait_event_interruptible(dev->tsout_rbuf.queue,
- dvb_ringbuffer_free
- (&dev->tsout_rbuf) >= count) < 0)
+ if (!count)
return 0;
- dvb_ringbuffer_write(&dev->tsout_rbuf, buf, count);
+ if (nonblock) {
+ avail = dvb_ringbuffer_avail(&dev->tsout_rbuf);
+ if (!avail)
+ return -EAGAIN;
+ } else {
+ while (1) {
+ if (wait_event_interruptible(dev->tsout_rbuf.queue,
+ dvb_ringbuffer_free
+ (&dev->tsout_rbuf) >= count) >= 0)
+ break;
+ }
+ avail = count;
+ }
+
+ dvb_ringbuffer_write(&dev->tsout_rbuf, buf, avail);
+ return avail;
- return count;
}
static ssize_t ts_read(struct file *file, char *buf,
@@ -70,22 +84,35 @@ static ssize_t ts_read(struct file *file
struct dvb_device *dvbdev = file->private_data;
struct ngene_channel *chan = dvbdev->priv;
struct ngene *dev = chan->dev;
- int left, avail;
+ int avail = 0;
+ char nonblock = file->f_flags & O_NONBLOCK;
- left = count;
- while (left) {
- if (wait_event_interruptible(
- dev->tsin_rbuf.queue,
- dvb_ringbuffer_avail(&dev->tsin_rbuf) > 0) < 0)
- return -EAGAIN;
+ if (!count)
+ return 0;
+
+ if (nonblock) {
avail = dvb_ringbuffer_avail(&dev->tsin_rbuf);
- if (avail > left)
- avail = left;
- dvb_ringbuffer_read_user(&dev->tsin_rbuf, buf, avail);
- left -= avail;
- buf += avail;
+ } else {
+ while (!avail) {
+ if (wait_event_interruptible(
+ dev->tsin_rbuf.queue,
+ dvb_ringbuffer_avail(&dev->tsin_rbuf) > 0) < 0)
+ continue;
+
+ avail = dvb_ringbuffer_avail(&dev->tsin_rbuf);
+ }
}
- return count;
+
+ if (avail > count)
+ avail = count;
+ if (avail > 0)
+ dvb_ringbuffer_read_user(&dev->tsin_rbuf, buf, avail);
+
+ if (!avail)
+ return -EAGAIN;
+ else
+ return avail;
+
}
static const struct file_operations ci_fops = {
@@ -98,9 +125,9 @@ static const struct file_operations ci_f
struct dvb_device ngene_dvbdev_ci = {
.priv = 0,
- .readers = -1,
- .writers = -1,
- .users = -1,
+ .readers = 1,
+ .writers = 1,
+ .users = 2,
.fops = &ci_fops,
};
reply other threads:[~2011-05-12 13:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DCBE4DD.1040202@usa.net \
--to=flop.m@usa.net \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.