Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/isadma.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/isadma.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.32.4.1 retrieving revision 1.33 diff -u -p -r1.32.4.1 -r1.33 --- src/sys/dev/isa/isadma.c 1998/11/23 03:12:57 1.32.4.1 +++ src/sys/dev/isa/isadma.c 1998/02/04 05:14:35 1.33 @@ -1,7 +1,7 @@ -/* $NetBSD: isadma.c,v 1.32.4.1 1998/11/23 03:12:57 cgd Exp $ */ +/* $NetBSD: isadma.c,v 1.33 1998/02/04 05:14:35 thorpej Exp $ */ /*- - * Copyright (c) 1997 The NetBSD Foundation, Inc. + * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -285,10 +285,12 @@ isa_dmastart(isadev, chan, addr, nbytes, #endif if (flags & DMAMODE_READ) { - bus_dmamap_sync(sc->sc_dmat, dmam, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->sc_dmat, dmam, 0, dmam->dm_mapsize, + BUS_DMASYNC_PREREAD); sc->sc_dmareads |= (1 << chan); } else { - bus_dmamap_sync(sc->sc_dmat, dmam, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->sc_dmat, dmam, 0, dmam->dm_mapsize, + BUS_DMASYNC_PREWRITE); sc->sc_dmareads &= ~(1 << chan); } @@ -464,7 +466,7 @@ isa_dmadone(isadev, chan) printf("%s: isa_dmadone: channel %d not finished\n", sc->sc_dev.dv_xname, chan); - bus_dmamap_sync(sc->sc_dmat, dmam, + bus_dmamap_sync(sc->sc_dmat, dmam, 0, dmam->dm_mapsize, (sc->sc_dmareads & (1 << chan)) ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); @@ -579,9 +581,6 @@ isa_dmamem_mmap(isadev, chan, addr, size panic("isa_dmamem_mmap"); } - if (off < 0) - return (-1); - seg.ds_addr = addr; seg.ds_len = size;