summaryrefslogtreecommitdiff
path: root/sys/dev/vme
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2001-03-06 22:27:59 +0000
committerthorpej <thorpej@NetBSD.org>2001-03-06 22:27:59 +0000
commit76eec79181586f597f25bdc7c4575fda0df71df7 (patch)
tree38b99b37d5185a0fae7df4ede547d22371c000d1 /sys/dev/vme
parentf646706dac3f36b57199b24f0921078d55304288 (diff)
Don't misuse bus_dmamap_load_raw().
Diffstat (limited to 'sys/dev/vme')
-rw-r--r--sys/dev/vme/xd.c15
-rw-r--r--sys/dev/vme/xy.c15
2 files changed, 16 insertions, 14 deletions
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);
}