[src/trunk]: src/sys/arch/arm/arm32 Use right flag name for bus_dmamem_map (f...

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

details:   https://anonhg.NetBSD.org/src/rev/7e0f1001cb08
branches:  trunk
changeset: 782215:7e0f1001cb08
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Oct 21 10:22:40 2012 +0000

description:
Use right flag name for bus_dmamem_map (fixes usb on BCM53xx).

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 032b4d1556c5 -r 7e0f1001cb08 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Sun Oct 21 09:25:16 2012 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Sun Oct 21 10:22:40 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.63 2012/10/19 13:46:07 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.64 2012/10/21 10:22:40 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.63 2012/10/19 13:46:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.64 2012/10/21 10:22:40 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1194,7 +1194,10 @@
                 * If this is a non-COHERENT mapping, then the existing kernel
                 * mapping is already compatible with it.
                 */
-               if ((flags & _BUS_DMAMAP_COHERENT) == 0) {
+               if ((flags & BUS_DMA_COHERENT) == 0) {
+#ifdef DEBUG_DMA
+                       printf("dmamem_map: =%p\n", *kvap);
+#endif /* DEBUG_DMA */
                        *kvap = (void *)PMAP_MAP_POOLPAGE(paddr);
                        return 0;
                }
@@ -1209,6 +1212,9 @@
                        if (dr != NULL
                            && (dr->dr_flags & _BUS_DMAMAP_COHERENT) != 0) {
                                *kvap = (void *)PMAP_MAP_POOLPAGE(paddr);
+#ifdef DEBUG_DMA
+                               printf("dmamem_map: =%p\n", *kvap);
+#endif /* DEBUG_DMA */
                                return 0;
                        }
                }