[src/netbsd-1-6]: src/sys Pull up revision 1.12 (requested by martin in ticke...

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

details:   https://anonhg.NetBSD.org/src/rev/830f20e43f2d
branches:  netbsd-1-6
changeset: 529453:830f20e43f2d
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:38:09 2002 +0000

description:
Pull up revision 1.12 (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/sbusvar.h |   4 ++--
 sys/dev/sbus/if_hme_sbus.c   |  34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diffs (93 lines):

diff -r 66487af82e15 -r 830f20e43f2d sys/arch/sparc/dev/sbusvar.h
--- a/sys/arch/sparc/dev/sbusvar.h      Fri Nov 22 17:37:56 2002 +0000
+++ b/sys/arch/sparc/dev/sbusvar.h      Fri Nov 22 17:38:09 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbusvar.h,v 1.11 2002/03/21 04:32:25 uwe Exp $ */
+/*     $NetBSD: sbusvar.h,v 1.11.6.1 2002/11/22 17:38:09 tron Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
        bus_space_handle_t sc_bh;       /* SBus control registers */
        int     sc_clockfreq;           /* clock frequency (in Hz) */
        struct  sbusdev *sc_sbdev;      /* list of all children */
-       struct  sbus_range *sc_range;   /* Address space translations */
+       struct  openprom_range *sc_range;/* Address space translations */
        int     sc_nrange;
        int     sc_burst;               /* burst transfer sizes supported */
 
diff -r 66487af82e15 -r 830f20e43f2d sys/dev/sbus/if_hme_sbus.c
--- a/sys/dev/sbus/if_hme_sbus.c        Fri Nov 22 17:37:56 2002 +0000
+++ b/sys/dev/sbus/if_hme_sbus.c        Fri Nov 22 17:38:09 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_hme_sbus.c,v 1.11 2002/03/20 20:39:15 eeh Exp $     */
+/*     $NetBSD: if_hme_sbus.c,v 1.11.6.1 2002/11/22 17:38:09 tron Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.11 2002/03/20 20:39:15 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.11.6.1 2002/11/22 17:38:09 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,41 +131,41 @@
         *
         */
        if (sbus_bus_map(sa->sa_bustag,
-                        sa->sa_reg[0].sbr_slot,
-                        sa->sa_reg[0].sbr_offset,
-                        (bus_size_t)sa->sa_reg[0].sbr_size,
+                        sa->sa_reg[0].oa_space,
+                        sa->sa_reg[0].oa_base,
+                        (bus_size_t)sa->sa_reg[0].oa_size,
                         0, &sc->sc_seb) != 0) {
                printf("%s: cannot map SEB registers\n", self->dv_xname);
                return;
        }
        if (sbus_bus_map(sa->sa_bustag,
-                        sa->sa_reg[1].sbr_slot,
-                        sa->sa_reg[1].sbr_offset,
-                        (bus_size_t)sa->sa_reg[1].sbr_size,
+                        sa->sa_reg[1].oa_space,
+                        sa->sa_reg[1].oa_base,
+                        (bus_size_t)sa->sa_reg[1].oa_size,
                         0, &sc->sc_etx) != 0) {
                printf("%s: cannot map ETX registers\n", self->dv_xname);
                return;
        }
        if (sbus_bus_map(sa->sa_bustag,
-                        sa->sa_reg[2].sbr_slot,
-                        sa->sa_reg[2].sbr_offset,
-                        (bus_size_t)sa->sa_reg[2].sbr_size,
+                        sa->sa_reg[2].oa_space,
+                        sa->sa_reg[2].oa_base,
+                        (bus_size_t)sa->sa_reg[2].oa_size,
                         0, &sc->sc_erx) != 0) {
                printf("%s: cannot map ERX registers\n", self->dv_xname);
                return;
        }
        if (sbus_bus_map(sa->sa_bustag,
-                        sa->sa_reg[3].sbr_slot,
-                        sa->sa_reg[3].sbr_offset,
-                        (bus_size_t)sa->sa_reg[3].sbr_size,
+                        sa->sa_reg[3].oa_space,
+                        sa->sa_reg[3].oa_base,
+                        (bus_size_t)sa->sa_reg[3].oa_size,
                         0, &sc->sc_mac) != 0) {
                printf("%s: cannot map MAC registers\n", self->dv_xname);
                return;
        }
        if (sbus_bus_map(sa->sa_bustag,
-                        sa->sa_reg[4].sbr_slot,
-                        sa->sa_reg[4].sbr_offset,
-                        (bus_size_t)sa->sa_reg[4].sbr_size,
+                        sa->sa_reg[4].oa_space,
+                        sa->sa_reg[4].oa_base,
+                        (bus_size_t)sa->sa_reg[4].oa_size,
                         0, &sc->sc_mif) != 0) {
                printf("%s: cannot map MIF registers\n", self->dv_xname);
                return;