[src/netbsd-1-6]: src/sys/arch/sparc/dev Pull up revision 1.36 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/4b7e10f7ed34
branches:  netbsd-1-6
changeset: 529445:4b7e10f7ed34
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:36:31 2002 +0000

description:
Pull up revision 1.36 (requested by martin in ticket #948):
Use the structures defined in bsd_openprom.h for "reg", "range",
and "intr" properties, rather than having identical-except-for-names
sbus_* and iommu_* versions.

diffstat:

 sys/arch/sparc/dev/vme_machdep.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r 241f93429a71 -r 4b7e10f7ed34 sys/arch/sparc/dev/vme_machdep.c
--- a/sys/arch/sparc/dev/vme_machdep.c  Fri Nov 22 17:36:16 2002 +0000
+++ b/sys/arch/sparc/dev/vme_machdep.c  Fri Nov 22 17:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vme_machdep.c,v 1.35 2002/03/11 16:27:02 pk Exp $      */
+/*     $NetBSD: vme_machdep.c,v 1.35.6.1 2002/11/22 17:36:31 tron Exp $        */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -394,9 +394,9 @@
        }
 
        if (bus_space_map(ia->iom_bustag,
-                         (bus_addr_t) BUS_ADDR(ia->iom_reg[0].ior_iospace,
-                                               ia->iom_reg[0].ior_pa),
-                         (bus_size_t)ia->iom_reg[0].ior_size,
+                         (bus_addr_t) BUS_ADDR(ia->iom_reg[0].oa_space,
+                                               ia->iom_reg[0].oa_base),
+                         (bus_size_t)ia->iom_reg[0].oa_size,
                          BUS_SPACE_MAP_LINEAR,
                          &bh) != 0) {
                panic("%s: can't map vmebusreg", self->dv_xname);
@@ -404,9 +404,9 @@
        sc->sc_reg = (struct vmebusreg *)bh;
 
        if (bus_space_map(ia->iom_bustag,
-                         (bus_addr_t) BUS_ADDR(ia->iom_reg[1].ior_iospace,
-                                               ia->iom_reg[1].ior_pa),
-                         (bus_size_t)ia->iom_reg[1].ior_size,
+                         (bus_addr_t) BUS_ADDR(ia->iom_reg[1].oa_space,
+                                               ia->iom_reg[1].oa_base),
+                         (bus_size_t)ia->iom_reg[1].oa_size,
                          BUS_SPACE_MAP_LINEAR,
                          &bh) != 0) {
                panic("%s: can't map vmebusvec", self->dv_xname);
@@ -418,8 +418,8 @@
         */
        if (bus_space_map(ia->iom_bustag,
                          (bus_addr_t) BUS_ADDR(
-                               ia->iom_reg[1].ior_iospace,
-                               ia->iom_reg[1].ior_pa + VME_IOC_TAGOFFSET),
+                               ia->iom_reg[1].oa_space,
+                               ia->iom_reg[1].oa_base + VME_IOC_TAGOFFSET),
                          VME_IOC_SIZE,
                          BUS_SPACE_MAP_LINEAR,
                          &bh) != 0) {
@@ -429,8 +429,8 @@
 
        if (bus_space_map(ia->iom_bustag,
                          (bus_addr_t) BUS_ADDR(
-                               ia->iom_reg[1].ior_iospace,
-                               ia->iom_reg[1].ior_pa + VME_IOC_FLUSHOFFSET),
+                               ia->iom_reg[1].oa_space,
+                               ia->iom_reg[1].oa_base + VME_IOC_FLUSHOFFSET),
                          VME_IOC_SIZE,
                          BUS_SPACE_MAP_LINEAR,
                          &bh) != 0) {