Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom Revert back to one dmarange



details:   https://anonhg.NetBSD.org/src/rev/45bd8fb2d0c8
branches:  trunk
changeset: 784396:45bd8fb2d0c8
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jan 27 19:06:45 2013 +0000

description:
Revert back to one dmarange

diffstat:

 sys/arch/arm/broadcom/bcm2835_obio.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 68b5f1b3e700 -r 45bd8fb2d0c8 sys/arch/arm/broadcom/bcm2835_obio.c
--- a/sys/arch/arm/broadcom/bcm2835_obio.c      Sun Jan 27 19:00:08 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_obio.c      Sun Jan 27 19:06:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_obio.c,v 1.16 2013/01/27 18:31:32 matt Exp $   */
+/*     $NetBSD: bcm2835_obio.c,v 1.17 2013/01/27 19:06:45 matt Exp $   */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.16 2013/01/27 18:31:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.17 2013/01/27 19:06:45 matt Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -47,7 +47,7 @@
 struct obio_softc {
        device_t                sc_dev;
        bus_dma_tag_t           sc_dmat;
-       struct arm32_dma_range  sc_dmarange[2];
+       struct arm32_dma_range  sc_dmarange[1];
        bus_space_tag_t         sc_iot;
        bus_space_handle_t      sc_ioh;
        bus_addr_t              sc_base;
@@ -183,9 +183,6 @@
        sc->sc_dmarange[0].dr_sysbase = 0;
        sc->sc_dmarange[0].dr_busbase = BCM2835_BUSADDR_CACHE_COHERENT;
        sc->sc_dmarange[0].dr_len = physmem * PAGE_SIZE;
-       sc->sc_dmarange[1] = sc->sc_dmarange[0];
-       sc->sc_dmarange[1].dr_sysbase = BCM2835_BUSADDR_CACHE_COHERENT;
-       sc->sc_dmarange[1].dr_flags = _BUS_DMAMAP_NOALLOC;
        bcm2835_bus_dma_tag._ranges = sc->sc_dmarange;
        bcm2835_bus_dma_tag._nranges = __arraycount(sc->sc_dmarange);
 



Home | Main Index | Thread Index | Old Index