diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
| commit | 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 (patch) | |
| tree | 967b89f6e07398a22bd8c76d30179b648776542d /sys/dev/isa/isadma.c | |
| parent | ba95d3c1d69cdb251d15a12ebf70f50b0ea2019b (diff) | |
partial sync with netbsd 960418, more to come
Diffstat (limited to 'sys/dev/isa/isadma.c')
| -rw-r--r-- | sys/dev/isa/isadma.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 37a0795745a..a1d5778dda8 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,5 +1,5 @@ -/* $OpenBSD: isadma.c,v 1.3 1996/04/18 23:47:41 niklas Exp $ */ -/* $NetBSD: isadma.c,v 1.17 1996/03/01 04:35:27 mycroft Exp $ */ +/* $OpenBSD: isadma.c,v 1.4 1996/04/21 22:24:14 deraadt Exp $ */ +/* $NetBSD: isadma.c,v 1.18 1996/03/31 20:51:43 mycroft Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -28,8 +28,9 @@ static struct dma_info dma_info[8]; static u_int8_t dma_finished; /* high byte of address is stored in this port for i-th dma channel */ -static int dmapageport[8] = { - 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a +static int dmapageport[2][4] = { + {0x87, 0x83, 0x81, 0x82}, + {0x8f, 0x8b, 0x89, 0x8a} }; static u_int8_t dmamode[4] = { @@ -123,7 +124,7 @@ isadma_start(addr, nbytes, chan, flags) /* send start address */ waport = DMA1_CHN(chan); - outb(dmapageport[chan], di->phys[0].addr>>16); + outb(dmapageport[0][chan], di->phys[0].addr>>16); outb(waport, di->phys[0].addr); outb(waport, di->phys[0].addr>>8); @@ -144,7 +145,7 @@ isadma_start(addr, nbytes, chan, flags) /* send start address */ waport = DMA2_CHN(chan & 3); - outb(dmapageport[chan], di->phys[0].addr>>16); + outb(dmapageport[1][chan], di->phys[0].addr>>16); outb(waport, di->phys[0].addr>>1); outb(waport, di->phys[0].addr>>9); |