From 76eec79181586f597f25bdc7c4575fda0df71df7 Mon Sep 17 00:00:00 2001 From: thorpej Date: Tue, 6 Mar 2001 22:27:59 +0000 Subject: Don't misuse bus_dmamap_load_raw(). --- sys/dev/vme/xd.c | 15 ++++++++------- sys/dev/vme/xy.c | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 527b8c9ab4d..bac9bd42191 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.35 2001/01/15 21:27:21 fvdl Exp $ */ +/* $NetBSD: xd.c,v 1.36 2001/03/06 22:27:59 thorpej Exp $ */ /* * @@ -393,16 +393,17 @@ xd_dmamem_alloc(tag, map, seg, nsegp, len, kvap, dmap) return (error); } - if ((error = bus_dmamap_load_raw(tag, map, - seg, nseg, len, BUS_DMA_NOWAIT)) != 0) { + if ((error = bus_dmamem_map(tag, seg, nseg, + len, kvap, + BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { bus_dmamem_free(tag, seg, nseg); return (error); } - if ((error = bus_dmamem_map(tag, seg, nseg, - len, kvap, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { - bus_dmamap_unload(tag, map); + if ((error = bus_dmamap_load(tag, map, + *kvap, len, NULL, + BUS_DMA_NOWAIT)) != 0) { + bus_dmamem_unmap(tag, *kvap, len); bus_dmamem_free(tag, seg, nseg); return (error); } diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index 722bcf73e73..d0c1c452625 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.33 2001/01/15 21:29:30 fvdl Exp $ */ +/* $NetBSD: xy.c,v 1.34 2001/03/06 22:28:00 thorpej Exp $ */ /* * @@ -307,16 +307,17 @@ xy_dmamem_alloc(tag, map, seg, nsegp, len, kvap, dmap) return (error); } - if ((error = bus_dmamap_load_raw(tag, map, - seg, nseg, len, BUS_DMA_NOWAIT)) != 0) { + if ((error = bus_dmamem_map(tag, seg, nseg, + len, kvap, + BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { bus_dmamem_free(tag, seg, nseg); return (error); } - if ((error = bus_dmamem_map(tag, seg, nseg, - len, kvap, - BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) { - bus_dmamap_unload(tag, map); + if ((error = bus_dmamap_load(tag, map + *kvap, len, NULL, + BUS_DMA_NOWAIT)) != 0) { + bus_dmamem_unmap(tag, *kvap, len); bus_dmamem_free(tag, seg, nseg); return (error); } -- cgit