d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add record channel irq timeouts too

Browse Source
This commit is contained in:
cg 2000-06-20 23:42:08 +00:00
parent c7300ca8db
commit 1d3d03f892
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/sound/pcm/channel.c
View File

@ -700,7 +700,7 @@ chn_rdintr(pcm_channel *c)
int
chn_read(pcm_channel *c, struct uio *buf)
{
int ret = 0, timeout, limit, res;
int ret = 0, timeout, limit, res, count;
long s;
snd_dbuf *b = &c->buffer;
snd_dbuf *bs = &c->buffer2nd;
@ -734,12 +734,18 @@ chn_read(pcm_channel *c, struct uio *buf)
chn_start(c);
if (!(c->flags & CHN_F_NBIO)) {
count = hz;
/* Wait until all samples are captured. */
while (buf->uio_resid > 0) {
while ((buf->uio_resid > 0) && (count > 0)) {
/* Suck up the DMA and secondary buffers. */
chn_dmaupdate(c);
res = buf->uio_resid;
while (chn_rdfeed(c) > 0);
while (chn_rdfeed2nd(c, buf) > 0);
if (buf->uio_resid < res)
count = hz;
else
count--;
/* Have we finished to feed the uio? */
if (buf->uio_resid == 0)
@ -754,6 +760,10 @@ chn_read(pcm_channel *c, struct uio *buf)
if (ret == EINTR || ret == ERESTART)
break;
}
if (count == 0) {
c->flags |= CHN_F_DEAD;
device_printf(c->parent->dev, "record interrupt timeout, channel dead\n");
}
} else {
/* If no pcm data was read on nonblocking, return EAGAIN. */
if (buf->uio_resid == res)