Module Name: src
Committed By: matt
Date: Sun Jan 27 17:48:38 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Make _BUS_DMAMAP_MEM_XLATE supplied by the caller.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.68 src/sys/arch/arm/arm32/bus_dma.c:1.69
--- src/sys/arch/arm/arm32/bus_dma.c:1.68 Sun Jan 27 17:38:55 2013
+++ src/sys/arch/arm/arm32/bus_dma.c Sun Jan 27 17:48:38 2013
@@ -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 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma
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 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma
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;
}
