Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an isa_dmacount() function, to get the current residual count on a channel.

This commit is contained in:
mycroft 1997-03-21 00:00:21 +00:00
parent d79f5b1733
commit 3523bc35d5
2 changed files with 70 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
sys/dev/isa/isadma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isadma.c,v 1.21 1996/10/13 01:37:54 christos Exp $ */
/* $NetBSD: isadma.c,v 1.22 1997/03/21 00:00:21 mycroft Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@ -58,12 +58,12 @@ isa_dmacascade(chan)
/* set dma channel mode, and set dma channel mode */
if ((chan & 4) == 0) {
outb(DMA1_MODE, chan | DMA37MD_CASCADE);
outb(DMA1_SMSK, chan);
outb(DMA1_SMSK, chan | DMA37SM_CLEAR);
} else {
chan &= 3;
outb(DMA2_MODE, chan | DMA37MD_CASCADE);
outb(DMA2_SMSK, chan);
outb(DMA2_SMSK, chan | DMA37SM_CLEAR);
}
}
@ -170,10 +170,64 @@ isa_dmaabort(chan)
bounced[chan] = 0;
/* mask channel */
if ((chan & 4) == 0)
outb(DMA1_SMSK, DMA37SM_SET | chan);
else
outb(DMA2_SMSK, DMA37SM_SET | (chan & 3));
if ((chan & 4) == 0) {
outb(DMA1_SMSK, chan | DMA37SM_SET);
} else {
chan &= 3;
outb(DMA2_SMSK, chan | DMA37SM_SET);
}
}
vm_size_t
isa_dmacount(chan)
int chan;
{
int waport;
vm_size_t nbytes;
#ifdef ISADMA_DEBUG
if (chan < 0 || chan > 7)
panic("isa_dmafinished: impossible request");
#endif
/* check that the terminal count was reached */
if ((chan & 4) == 0) {
/* mask channel */
outb(DMA1_SMSK, chan | DMA37SM_SET);
outb(DMA1_FFC, 0);
if (!isa_dmafinished(chan)) {
/* read count */
waport = DMA1_CHN(chan);
nbytes = inb(waport + 1) + 1;
nbytes += inb(waport + 1) << 8;
} else
nbytes = 0;
/* unmask channel */
outb(DMA1_SMSK, chan | DMA37SM_CLEAR);
} else {
chan &= 3;
/* mask channel */
outb(DMA2_SMSK, chan | DMA37SM_SET);
outb(DMA2_FFC, 0);
if (!isa_dmafinished(chan | 4)) {
/* read count */
waport = DMA2_CHN(chan);
nbytes = inb(waport + 2) + 1;
nbytes += inb(waport + 2) << 8;
nbytes <<= 1;
} else
nbytes = 0;
/* unmask channel */
outb(DMA2_SMSK, chan | DMA37SM_CLEAR);
}
return (nbytes);
}
int
@ -212,10 +266,13 @@ isa_dmadone(flags, addr, nbytes, chan)
printf("isa_dmadone: channel %d not finished\n", chan);
/* mask channel */
if ((chan & 4) == 0)
outb(DMA1_SMSK, DMA37SM_SET | chan);
else
outb(DMA2_SMSK, DMA37SM_SET | (chan & 3));
if ((chan & 4) == 0) {
outb(DMA1_SMSK, chan | DMA37SM_SET);
} else {
chan &= 3;
outb(DMA2_SMSK, chan | DMA37SM_SET);
}
/* copy bounce buffer on read */
if (bounced[chan]) {

3
sys/dev/isa/isadmavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isadmavar.h,v 1.4 1996/03/01 04:08:46 mycroft Exp $ */
/* $NetBSD: isadmavar.h,v 1.5 1997/03/21 00:00:22 mycroft Exp $ */
#define DMAMODE_WRITE 0
#define DMAMODE_READ 1
@ -7,5 +7,6 @@
void isa_dmacascade __P((int));
void isa_dmastart __P((int, caddr_t, vm_size_t, int));
void isa_dmaabort __P((int));
vm_size_t isa_dmacount __P((int));
int isa_dmafinished __P((int));
void isa_dmadone __P((int, caddr_t, vm_size_t, int));