diff options
| author | Cameron Grant <cg@FreeBSD.org> | 2000-06-17 19:29:40 +0000 |
|---|---|---|
| committer | Cameron Grant <cg@FreeBSD.org> | 2000-06-17 19:29:40 +0000 |
| commit | fa5e422d98cf184fd019762fc6ee3ad4646e02ef (patch) | |
| tree | 0d59dbd332b555402a6184c8a4ea086d4c12c9d2 /sys/dev | |
| parent | 7ebe1c3acf4c965047c49aae281f9997e1057537 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sound/pcm/channel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index fdc7e462f956..45568beda7d9 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -35,6 +35,7 @@ #define ISA_DMA(b) (((b)->chan >= 0 && (b)->chan != 4 && (b)->chan < 8)) #define CANCHANGE(c) (!(c)->buffer.dl) +#define ROUND(x) ((x) & DMA_ALIGN_MASK) /* #define DEB(x) x */ @@ -828,8 +829,6 @@ buf_clear(snd_dbuf *b, u_int32_t fmt, int length) int i; u_int16_t data, *p; - /* rely on length & DMA_ALIGN_MASK == 0 */ - length &= DMA_ALIGN_MASK; if (length == 0) return; @@ -848,7 +847,7 @@ buf_clear(snd_dbuf *b, u_int32_t fmt, int length) i = b->fp; p = (u_int16_t *)(b->buf + b->fp); - while (length > 0) { + while (length > 1) { *p++ = data; length -= 2; i += 2; @@ -857,6 +856,8 @@ buf_clear(snd_dbuf *b, u_int32_t fmt, int length) i = 0; } } + if (length == 1) + *(b->buf + i) = data & 0xff; } void @@ -1220,6 +1221,7 @@ chn_setblocksize(pcm_channel *c, int blkcnt, int blksz) buf_clear(bs, bs->fmt, bs->bufsize); bs->blkcnt = blkcnt; bs->blksz = blksz; + RANGE(blksz, 16, b->bufsize / 2); b->blksz = c->setblocksize(c->devinfo, blksz); splx(s); |