[src/trunk]: src/sys/arch/arm/arm32 Make _BUS_DMAMAP_MEM_XLATE supplied by th...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/af82608a2c90
branches:  trunk
changeset: 784392:af82608a2c90
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jan 27 17:48:38 2013 +0000

description:
Make _BUS_DMAMAP_MEM_XLATE supplied by the caller.

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 75c7697696d5 -r af82608a2c90 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Sun Jan 27 17:44:39 2013 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Sun Jan 27 17:48:38 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.68 2013/01/27 17:38:55 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.69 2013/01/27 17:48:38 matt Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.68 2013/01/27 17:38:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.69 2013/01/27 17:48:38 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1231,7 +1231,7 @@
                                if (dr->dr_flags & _BUS_DMAMAP_COHERENT) {
                                        direct_mapable = true;
                                }
-                               if (dr->dr_flags & _BUS_DMAMAP_MEM_XLATE) {
+                               if (flags & _BUS_DMAMAP_MEM_XLATE) {
                                        pa = (pa - dr->dr_sysbase)
                                            + dr->dr_busbase;
                                }
@@ -1293,7 +1293,7 @@
                                if (dr->dr_flags & _BUS_DMAMAP_COHERENT) {
                                        uncached = false;
                                }
-                               if (dr->dr_flags & _BUS_DMAMAP_MEM_XLATE) {
+                               if (flags & _BUS_DMAMAP_MEM_XLATE) {
                                        pa = (pa - dr->dr_sysbase)
                                             + dr->dr_busbase;
                                }