Module Name: src
Committed By: matt
Date: Sun Jan 27 19:06:45 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_obio.c
Log Message:
Revert back to one dmarange
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/bcm2835_obio.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/broadcom/bcm2835_obio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_obio.c:1.16 src/sys/arch/arm/broadcom/bcm2835_obio.c:1.17
--- src/sys/arch/arm/broadcom/bcm2835_obio.c:1.16 Sun Jan 27 18:31:32 2013
+++ src/sys/arch/arm/broadcom/bcm2835_obio.c Sun Jan 27 19:06:45 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: bcm2835_obio
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 @@ obio_attach(device_t parent, device_t se
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);
