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

Don't try to workaround broken apps (if any). If this still the case,

Browse Source 
lets fix the broken apps instead.
This commit is contained in:
Ariff Abdullah 2006-12-07 07:48:58 +00:00
parent b45d0ec80d
commit cc726a7f98
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,27 +353,12 @@ chn_wrintr(struct pcm_channel *c)
int int
chn_write(struct pcm_channel *c, struct uio *buf) chn_write(struct pcm_channel *c, struct uio *buf)
{ {
int ret, newsize, count, sz; int ret, count, sz;
struct snd_dbuf *bs = c->bufsoft; struct snd_dbuf *bs = c->bufsoft;
void *off; void *off;
int t, x, togo, p; int t, x, togo, p;
CHN_LOCKASSERT(c); CHN_LOCKASSERT(c);
/*
* XXX Certain applications attempt to write larger size
* of pcm data than c->blocksize2nd without blocking,
* resulting partial write. Expand the block size so that
* the write operation avoids blocking.
*/
if ((c->flags & CHN_F_NBIO) && buf->uio_resid > sndbuf_getblksz(bs)) {
DEB(device_printf(c->dev, "broken app, nbio and tried to write %d bytes with fragsz %d\n",
buf->uio_resid, sndbuf_getblksz(bs)));
newsize = 16;
while (newsize < min(buf->uio_resid, CHN_2NDBUFMAXSIZE / 2))
newsize <<= 1;
chn_setblocksize(c, sndbuf_getblkcnt(bs), newsize);
DEB(device_printf(c->dev, "frags reset to %d x %d\n", sndbuf_getblkcnt(bs), sndbuf_getblksz(bs)));
}
ret = 0; ret = 0;
count = hz; count = hz;