diff options
author | cg <cg@FreeBSD.org> | 2001-02-07 20:45:40 +0000 |
---|---|---|
committer | cg <cg@FreeBSD.org> | 2001-02-07 20:45:40 +0000 |
commit | 1cd44c5d5b6af569a250f63a7f30d980be186206 (patch) | |
tree | c75d9b80f018ef250328a496a8182880e9f9f3cf /sys | |
parent | 1e6371c6ace0c1486a4e9e93230df13f0214a457 (diff) | |
download | FreeBSD-src-1cd44c5d5b6af569a250f63a7f30d980be186206.zip FreeBSD-src-1cd44c5d5b6af569a250f63a7f30d980be186206.tar.gz |
back out rev 1.49, looks like i committed it from the wrong tree.
include the changes 1.49 was supposed to have.
Noticed by: peter
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/sound/pcm/channel.c | 1227 |
1 files changed, 803 insertions, 424 deletions
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 3581fd8..9c6c97b 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -31,69 +31,95 @@ #include "feeder_if.h" +MALLOC_DEFINE(M_CHANNEL, "channel", "pcm channel"); #define MIN_CHUNK_SIZE 256 /* for uiomove etc. */ #define DMA_ALIGN_THRESHOLD 4 #define DMA_ALIGN_MASK (~(DMA_ALIGN_THRESHOLD - 1)) -#define MIN(x, y) (((x) < (y))? (x) : (y)) -#define CANCHANGE(c) (!(c->flags & CHN_F_TRIGGERED)) +#define CANCHANGE(c) (!(c)->buffer.dl) +#define ROUND(x) ((x) & DMA_ALIGN_MASK) /* #define DEB(x) x */ +static void chn_dmaupdate(pcm_channel *c); +static void chn_wrintr(pcm_channel *c); +static void chn_rdintr(pcm_channel *c); static int chn_buildfeeder(pcm_channel *c); +/* + * SOUND OUTPUT -static void -chn_lockinit(pcm_channel *c) -{ - mtx_init(&c->mutex, c->name, MTX_RECURSE); - mtx_enter(&c->mutex, MTX_DEF); -} +We use a circular buffer to store samples directed to the DAC. +The buffer is split into two variable-size regions, each identified +by an offset in the buffer (rp,fp) and a length (rl,fl): -static void -chn_lockdestroy(pcm_channel *c) -{ - mtx_destroy(&c->mutex); -} + 0 rp,rl fp,fl bufsize + |__________>____________>________| + FREE d READY w FREE -void -chn_lock(pcm_channel *c, const char *file, int line) -{ - _mtx_enter(&c->mutex, MTX_DEF, file, line); -} + READY: data written from the process and ready to be sent to the DAC; + FREE: free part of the buffer. -void -chn_unlock(pcm_channel *c, const char *file, int line) -{ - _mtx_exit(&c->mutex, MTX_DEF, file, line); -} +Both regions can wrap around the end of the buffer. At initialization, +READY is empty, FREE takes all the available space, and dma is +idle. dl contains the length of the current DMA transfer, dl=0 +means that the dma is idle. -void -chn_lockassert(pcm_channel *c, const char *file, int line) -{ - /* _mtx_assert(&c->mutex, MA_OWNED, file, line); */ -} +The two boundaries (rp,fp) in the buffers are advanced by DMA [d] +and write() [w] operations. The first portion of the READY region +is used for DMA transfers. The transfer is started at rp and with +chunks of length dl. During DMA operations, dsp_wr_dmaupdate() +updates rp, rl and fl tracking the ISA DMA engine as the transfer +makes progress. +When a new block is written, fp advances and rl,fl are updated +accordingly. + +The code works as follows: the user write routine dsp_write_body() +fills up the READY region with new data (reclaiming space from the +FREE region) and starts the write DMA engine if inactive. When a +DMA transfer is complete, an interrupt causes dsp_wrintr() to be +called which extends the FREE region and possibly starts the next +transfer. +In some cases, the code tries to track the current status of DMA +operations by calling dsp_wr_dmaupdate() which changes rp, rl and fl. + +The system tries to make all DMA transfers use the same size, +play_blocksize or rec_blocksize. The size is either selected by +the user, or computed by the system to correspond to about .25s of +audio. The blocksize must be within a range which is currently: + + min(5ms, 40 bytes) ... 1/2 buffer size. + +When there aren't enough data (write) or space (read), a transfer +is started with a reduced size. + +To reduce problems in case of overruns, the routine which fills up +the buffer should initialize (e.g. by repeating the last value) a +reasonably long area after the last block so that no noise is +produced on overruns. + + * + */ + + +/* XXX this is broken: in the event a bounce buffer is used, data never + * gets copied in or out of the real buffer. fix requires mods to isa_dma.c + * and possibly fixes to other autodma mode clients + */ static int chn_polltrigger(pcm_channel *c) { snd_dbuf *bs = &c->buffer2nd; - unsigned amt, lim; + unsigned lim = (c->flags & CHN_F_HAS_SIZE)? bs->blksz : 0; + int trig = 0; - CHN_LOCKASSERT(c); - if (c->flags & CHN_F_MAPPED) { - if (sndbuf_getprevblocks(bs) == 0) - return 1; - else - return (sndbuf_getblocks(bs) > sndbuf_getprevblocks(bs))? 1 : 0; - } else { - amt = (c->direction == PCMDIR_PLAY)? sndbuf_getfree(bs) : sndbuf_getready(bs); - lim = (c->flags & CHN_F_HAS_SIZE)? sndbuf_getblksz(bs) : 1; - lim = 0; - return (amt >= lim)? 1 : 0; - } - return 0; + if (c->flags & CHN_F_MAPPED) + trig = ((bs->int_count > bs->prev_int_count) || bs->prev_int_count == 0); + else + trig = (((c->direction == PCMDIR_PLAY)? bs->fl : bs->rl) > lim); + return trig; } static int @@ -101,203 +127,454 @@ chn_pollreset(pcm_channel *c) { snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); - sndbuf_updateprevtotal(bs); + if (c->flags & CHN_F_MAPPED) + bs->prev_int_count = bs->int_count; return 1; } +/* + * chn_dmadone() updates pointers and wakes up any process waiting + * on a select(). Must be called at spltty(). + */ static void -chn_wakeup(pcm_channel *c) +chn_dmadone(pcm_channel *c) { - snd_dbuf *bs = &c->buffer2nd; + snd_dbuf *b = &c->buffer; - CHN_LOCKASSERT(c); - if (sndbuf_getsel(bs)->si_pid && chn_polltrigger(c)) - selwakeup(sndbuf_getsel(bs)); - wakeup(bs); + if (c->direction == PCMDIR_PLAY) + chn_checkunderflow(c); + else + chn_dmaupdate(c); + if (ISA_DMA(b)) + sndbuf_isadmabounce(b); /* sync bounce buffer */ + b->int_count++; } -static int -chn_sleep(pcm_channel *c, char *str, int timeout) +/* + * chn_dmawakeup() wakes up any process sleeping. Separated from + * chn_dmadone() so that wakeup occurs only when feed from a + * secondary buffer to a DMA buffer takes place. Must be called + * at spltty(). + */ +static void +chn_dmawakeup(pcm_channel *c) { - snd_dbuf *bs = &c->buffer2nd; - int ret; - - CHN_LOCKASSERT(c); - ret = msleep(bs, &c->mutex, PRIBIO | PCATCH, str, timeout); + snd_dbuf *b = &c->buffer; - return ret; + wakeup(b); } /* * chn_dmaupdate() tracks the status of a dma transfer, * updating pointers. It must be called at spltty(). + * + * NOTE: when we are using auto dma in the device, rl might become + * negative. */ +DEB (static int chn_updatecount=0); -static unsigned int +static void chn_dmaupdate(pcm_channel *c) { snd_dbuf *b = &c->buffer; - unsigned int delta, old, hwptr, amt; + int delta, hwptr; + DEB (int b_rl=b->rl; int b_fl=b->fl; int b_rp=b->rp; int b_fp=b->fp); - CHN_LOCKASSERT(c); - old = sndbuf_gethwptr(b); hwptr = chn_getptr(c); - delta = (sndbuf_getsize(b) + hwptr - old) % sndbuf_getsize(b); - sndbuf_sethwptr(b, hwptr); - + delta = (b->bufsize + hwptr - b->hp) % b->bufsize; DEB( - if (delta >= ((sndbuf_getsize(b) * 15) / 16)) { + if (delta >= ((b->bufsize * 15) / 16)) { if (!(c->flags & (CHN_F_CLOSING | CHN_F_ABORTING))) - device_printf(c->parent->dev, "hwptr went backwards %d -> %d\n", old, hwptr); + device_printf(c->parent->dev, "hwptr went backwards %d -> %d\n", b->hp, hwptr); } - ); - + ) if (c->direction == PCMDIR_PLAY) { - amt = MIN(delta, sndbuf_getready(b)); - if (amt > 0) - sndbuf_dispose(b, NULL, amt); + delta = (b->bufsize + hwptr - b->rp) % b->bufsize; + b->rp = hwptr; + b->rl -= delta; + b->fl += delta; + + if (b->rl < 0) { + DEB(printf("OUCH!(%d) rl %d(%d) delta %d bufsize %d hwptr %d rp %d(%d)\n", chn_updatecount++, b->rl, b_rl, delta, b->bufsize, hwptr, b->rp, b_rp)); + } } else { - amt = MIN(delta, sndbuf_getfree(b)); - if (amt > 0) - sndbuf_acquire(b, NULL, amt); + delta = (b->bufsize + hwptr - b->fp) % b->bufsize; + b->fp = hwptr; + b->rl += delta; + b->fl -= delta; + if (b->fl < 0) { + DEB(printf("OUCH!(%d) fl %d(%d) delta %d bufsize %d hwptr %d fp %d(%d)\n", chn_updatecount++, b->fl, b_fl, delta, b->bufsize, hwptr, b->fp, b_fp)); + } } - - return delta; + b->hp = hwptr; + b->total += delta; } +/* + * Check channel for underflow occured. Reset DMA buffer in case of + * underflow, so that new data can go into the buffer. It must be + * called at spltty(). + */ void -chn_wrupdate(pcm_channel *c) +chn_checkunderflow(pcm_channel *c) { - int ret; - - CHN_LOCKASSERT(c); - KASSERT(c->direction == PCMDIR_PLAY, ("chn_wrupdate on bad channel")); - - if ((c->flags & CHN_F_MAPPED) || !(c->flags & CHN_F_TRIGGERED)) - return; - chn_dmaupdate(c); - ret = chn_wrfeed(c); - /* tell the driver we've updated the primary buffer */ - chn_trigger(c, PCMTRIG_EMLDMAWR); - if (ret) - printf("chn_wrfeed: %d\n", ret); + snd_dbuf *b = &c->buffer; + if (b->underflow) { + DEB(printf("Clear underflow condition\n")); + /* + * The DMA keeps running even after underflow occurs. + * Hence the value returned by chn_getptr() here soon + * gets a lag when we get back to chn_write(). Although + * there are no easy and precise methods to figure out + * the lag, a quarter of b->bufsize would be a fair + * choice, provided that a DMA interrupt generates upon + * each transfer of a half b->bufsize. + */ + b->rp = chn_getptr(c); + b->fp = (b->rp + b->bufsize / 4) % b->bufsize; + b->rl = b->bufsize / 4; + b->fl = b->bufsize - b->rl; + b->underflow = 0; + } else { + chn_dmaupdate(c); + } } +/* + * Feeds new data to the write dma buffer. Can be called in the bottom half. + * Hence must be called at spltty. + */ int chn_wrfeed(pcm_channel *c) { snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - unsigned int ret, amt; + int a, l, lacc; + + /* ensure we always have a whole number of samples */ + a = (1 << c->align) - 1; + lacc = 0; + if (c->flags & CHN_F_MAPPED) { + bs->rl = min(b->blksz, b->fl); + bs->fl = 0; + a = 0; + } + DEB(if (c->flags & CHN_F_CLOSING) + printf("b: [rl: %d, rp %d, fl %d, fp %d]; bs: [rl: %d, rp %d, fl %d, fp %d]\n", + b->rl, b->rp, b->fl, b->fp, bs->rl, bs->rp, bs->fl, bs->fp)); + /* Don't allow write unaligned data */ + while (bs->rl > a && b->fl > a) { + /* ensure we always have a whole number of samples */ + l = min(min(bs->rl, bs->bufsize - bs->rp), min(b->fl, b->bufsize - b->fp)) & ~a; + if (l == 0) + return lacc; + /* Move the samples, update the markers and pointers. */ + bcopy(bs->buf + bs->rp, b->buf + b->fp, l); + bs->fl += l; + bs->rl -= l; + bs->rp = (bs->rp + l) % bs->bufsize; + b->rl += l; + b->fl -= l; + b->fp = (b->fp + l) % b->bufsize; + /* Clear the new space in the secondary buffer. */ + sndbuf_clear(bs, l); + /* Accumulate the total bytes of the moved samples. */ + lacc += l; + /* A feed to the DMA buffer is equivalent to an interrupt. */ + bs->total += l; + if (c->flags & CHN_F_MAPPED) { + if (bs->total - bs->prev_total >= bs->blksz) { + bs->prev_total = bs->total; + bs->int_count++; + c->blocks++; + } + } else + bs->int_count++; + if (bs->sel.si_pid && chn_polltrigger(c)) + selwakeup(&bs->sel); + } - CHN_LOCKASSERT(c); - DEB( - if (c->flags & CHN_F_CLOSING) { - sndbuf_dump(b, "b", 0x02); - sndbuf_dump(bs, "bs", 0x02); - }) + return lacc; +} - amt = sndbuf_getfree(b); - ret = (amt > 0)? sndbuf_feed(bs, b, c, amt) : ENOSPC; - if (ret == 0) - chn_wakeup(c); +/* Feeds new data to the secondary write buffer. */ +static int +chn_wrfeed2nd(pcm_channel *c, struct uio *buf) +{ + snd_dbuf *bs = &c->buffer2nd; + int l, w, wacc, hl; + u_int8_t hackbuf[64]; + + /* The DMA buffer may have some space. */ + while (chn_wrfeed(c) > 0); + + /* ensure we always have a whole number of samples */ + wacc = 0; + hl = 0; + while (buf->uio_resid > 0 && bs->fl > 64) { + /* + * The size of the data to move here does not have to be + * aligned. We take care of it upon moving the data to a + * DMA buffer. + */ + l = min(bs->fl, bs->bufsize - bs->fp); + /* Move the samples, update the markers and pointers. */ + if (l < 64) { + w = FEEDER_FEED(c->feeder, c, hackbuf, 64, buf); + l = min(w, bs->bufsize - bs->fp); + bcopy(hackbuf, bs->buf + bs->fp, l); + if (w > l) + bcopy(hackbuf + l, bs->buf, w - l); + } else + w = FEEDER_FEED(c->feeder, c, bs->buf + bs->fp, l, buf); + if (w == 0) + panic("no feed"); + bs->rl += w; + bs->fl -= w; + bs->fp = (bs->fp + w) % bs->bufsize; + /* Accumulate the total bytes of the moved samples. */ + wacc += w; + + /* If any pcm data gets moved, push it to the DMA buffer. */ + if (w > 0) + while (chn_wrfeed(c) > 0); + } - return ret; + return wacc; } +/* + * Write interrupt routine. Can be called from other places (e.g. + * to start a paused transfer), but with interrupts disabled. + */ static void chn_wrintr(pcm_channel *c) { - int ret; + snd_dbuf *b = &c->buffer; - CHN_LOCKASSERT(c); - /* update pointers in primary buffer */ - chn_dmaupdate(c); - /* ...and feed from secondary to primary */ - ret = chn_wrfeed(c); - /* tell the driver we've updated the primary buffer */ - chn_trigger(c, PCMTRIG_EMLDMAWR); - if (ret) - printf("chn_wrfeed: %d\n", ret); + if (b->underflow && !(c->flags & CHN_F_MAPPED)) { +/* printf("underflow return\n"); +*/ return; /* nothing new happened */ + } + if (b->dl) + chn_dmadone(c); + + /* + * start another dma operation only if have ready data in the buffer, + * there is no pending abort, have a full-duplex device, or have a + * half duplex device and there is no pending op on the other side. + * + * Force transfers to be aligned to a boundary of 4, which is + * needed when doing stereo and 16-bit. + */ + + /* Check underflow and update the pointers. */ + chn_checkunderflow(c); + + /* + * Fill up the DMA buffer, followed by waking up the top half. + * If some of the pcm data in uio are still left, the top half + * goes to sleep by itself. + */ + if (c->flags & CHN_F_MAPPED) + chn_wrfeed(c); + else { + while (chn_wrfeed(c) > 0); + sndbuf_clear(b, b->fl); + } + chn_dmawakeup(c); + if (c->flags & CHN_F_TRIGGERED) { + chn_dmaupdate(c); + /* + * check if we need to reprogram the DMA on the sound card. + * This happens if the size has changed from zero + */ + if (b->dl == 0) { + /* Start DMA operation */ + b->dl = b->blksz; /* record new transfer size */ + chn_trigger(c, PCMTRIG_START); + } + /* + * Emulate writing by DMA, i.e. transfer the pcm data from + * the emulated-DMA buffer to the device itself. + */ + chn_trigger(c, PCMTRIG_EMLDMAWR); + if (b->rl < b->dl) { + DEB(printf("near underflow (%d < %d), %d\n", b->rl, b->dl, b->fl)); + /* + * we are near to underflow condition, so to prevent + * audio 'clicks' clear next b->fl bytes + */ + sndbuf_clear(b, b->fl); + if (b->rl < DMA_ALIGN_THRESHOLD) + b->underflow = 1; + } + } else { + /* cannot start a new dma transfer */ + DEB(printf("underflow, flags 0x%08x rp %d rl %d\n", c->flags, b->rp, b->rl)); + if (b->dl) { /* DMA was active */ + b->underflow = 1; /* set underflow flag */ + sndbuf_clear(b, b->bufsize); + } + } } /* - * user write routine - uiomove data into secondary buffer, trigger if necessary - * if blocking, sleep, rinse and repeat. + * user write routine * - * called externally, so must handle locking + * advance the boundary between READY and FREE, fill the space with + * uiomove(), and possibly start DMA. Do the above until the transfer + * is complete. + * + * To minimize latency in case a pending DMA transfer is about to end, + * we do the transfer in pieces of increasing sizes, extending the + * READY area at every checkpoint. In the (necessary) assumption that + * memory bandwidth is larger than the rate at which the dma consumes + * data, we reduce the latency to something proportional to the length + * of the first piece, while keeping the overhead low and being able + * to feed the DMA with large blocks. */ int chn_write(pcm_channel *c, struct uio *buf) { - int ret, timeout, newsize, count, sz; - snd_dbuf *bs = &c->buffer2nd; + int ret = 0, timeout, res, newsize, count; + long s; + snd_dbuf *b = &c->buffer; + snd_dbuf *bs = &c->buffer2nd; + + if (c->flags & CHN_F_WRITING) { + /* This shouldn't happen and is actually silly + * - will never wake up, just timeout; why not sleep on b? + */ + tsleep(&s, PZERO, "pcmwrW", hz); + return EBUSY; + } + c->flags |= CHN_F_WRITING; + c->flags &= ~CHN_F_ABORTING; + s = spltty(); - 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->parent->dev, "broken app, nbio and tried to write %d bytes with fragsz %d\n", - buf->uio_resid, sndbuf_getblksz(bs))); + if ((c->flags & CHN_F_NBIO) && buf->uio_resid > bs->blksz) { + DEB(printf("pcm warning: broken app, nbio and tried to write %d bytes with fragsz %d\n", + buf->uio_resid, bs->blksz)); newsize = 16; while (newsize < min(buf->uio_resid, CHN_2NDBUFMAXSIZE / 2)) newsize <<= 1; - chn_setblocksize(c, sndbuf_getblkcnt(bs), newsize); - DEB(device_printf(c->parent->dev, "frags reset to %d x %d\n", sndbuf_getblkcnt(bs), sndbuf_getblksz(bs))); + chn_setblocksize(c, bs->blkcnt, newsize); + DEB(printf("pcm warning: frags reset to %d x %d\n", bs->blkcnt, bs->blksz)); } - ret = 0; - count = hz; - while (!ret && (buf->uio_resid > 0) && (count > 0)) { - sz = sndbuf_getfree(bs); - if (sz == 0) { - if (c->flags & CHN_F_NBIO) - ret = EWOULDBLOCK; - else { - timeout = (hz * sndbuf_getblksz(bs)) / (sndbuf_getspd(bs) * sndbuf_getbps(bs)); - if (timeout < 1) - timeout = 1; - ret = chn_sleep(c, "pcmwr", timeout); - if (ret == EWOULDBLOCK) { - count -= timeout; - ret = 0; - } else if (ret == 0) - count = hz; - } - } else { - sz = MIN(sz, buf->uio_resid); - KASSERT(sz > 0, ("confusion in chn_write")); - /* printf("sz: %d\n", sz); */ - ret = sndbuf_uiomove(bs, buf, sz); - if (ret == 0 && !(c->flags & CHN_F_TRIGGERED)) - chn_start(c, 0); - } - } - /* printf("ret: %d left: %d\n", ret, buf->uio_resid); */ + /* + * Fill up the secondary and DMA buffer. + * chn_wrfeed*() takes care of the alignment. + */ - if (count <= 0) { - c->flags |= CHN_F_DEAD; - device_printf(c->parent->dev, "play interrupt timeout, channel dead\n"); - } + /* Check for underflow before writing into the buffers. */ + chn_checkunderflow(c); + while (chn_wrfeed2nd(c, buf) > 0); + if ((c->flags & CHN_F_NBIO) && (buf->uio_resid > 0)) + ret = EAGAIN; + /* Start playing if not yet. */ + if (!b->dl) + chn_start(c, 0); + + if (ret == 0) { + count = hz; + /* Wait until all samples are played in blocking mode. */ + while ((buf->uio_resid > 0) && (count > 0)) { + /* Check for underflow before writing into the buffers. */ + chn_checkunderflow(c); + /* Fill up the buffers with new pcm data. */ + res = buf->uio_resid; + while (chn_wrfeed2nd(c, buf) > 0); + if (buf->uio_resid < res) + count = hz; + else + count--; + + /* Have we finished to feed the secondary buffer? */ + if (buf->uio_resid == 0) + break; + + /* Wait for new free space to write new pcm samples. */ + /* splx(s); */ + timeout = 1; /*(buf->uio_resid >= b->dl)? hz / 20 : 1; */ + ret = tsleep(b, PRIBIO | PCATCH, "pcmwr", timeout); + /* s = spltty(); */ + /* if (ret == EINTR) chn_abort(c); */ + if (ret == EINTR || ret == ERESTART) + break; + } + if (count == 0) { + c->flags |= CHN_F_DEAD; + device_printf(c->parent->dev, "play interrupt timeout, channel dead\n"); + } + } else + ret = 0; + c->flags &= ~CHN_F_WRITING; + splx(s); return ret; } +/* + * SOUND INPUT + * + +The input part is similar to the output one, with a circular buffer +split in two regions, and boundaries advancing because of read() calls +[r] or dma operation [d]. At initialization, as for the write +routine, READY is empty, and FREE takes all the space. + + 0 rp,rl fp,fl bufsize + |__________>____________>________| + FREE r READY d FREE + +Operation is as follows: upon user read (dsp_read_body()) a DMA read +is started if not already active (marked by b->dl > 0), +then as soon as data are available in the READY region they are +transferred to the user buffer, thus advancing the boundary between FREE +and READY. Upon interrupts, caused by a completion of a DMA transfer, +the READY region is extended and possibly a new transfer is started. + +When necessary, dsp_rd_dmaupdate() is called to advance fp (and update +rl,fl accordingly). Upon user reads, rp is advanced and rl,fl are +updated accordingly. + +The rules to choose the size of the new DMA area are similar to +the other case, with a preferred constant transfer size equal to +rec_blocksize, and fallback to smaller sizes if no space is available. + + */ + static int -chn_rddump(pcm_channel *c, unsigned int cnt) +chn_rddump(pcm_channel *c, int cnt) { snd_dbuf *b = &c->buffer; - - CHN_LOCKASSERT(c); - sndbuf_setxrun(b, sndbuf_getxrun(b) + cnt); - return sndbuf_dispose(b, NULL, cnt); + int maxover, ss; + + ss = 1; + ss <<= (b->fmt & AFMT_STEREO)? 1 : 0; + ss <<= (b->fmt & AFMT_16BIT)? 1 : 0; + maxover = c->speed * ss; + + b->overrun += cnt; + if (b->overrun > maxover) { + device_printf(c->parent->dev, "record overrun, dumping %d bytes\n", + b->overrun); + b->overrun = 0; + } + b->rl -= cnt; + b->fl += cnt; + b->rp = (b->rp + cnt) % b->bufsize; + return cnt; } /* @@ -309,39 +586,68 @@ chn_rdfeed(pcm_channel *c) { snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - int ret; - - CHN_LOCKASSERT(c); - DEB( - if (c->flags & CHN_F_CLOSING) { - sndbuf_dump(b, "b", 0x02); - sndbuf_dump(bs, "bs", 0x02); - }) + int l, lacc; - ret = sndbuf_feed(b, bs, c, sndbuf_getblksz(b)); - - if (ret == 0) - chn_wakeup(c); + /* + printf("b: [rl: %d, rp %d, fl %d, fp %d]; bs: [rl: %d, rp %d, fl %d, fp %d]\n", + b->rl, b->rp, b->fl, b->fp, bs->rl, bs->rp, bs->fl, bs->fp); + */ + /* ensure we always have a whole number of samples */ + lacc = 0; + while (bs->fl >= DMA_ALIGN_THRESHOLD && b->rl >= DMA_ALIGN_THRESHOLD) { + l = min(min(bs->fl, bs->bufsize - bs->fp), min(b->rl, b->bufsize - b->rp)) & DMA_ALIGN_MASK; + /* Move the samples, update the markers and pointers. */ + bcopy(b->buf + b->rp, bs->buf + bs->fp, l); + bs->fl -= l; + bs->rl += l; + bs->fp = (bs->fp + l) % bs->bufsize; + b->rl -= l; + b->fl += l; + b->rp = (b->rp + l) % b->bufsize; + /* Accumulate the total bytes of the moved samples. */ + lacc += l; + /* A feed from the DMA buffer is equivalent to an interrupt. */ + bs->int_count++; + if (bs->sel.si_pid && chn_polltrigger(c)) + selwakeup(&bs->sel); + } - return ret; + return lacc; } -void -chn_rdupdate(pcm_channel *c) +/* Feeds new data from the secondary read buffer. */ +static int +chn_rdfeed2nd(pcm_channel *c, struct uio *buf) { - int ret; - - CHN_LOCKASSERT(c); - KASSERT(c->direction == PCMDIR_REC, ("chn_rdupdate on bad channel")); - - if ((c->flags & CHN_F_MAPPED) || !(c->flags & CHN_F_TRIGGERED)) - return; - chn_trigger(c, PCMTRIG_EMLDMARD); - chn_dmaupdate(c); - ret = chn_rdfeed(c); - if (ret) - printf("chn_rdfeed: %d\n", ret); + snd_dbuf *bs = &c->buffer2nd; + int l, w, wacc; + + /* ensure we always have a whole number of samples */ + wacc = 0; + while ((buf->uio_resid > 0) && (bs->rl > 0)) { + /* The DMA buffer may have pcm data. */ + /* while (chn_rdfeed(c) > 0); */ + /* + * The size of the data to move here does not have to be + * aligned. We take care of it upon moving the data to a + * DMA buffer. + */ + l = min(bs->rl, bs->bufsize - bs->rp); + /* Move the samples, update the markers and pointers. */ + w = FEEDER_FEED(c->feeder, c, bs->buf + bs->rp, l, buf); + if (w == 0) + panic("no feed"); + bs->fl += w; + bs->rl -= w; + bs->rp = (bs->rp + w) % bs->bufsize; + /* Clear the new space in the secondary buffer. */ + sndbuf_clear(bs, l); + /* Accumulate the total bytes of the moved samples. */ + bs->total += w; + wacc += w; + } + return wacc; } /* read interrupt routine. Must be called with interrupts blocked. */ @@ -349,103 +655,185 @@ static void chn_rdintr(pcm_channel *c) { snd_dbuf *b = &c->buffer; - int ret; - CHN_LOCKASSERT(c); - /* tell the driver to update the primary buffer if non-dma */ - chn_trigger(c, PCMTRIG_EMLDMARD); - /* update pointers in primary buffer */ + if (b->dl) chn_dmadone(c); + + DEB(printf("rdintr: start dl %d, rp:rl %d:%d, fp:fl %d:%d\n", + b->dl, b->rp, b->rl, b->fp, b->fl)); + + /* Update the pointers. */ chn_dmaupdate(c); - /* ...and feed from primary to secondary */ - ret = chn_rdfeed(c); - if (ret) - chn_rddump(c, sndbuf_getblksz(b)); + + /* + * Suck up the DMA buffer, followed by waking up the top half. + * If some of the pcm data in the secondary buffer are still left, + * the top half goes to sleep by itself. + */ + while(chn_rdfeed(c) > 0); + chn_dmawakeup(c); + + if (b->fl < b->dl) { + DEB(printf("near overflow (%d < %d), %d\n", b->fl, b->dl, b->rl)); + chn_rddump(c, b->blksz - b->fl); + } + + if (c->flags & CHN_F_TRIGGERED) { + /* + * check if we need to reprogram the DMA on the sound card. + * This happens if the size has changed from zero + */ + if (b->dl == 0) { + /* Start DMA operation */ + b->dl = b->blksz; /* record new transfer size */ + chn_trigger(c, PCMTRIG_START); + } + /* + * Emulate writing by DMA, i.e. transfer the pcm data from + * the emulated-DMA buffer to the device itself. + */ + chn_trigger(c, PCMTRIG_EMLDMARD); + } else { + if (b->dl) { /* was active */ + b->dl = 0; + chn_trigger(c, PCMTRIG_STOP); + chn_dmaupdate(c); + } + } } /* - * user read routine - trigger if necessary, uiomove data from secondary buffer - * if blocking, sleep, rinse and repeat. + * body of user-read routine * - * called externally, so must handle locking + * Start DMA if not active; wait for READY not empty. + * Transfer data from READY region using uiomove(), advance boundary + * between FREE and READY. Repeat until transfer is complete. + * + * To avoid excessive latency in freeing up space for the DMA + * engine, transfers are done in blocks of increasing size, so that + * the latency is proportional to the size of the smallest block, but + * we have a low overhead and are able to feed the dma engine with + * large blocks. + * + * NOTE: in the current version, read will not return more than + * blocksize bytes at once (unless more are already available), to + * avoid that requests using very large buffers block for too long. */ int chn_read(pcm_channel *c, struct uio *buf) { - int ret, timeout, sz, count; + int ret = 0, timeout, limit, res, count; + long s; + snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); - if (!(c->flags & CHN_F_TRIGGERED)) + if (c->flags & CHN_F_READING) { + /* This shouldn't happen and is actually silly */ + tsleep(&s, PZERO, "pcmrdR", hz); + return (EBUSY); + } + + s = spltty(); + + /* Store the initial size in the uio. */ + res = buf->uio_resid; + + c->flags |= CHN_F_READING; + c->flags &= ~CHN_F_ABORTING; + + /* suck up the DMA and secondary buffers. */ + while (chn_rdfeed2nd(c, buf) > 0); + + if (buf->uio_resid == 0) + goto skip; + + limit = res - b->blksz; + if (limit < 0) + limit = 0; + + /* Start capturing if not yet. */ + if ((!bs->rl || !b->rl) && !b->dl) chn_start(c, 0); - ret = 0; - count = hz; - while (!ret && (buf->uio_resid > 0) && (count > 0)) { - sz = MIN(buf->uio_resid, sndbuf_getblksz(bs)); + if (!(c->flags & CHN_F_NBIO)) { + count = hz; + /* Wait until all samples are captured. */ + 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--; - if (sz <= sndbuf_getready(bs)) { - ret = sndbuf_uiomove(bs, buf, sz); - } else { - if (c->flags & CHN_F_NBIO) - ret = EWOULDBLOCK; - else { - timeout = (hz * sndbuf_getblksz(bs)) / (sndbuf_getspd(bs) * sndbuf_getbps(bs)); - if (timeout < 1) - timeout = 1; - CHN_UNLOCK(c); - ret = chn_sleep(c, "pcmrd", timeout); - CHN_LOCK(c); - if (ret == EWOULDBLOCK) { - count -= timeout; - ret = 0; - } - } + /* Have we finished to feed the uio? */ + if (buf->uio_resid == 0) + break; + + /* Wait for new pcm samples. */ + /* splx(s); */ + timeout = (buf->uio_resid - limit >= b->dl)? hz / 20 : 1; + ret = tsleep(b, PRIBIO | PCATCH, "pcmrd", 1); + /* s = spltty(); */ + /* if (ret == EINTR) chn_abort(c); */ + 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) + ret = EAGAIN; } - if (count <= 0) { - c->flags |= CHN_F_DEAD; - device_printf(c->parent->dev, "record interrupt timeout, channel dead\n"); - } - +skip: + c->flags &= ~CHN_F_READING; + splx(s); return ret; } void chn_intr(pcm_channel *c) { - CHN_LOCK(c); + if (c->flags & CHN_F_INIT) + chn_reinit(c); if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); - CHN_UNLOCK(c); } u_int32_t chn_start(pcm_channel *c, int force) { - u_int32_t i; + u_int32_t r, s; snd_dbuf *b = &c->buffer; - snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); - /* if we're running, or if we're prevented from triggering, bail */ - if ((c->flags & CHN_F_TRIGGERED) || (c->flags & CHN_F_NOTRIGGER)) - return EINVAL; - - i = (c->direction == PCMDIR_PLAY)? sndbuf_getready(bs) : sndbuf_getfree(bs); - if (force || (i >= sndbuf_getblksz(b))) { - c->flags |= CHN_F_TRIGGERED; - if (c->direction == PCMDIR_PLAY) - chn_wrfeed(c); - sndbuf_setrun(b, 1); - chn_trigger(c, PCMTRIG_START); - return 0; + r = 0; + s = spltty(); + if (b->dl == 0 && !(c->flags & CHN_F_NOTRIGGER)) { + if (c->direction == PCMDIR_PLAY) { + if (!(c->flags & CHN_F_MAPPED)) + while (chn_wrfeed(c) > 0); /* Fill up the DMA buffer. */ + if (force || (b->rl >= b->blksz)) + r = CHN_F_TRIGGERED; + } else { + if (!(c->flags & CHN_F_MAPPED)) + while (chn_rdfeed(c) > 0); /* Suck up the DMA buffer. */ + if (force || (b->fl >= b->blksz)) + r = CHN_F_TRIGGERED; + } + c->flags |= r; + chn_intr(c); } - - return 0; + splx(s); + return r; } void @@ -467,49 +855,64 @@ chn_resetbuf(pcm_channel *c) int chn_sync(pcm_channel *c, int threshold) { - u_long rdy; + u_long s, rdy; int ret; + snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); for (;;) { - chn_wrupdate(c); - rdy = (c->direction == PCMDIR_PLAY)? sndbuf_getfree(bs) : sndbuf_getready(bs); + s = spltty(); + chn_checkunderflow(c); + while (chn_wrfeed(c) > 0); + rdy = (c->direction == PCMDIR_PLAY)? bs->fl : bs->rl; if (rdy <= threshold) { - ret = chn_sleep(c, "pcmsyn", 1); + ret = tsleep((caddr_t)b, PRIBIO | PCATCH, "pcmsyn", 1); + splx(s); if (ret == ERESTART || ret == EINTR) { DEB(printf("chn_sync: tsleep returns %d\n", ret)); return -1; } - } else - break; + } else break; } + splx(s); return 0; } -/* called externally, handle locking */ int chn_poll(pcm_channel *c, int ev, struct proc *p) { + snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; + u_long s; int ret; - CHN_LOCKASSERT(c); - if (!(c->flags & CHN_F_MAPPED) && !(c->flags & CHN_F_TRIGGERED)) - chn_start(c, 1); + s = spltty(); + if (!(c->flags & CHN_F_MAPPED)) { + if (c->direction == PCMDIR_PLAY) { + /* Fill up the DMA buffer. */ + chn_checkunderflow(c); + while (chn_wrfeed(c) > 0); + } else { + /* Suck up the DMA buffer. */ + chn_dmaupdate(c); + while (chn_rdfeed(c) > 0); + } + if (!b->dl) + chn_start(c, 1); + } ret = 0; if (chn_polltrigger(c) && chn_pollreset(c)) ret = ev; else - selrecord(p, sndbuf_getsel(bs)); + selrecord(p, &bs->sel); + splx(s); return ret; } /* - * chn_abort terminates a running dma transfer. it may sleep up to 200ms. - * it returns the number of bytes that have not been transferred. - * - * called from: dsp_close, dsp_ioctl, with both buffers locked + * chn_abort is a non-blocking function which aborts a pending + * DMA transfer and flushes the buffers. + * It returns the number of bytes that have not been transferred. */ int chn_abort(pcm_channel *c) @@ -518,74 +921,65 @@ chn_abort(pcm_channel *c) snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); - if (!(c->flags & CHN_F_TRIGGERED)) + if (!b->dl) return 0; c->flags |= CHN_F_ABORTING; - - /* wait up to 200ms for the secondary buffer to empty */ - cnt = 10; - while ((sndbuf_getready(bs) > 0) && (cnt-- > 0)) { - chn_sleep(c, "pcmabr", hz / 50); - } - c->flags &= ~CHN_F_TRIGGERED; - /* kill the channel */ + cnt = 10; + while (!b->underflow && (cnt-- > 0)) + tsleep((caddr_t)b, PRIBIO | PCATCH, "pcmabr", hz / 50); chn_trigger(c, PCMTRIG_ABORT); - sndbuf_setrun(b, 0); + b->dl = 0; chn_dmaupdate(c); - missing = sndbuf_getready(bs) + sndbuf_getready(b); - - c->flags &= ~CHN_F_ABORTING; - return missing; + missing = bs->rl + b->rl; + return missing; } /* * this routine tries to flush the dma transfer. It is called * on a close. We immediately abort any read DMA * operation, and then wait for the play buffer to drain. - * - * called from: dsp_close */ int chn_flush(pcm_channel *c) { - int ret, count, resid, resid_p; + int ret, count, s, resid, resid_p; snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - CHN_LOCKASSERT(c); - KASSERT(c->direction == PCMDIR_PLAY, ("chn_wrupdate on bad channel")); DEB(printf("chn_flush c->flags 0x%08x\n", c->flags)); - if (!(c->flags & CHN_F_TRIGGERED)) + if (!b->dl) return 0; - c->flags |= CHN_F_CLOSING; - resid = sndbuf_getready(bs) + sndbuf_getready(b); - resid_p = resid; - count = 10; - ret = 0; - while ((count > 0) && (resid > sndbuf_getsize(b)) && (ret == 0)) { - /* still pending output data. */ - ret = chn_sleep(c, "pcmflu", hz / 10); - if (ret == EWOULDBLOCK) - ret = 0; - if (ret == 0) { - resid = sndbuf_getready(bs) + sndbuf_getready(b); + c->flags |= CHN_F_CLOSING; + if (c->direction == PCMDIR_REC) + chn_abort(c); + else { + resid = b->rl + bs->rl; + resid_p = resid; + count = 10; + while ((count > 0) && (resid > 0) && !b->underflow) { + /* still pending output data. */ + ret = tsleep((caddr_t)b, PRIBIO | PCATCH, "pcmflu", hz / 10); + if (ret == EINTR || ret == ERESTART) { + DEB(printf("chn_flush: tsleep returns %d\n", ret)); + return ret; + } + s = spltty(); + chn_dmaupdate(c); + splx(s); + DEB(printf("chn_flush: now rl = %d, fl = %d, resid = %d\n", b->rl, b->fl, resid)); + resid = b->rl + bs->rl; if (resid >= resid_p) count--; resid_p = resid; - } - } - if (count == 0) - DEB(printf("chn_flush: timeout\n")); - - c->flags &= ~CHN_F_TRIGGERED; - /* kill the channel */ - chn_trigger(c, PCMTRIG_ABORT); - sndbuf_setrun(b, 0); - + } + if (count == 0) + DEB(printf("chn_flush: timeout flushing dbuf_out, cnt 0x%x flags 0x%x\n", b->rl, c->flags)); + if (b->dl) + chn_abort(c); + } c->flags &= ~CHN_F_CLOSING; return 0; } @@ -606,7 +1000,7 @@ chn_reset(pcm_channel *c, u_int32_t fmt) { int hwspd, r = 0; - CHN_LOCKASSERT(c); + chn_abort(c); c->flags &= CHN_F_RESET; CHANNEL_RESET(c->methods, c->devinfo); if (fmt) { @@ -621,11 +1015,25 @@ chn_reset(pcm_channel *c, u_int32_t fmt) r = chn_setvolume(c, 100, 100); } r = chn_setblocksize(c, 0, 0); - if (r == 0) { - chn_resetbuf(c); - CHANNEL_RESETDONE(c->methods, c->devinfo); + if (r) + return r; + chn_resetbuf(c); + CHANNEL_RESETDONE(c->methods, c->devinfo); + /* c->flags |= CHN_F_INIT; */ + return 0; +} + +int +chn_reinit(pcm_channel *c) +{ + if ((c->flags & CHN_F_INIT) && CANCHANGE(c)) { + chn_setformat(c, c->format); + chn_setspeed(c, c->speed); + chn_setvolume(c, (c->volume >> 8) & 0xff, c->volume & 0xff); + c->flags &= ~CHN_F_INIT; + return 1; } - return r; + return 0; } int @@ -635,7 +1043,6 @@ chn_init(pcm_channel *c, void *devinfo, int dir) snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - chn_lockinit(c); /* Initialize the hardware and DMA buffer first. */ c->feeder = NULL; fc = feeder_getclass(NULL); @@ -644,74 +1051,58 @@ chn_init(pcm_channel *c, void *devinfo, int dir) if (chn_addfeeder(c, fc, NULL)) return EINVAL; - sndbuf_setup(bs, NULL, 0); - if (sndbuf_init(b, c->name, "primary")) - return ENOMEM; - if (sndbuf_init(bs, c->name, "secondary")) { - sndbuf_destroy(b); - return ENOMEM; - } c->flags = 0; c->feederflags = 0; - c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, dir); - if (c->devinfo == NULL) { - sndbuf_destroy(bs); - sndbuf_destroy(b); + c->buffer.chan = -1; + c->devinfo = CHANNEL_INIT(c->methods, devinfo, &c->buffer, c, dir); + if (c->devinfo == NULL) return ENODEV; - } - if (sndbuf_getsize(b) == 0) { - sndbuf_destroy(bs); - sndbuf_destroy(b); + if (c->buffer.bufsize == 0) return ENOMEM; - } chn_setdir(c, dir); /* And the secondary buffer. */ + bs->buf = NULL; sndbuf_setfmt(b, AFMT_U8); sndbuf_setfmt(bs, AFMT_U8); - CHN_UNLOCK(c); + bs->bufsize = 0; return 0; } int chn_kill(pcm_channel *c) { - snd_dbuf *b = &c->buffer; - snd_dbuf *bs = &c->buffer2nd; - - CHN_LOCK(c); if (c->flags & CHN_F_TRIGGERED) chn_trigger(c, PCMTRIG_ABORT); while (chn_removefeeder(c) == 0); if (CHANNEL_FREE(c->methods, c->devinfo)) sndbuf_free(&c->buffer); c->flags |= CHN_F_DEAD; - sndbuf_destroy(bs); - sndbuf_destroy(b); - chn_lockdestroy(c); return 0; } int chn_setdir(pcm_channel *c, int dir) { - snd_dbuf *b = &c->buffer; int r; - CHN_LOCKASSERT(c); c->direction = dir; r = CHANNEL_SETDIR(c->methods, c->devinfo, c->direction); - if (!r && ISA_DMA(b)) - sndbuf_isadmasetdir(b, c->direction); + if (!r && ISA_DMA(&c->buffer)) + c->buffer.dir = (dir == PCMDIR_PLAY)? ISADMA_WRITE : ISADMA_READ; return r; } int chn_setvolume(pcm_channel *c, int left, int right) { - CHN_LOCKASSERT(c); /* could add a feeder for volume changing if channel returns -1 */ + if (CANCHANGE(c)) { + c->volume = (left << 8) | right; + return 0; + } c->volume = (left << 8) | right; + c->flags |= CHN_F_INIT; return 0; } @@ -723,21 +1114,19 @@ chn_setspeed(pcm_channel *c, int speed) snd_dbuf *bs = &c->buffer2nd; int r, delta; - CHN_LOCKASSERT(c); DEB(printf("want speed %d, ", speed)); if (speed <= 0) return EINVAL; if (CANCHANGE(c)) { - r = 0; c->speed = speed; - sndbuf_setspd(bs, speed); - RANGE(speed, chn_getcaps(c)->minspeed, chn_getcaps(c)->maxspeed); - sndbuf_setspd(b, speed); - DEB(printf("try speed %d, ", sndbuf_getspd(b))); - sndbuf_setspd(b, CHANNEL_SETSPEED(c->methods, c->devinfo, sndbuf_getspd(b))); - DEB(printf("got speed %d, ", sndbuf_getspd(b))); - - delta = sndbuf_getspd(b) - sndbuf_getspd(bs); + b->spd = speed; + bs->spd = speed; + RANGE(b->spd, chn_getcaps(c)->minspeed, chn_getcaps(c)->maxspeed); + DEB(printf("try speed %d, ", b->spd)); + b->spd = CHANNEL_SETSPEED(c->methods, c->devinfo, b->spd); + DEB(printf("got speed %d, ", b->spd)); + + delta = b->spd - bs->spd; if (delta < 0) delta = -delta; @@ -745,37 +1134,40 @@ chn_setspeed(pcm_channel *c, int speed) if (delta > 500) c->feederflags |= 1 << FEEDER_RATE; else - sndbuf_setspd(bs, sndbuf_getspd(b)); + bs->spd = b->spd; r = chn_buildfeeder(c); DEB(printf("r = %d\n", r)); if (r) - goto out; + return r; r = chn_setblocksize(c, 0, 0); if (r) - goto out; + return r; if (!(c->feederflags & (1 << FEEDER_RATE))) - goto out; + return 0; - r = EINVAL; f = chn_findfeeder(c, FEEDER_RATE); DEB(printf("feedrate = %p\n", f)); if (f == NULL) - goto out; + return EINVAL; - r = FEEDER_SET(f, FEEDRATE_SRC, sndbuf_getspd(bs)); - DEB(printf("feeder_set(FEEDRATE_SRC, %d) = %d\n", sndbuf_getspd(bs), r)); + r = FEEDER_SET(f, FEEDRATE_SRC, bs->spd); + DEB(printf("feeder_set(FEEDRATE_SRC, %d) = %d\n", bs->spd, r)); if (r) - goto out; + return r; - r = FEEDER_SET(f, FEEDRATE_DST, sndbuf_getspd(b)); - DEB(printf("feeder_set(FEEDRATE_DST, %d) = %d\n", sndbuf_getspd(b), r)); -out: - return r; - } else - return EINVAL; + r = FEEDER_SET(f, FEEDRATE_DST, b->spd); + DEB(printf("feeder_set(FEEDRATE_DST, %d) = %d\n", b->spd, r)); + if (r) + return r; + + return 0; + } + c->speed = speed; + c->flags |= CHN_F_INIT; + return 0; } int @@ -786,7 +1178,6 @@ chn_setformat(pcm_channel *c, u_int32_t fmt) int r; u_int32_t hwfmt; - CHN_LOCKASSERT(c); if (CANCHANGE(c)) { DEB(printf("want format %d\n", fmt)); c->format = fmt; @@ -795,17 +1186,18 @@ chn_setformat(pcm_channel *c, u_int32_t fmt) if (!fmtvalid(hwfmt, chn_getcaps(c)->fmtlist)) c->feederflags |= 1 << FEEDER_FMT; r = chn_buildfeeder(c); - if (r == 0) { - hwfmt = c->feeder->desc->out; - sndbuf_setfmt(b, hwfmt); - sndbuf_setfmt(bs, fmt); - chn_resetbuf(c); - CHANNEL_SETFORMAT(c->methods, c->devinfo, hwfmt); - r = chn_setspeed(c, c->speed); - } - return r; - } else - return EINVAL; + if (r) + return r; + hwfmt = c->feeder->desc->out; + sndbuf_setfmt(b, hwfmt); + sndbuf_setfmt(bs, hwfmt); + chn_resetbuf(c); + CHANNEL_SETFORMAT(c->methods, c->devinfo, hwfmt); + return chn_setspeed(c, c->speed); + } + c->format = fmt; + c->flags |= CHN_F_INIT; + return 0; } int @@ -813,87 +1205,79 @@ chn_setblocksize(pcm_channel *c, int blkcnt, int blksz) { snd_dbuf *b = &c->buffer; snd_dbuf *bs = &c->buffer2nd; - int bufsz, irqhz, tmp, ret; + int s, bufsz, irqhz, tmp; - CHN_LOCKASSERT(c); if (!CANCHANGE(c) || (c->flags & CHN_F_MAPPED)) return EINVAL; - ret = 0; - DEB(printf("%s(%d, %d)\n", __FUNCTION__, blkcnt, blksz)); if (blksz == 0 || blksz == -1) { if (blksz == -1) c->flags &= ~CHN_F_HAS_SIZE; if (!(c->flags & CHN_F_HAS_SIZE)) { - blksz = (sndbuf_getbps(bs) * sndbuf_getspd(bs)) / CHN_DEFAULT_HZ; + blksz = (bs->bps * bs->spd) / CHN_DEFAULT_HZ; tmp = 32; while (tmp <= blksz) tmp <<= 1; tmp >>= 1; blksz = tmp; + blkcnt = CHN_2NDBUFMAXSIZE / blksz; RANGE(blksz, 16, CHN_2NDBUFMAXSIZE / 2); RANGE(blkcnt, 2, CHN_2NDBUFMAXSIZE / blksz); - DEB(printf("%s: defaulting to (%d, %d)\n", __FUNCTION__, blkcnt, blksz)); } else { - blkcnt = sndbuf_getblkcnt(bs); - blksz = sndbuf_getblksz(bs); - DEB(printf("%s: updating (%d, %d)\n", __FUNCTION__, blkcnt, blksz)); + blksz = bs->blksz; + blkcnt = bs->blkcnt; } } else { - ret = EINVAL; if ((blksz < 16) || (blkcnt < 2) || (blkcnt * blksz > CHN_2NDBUFMAXSIZE)) - goto out; - ret = 0; + return EINVAL; c->flags |= CHN_F_HAS_SIZE; } bufsz = blkcnt * blksz; - ret = ENOMEM; - if (sndbuf_remalloc(bs, blkcnt, blksz)) - goto out; - ret = 0; + s = spltty(); + + if (bs->buf != NULL) + free(bs->buf, M_DEVBUF); + bs->buf = malloc(bufsz, M_DEVBUF, M_WAITOK); + if (bs->buf == NULL) { + splx(s); + DEB(printf("chn_setblocksize: out of memory\n")); + return ENOSPC; + } + + bs->bufsize = bufsz; + bs->blkcnt = blkcnt; + bs->blksz = blksz; /* adjust for different hw format/speed */ - irqhz = (sndbuf_getbps(bs) * sndbuf_getspd(bs)) / sndbuf_getblksz(bs); - DEB(printf("%s: soft bps %d, spd %d, irqhz == %d\n", __FUNCTION__, sndbuf_getbps(bs), sndbuf_getspd(bs), irqhz)); + irqhz = (bs->bps * bs->spd) / bs->blksz; RANGE(irqhz, 16, 512); - sndbuf_setblksz(b, (sndbuf_getbps(b) * sndbuf_getspd(b)) / irqhz); + b->blksz = (b->bps * b->spd) / irqhz; /* round down to 2^x */ blksz = 32; - while (blksz <= sndbuf_getblksz(b)) + while (blksz <= b->blksz) blksz <<= 1; blksz >>= 1; /* round down to fit hw buffer size */ - RANGE(blksz, 16, sndbuf_getmaxsize(b) / 2); - DEB(printf("%s: hard blksz requested %d (maxsize %d), ", __FUNCTION__, blksz, sndbuf_getmaxsize(b))); - - sndbuf_setblksz(b, CHANNEL_SETBLOCKSIZE(c->methods, c->devinfo, blksz)); + RANGE(blksz, 16, b->maxsize / 2); - irqhz = (sndbuf_getbps(b) * sndbuf_getspd(b)) / sndbuf_getblksz(b); - DEB(printf("got %d, irqhz == %d\n", sndbuf_getblksz(b), irqhz)); + b->blksz = CHANNEL_SETBLOCKSIZE(c->methods, c->devinfo, blksz); chn_resetbuf(c); -out: - return ret; + splx(s); + + return 0; } int chn_trigger(pcm_channel *c, int go) { - snd_dbuf *b = &c->buffer; - int ret; - - CHN_LOCKASSERT(c); - if (ISA_DMA(b) && (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD)) - sndbuf_isadmabounce(b); - ret = CHANNEL_TRIGGER(c->methods, c->devinfo, go); - - return ret; + return CHANNEL_TRIGGER(c->methods, c->devinfo, go); } int @@ -901,9 +1285,9 @@ chn_getptr(pcm_channel *c) { int hwptr; int a = (1 << c->align) - 1; + snd_dbuf *b = &c->buffer; - CHN_LOCKASSERT(c); - hwptr = (c->flags & CHN_F_TRIGGERED)? CHANNEL_GETPTR(c->methods, c->devinfo) : 0; + hwptr = b->dl? CHANNEL_GETPTR(c->methods, c->devinfo) : 0; /* don't allow unaligned values in the hwa ptr */ hwptr &= ~a ; /* Apply channel align mask */ hwptr &= DMA_ALIGN_MASK; /* Apply DMA align mask */ @@ -913,7 +1297,6 @@ chn_getptr(pcm_channel *c) pcmchan_caps * chn_getcaps(pcm_channel *c) { - CHN_LOCKASSERT(c); return CHANNEL_GETCAPS(c->methods, c->devinfo); } @@ -938,10 +1321,9 @@ chn_buildfeeder(pcm_channel *c) struct pcm_feederdesc desc; u_int32_t tmp[2], src, dst, type, flags; - CHN_LOCKASSERT(c); while (chn_removefeeder(c) == 0); KASSERT((c->feeder == NULL), ("feeder chain not empty")); - c->align = sndbuf_getalign(&c->buffer2nd); + c->align = 0; fc = feeder_getclass(NULL); if (fc == NULL) return EINVAL; @@ -990,6 +1372,3 @@ chn_buildfeeder(pcm_channel *c) } return 0; } - - - |