From d8b47cbb70820a0b1db9bc5c429482c55fdeb468 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Mon, 13 Mar 2000 10:19:32 +0000 Subject: Stop isadma from abusing the B_READ, B_RAW and B_WRITE flags. Define ISADMA_{READ,WRITE,RAW} macros with the same numeric values as the B_{READ,WRITE,RAW} and use them instead throughout. --- sys/dev/sound/isa/sb.c | 4 ++-- sys/dev/sound/isa/sb16.c | 4 ++-- sys/dev/sound/isa/sb8.c | 4 ++-- sys/dev/sound/pcm/channel.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/dev') 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; } -- cgit v1.3