- Clean up ISA DMA supports.

- Rename all sndbuf_isadma* functions to sndbuf_dma* and move them into
  sys/dev/sound/isa/sndbuf_dma.c.

No response from:	sound

1 files changed, 7 insertions, 5 deletions

diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index 35c4fff..38e3198 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -34,6 +34,8 @@
 #include  <dev/sound/isa/sb.h>
 #include  <dev/sound/chip.h>
 
+#include <isa/isavar.h>
+
 #include "mixer_if.h"
 
 SND_DECLARE_FILE("$FreeBSD$");
@@ -367,7 +369,7 @@ ess_intr(void *arg)
 			chn_intr(sc->pch.channel);
 		if (sc->pch.stopping) {
 			sc->pch.run = 0;
-			sndbuf_isadma(sc->pch.buffer, PCMTRIG_STOP);
+			sndbuf_dma(sc->pch.buffer, PCMTRIG_STOP);
 			sc->pch.stopping = 0;
 			if (sc->pch.hwch == 1)
 				ess_write(sc, 0xb8, ess_read(sc, 0xb8) & ~0x01);
@@ -381,7 +383,7 @@ ess_intr(void *arg)
 			chn_intr(sc->rch.channel);
 		if (sc->rch.stopping) {
 			sc->rch.run = 0;
-			sndbuf_isadma(sc->rch.buffer, PCMTRIG_STOP);
+			sndbuf_dma(sc->rch.buffer, PCMTRIG_STOP);
 			sc->rch.stopping = 0;
 			/* XXX: will this stop audio2? */
 			ess_write(sc, 0xb8, ess_read(sc, 0xb8) & ~0x01);
@@ -565,7 +567,7 @@ esschan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *
 	ch->hwch = 1;
 	if ((dir == PCMDIR_PLAY) && (sc->duplex))
 		ch->hwch = 2;
-	sndbuf_isadmasetup(ch->buffer, (ch->hwch == 1)? sc->drq1 : sc->drq2);
+	sndbuf_dmasetup(ch->buffer, (ch->hwch == 1)? sc->drq1 : sc->drq2);
 	return ch;
 }
 
@@ -612,7 +614,7 @@ esschan_trigger(kobj_t obj, void *data, int go)
 	switch (go) {
 	case PCMTRIG_START:
 		ch->run = 1;
-		sndbuf_isadma(ch->buffer, go);
+		sndbuf_dma(ch->buffer, go);
 		ess_start(ch);
 		break;
 
@@ -630,7 +632,7 @@ esschan_getptr(kobj_t obj, void *data)
 {
 	struct ess_chinfo *ch = data;
 
-	return sndbuf_isadmaptr(ch->buffer);
+	return sndbuf_dmaptr(ch->buffer);
 }
 
 static struct pcmchan_caps *