diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-03-13 10:19:32 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-03-13 10:19:32 +0000 |
| commit | d8b47cbb70820a0b1db9bc5c429482c55fdeb468 (patch) | |
| tree | 6fca4e3a46dd54c85e0f62ac9a33693dd2c273c8 /sys/dev | |
| parent | 3f30603cfb912c88ba1ef3b693e76ce57dade192 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sound/isa/sb.c | 4 | ||||
| -rw-r--r-- | sys/dev/sound/isa/sb16.c | 4 | ||||
| -rw-r--r-- | sys/dev/sound/isa/sb8.c | 4 | ||||
| -rw-r--r-- | sys/dev/sound/pcm/channel.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c index 216198272a3c..5bfce3452000 100644 --- a/sys/dev/sound/isa/sb.c +++ b/sys/dev/sound/isa/sb.c @@ -456,8 +456,8 @@ sb16_swap(void *v, int dir) t = sb->pch.buffer->chan; sb->pch.buffer->chan = sb->rch.buffer->chan; sb->rch.buffer->chan = t; - sb->pch.buffer->dir = B_WRITE; - sb->rch.buffer->dir = B_READ; + sb->pch.buffer->dir = ISADMA_WRITE; + sb->rch.buffer->dir = ISADMA_READ; } } } diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index 216198272a3c..5bfce3452000 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -456,8 +456,8 @@ sb16_swap(void *v, int dir) t = sb->pch.buffer->chan; sb->pch.buffer->chan = sb->rch.buffer->chan; sb->rch.buffer->chan = t; - sb->pch.buffer->dir = B_WRITE; - sb->rch.buffer->dir = B_READ; + sb->pch.buffer->dir = ISADMA_WRITE; + sb->rch.buffer->dir = ISADMA_READ; } } } diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 216198272a3c..5bfce3452000 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -456,8 +456,8 @@ sb16_swap(void *v, int dir) t = sb->pch.buffer->chan; sb->pch.buffer->chan = sb->rch.buffer->chan; sb->rch.buffer->chan = t; - sb->pch.buffer->dir = B_WRITE; - sb->rch.buffer->dir = B_READ; + sb->pch.buffer->dir = ISADMA_WRITE; + sb->rch.buffer->dir = ISADMA_READ; } } } diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 5be37fdc69d7..218806850fc1 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -840,14 +840,14 @@ buf_isadma(snd_dbuf *b, int go) switch (go) { case PCMTRIG_START: DEB(printf("buf 0x%p ISA DMA started\n", b)); - isa_dmastart(b->dir | B_RAW, b->buf, + isa_dmastart(b->dir | ISADMA_RAW, b->buf, b->bufsize, b->chan); break; case PCMTRIG_STOP: case PCMTRIG_ABORT: DEB(printf("buf 0x%p ISA DMA stopped\n", b)); isa_dmastop(b->chan); - isa_dmadone(b->dir | B_RAW, b->buf, b->bufsize, + isa_dmadone(b->dir | ISADMA_RAW, b->buf, b->bufsize, b->chan); break; } @@ -1050,7 +1050,7 @@ chn_setdir(pcm_channel *c, int dir) c->direction = dir; r = c->setdir(c->devinfo, c->direction); if (!r && ISA_DMA(&c->buffer)) - c->buffer.dir = (dir == PCMDIR_PLAY)? B_WRITE : B_READ; + c->buffer.dir = (dir == PCMDIR_PLAY)? ISADMA_WRITE : ISADMA_READ; return r; } |