diff options
| author | phk <phk@FreeBSD.org> | 2000-03-13 10:19:32 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-03-13 10:19:32 +0000 |
| commit | 8e89e2d03f02f781ce162589fb0704e91d884725 (patch) | |
| tree | eb66f0ed21705383ed2e06c5af45fa2f4b853b07 /sys/i386/isa/asc.c | |
| parent | e435347f0c0b53e0efe099a854735af2a18d31cf (diff) | |
| download | FreeBSD-src-8e89e2d03f02f781ce162589fb0704e91d884725.zip FreeBSD-src-8e89e2d03f02f781ce162589fb0704e91d884725.tar.gz | |
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.
Diffstat (limited to 'sys/i386/isa/asc.c')
| -rw-r--r-- | sys/i386/isa/asc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index a819cdd..8c1e710 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -299,7 +299,7 @@ dma_restart(struct asc_unit *scu) unsigned char al=scu->cmd_byte; if (geomtab[scu->geometry].g_res==0) {/* color */ - isa_dmastart(B_READ, scu->sbuf.base+scu->sbuf.wptr, + isa_dmastart(ISADMA_READ, scu->sbuf.base+scu->sbuf.wptr, scu->linesize + 90 /* XXX */ , scu->dma_num); /* * looks like we have to set and then clear this @@ -312,7 +312,7 @@ dma_restart(struct asc_unit *scu) outb( ASC_CMD, al &= 0xfb ); scu->cmd_byte = al; } else { /* normal */ - isa_dmastart(B_READ, scu->sbuf.base+scu->sbuf.wptr, + isa_dmastart(ISADMA_READ, scu->sbuf.base+scu->sbuf.wptr, scu->linesize, scu->dma_num); /*** this is done in sub_20, after dmastart ? ***/ #if 0 @@ -513,7 +513,7 @@ ascintr(int unit) outb( ASC_CMD, ASC_STANDBY); scu->flags &= ~DMA_ACTIVE; /* bounce buffers... */ - isa_dmadone(B_READ, scu->sbuf.base+scu->sbuf.wptr, + isa_dmadone(ISADMA_READ, scu->sbuf.base+scu->sbuf.wptr, scu->linesize, scu->dma_num); scu->sbuf.wptr += scu->linesize; if (scu->sbuf.wptr >= scu->sbuf.size) scu->sbuf.wptr=0; |
