[src/netbsd-1-6]: src/sys/dev/sbus Pull up revision 1.24 (requested by martin...

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

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

description:
Pull up revision 1.24 (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/dev/sbus/qe.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 9ee1588ed377 -r 447a31cfa812 sys/dev/sbus/qe.c
--- a/sys/dev/sbus/qe.c Fri Nov 22 17:38:35 2002 +0000
+++ b/sys/dev/sbus/qe.c Fri Nov 22 17:38:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qe.c,v 1.22 2002/03/20 17:57:33 eeh Exp $      */
+/*     $NetBSD: qe.c,v 1.22.6.1 2002/11/22 17:38:54 tron Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.22 2002/03/20 17:57:33 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.22.6.1 2002/11/22 17:38:54 tron Exp $");
 
 #define QEDEBUG
 
@@ -226,9 +226,9 @@
 
        if (bus_space_map(sa->sa_bustag,
                          (bus_addr_t)BUS_ADDR(
-                               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_cr) != 0) {
                printf("%s: cannot map registers\n", self->dv_xname);
                return;
@@ -236,9 +236,9 @@
 
        if (bus_space_map(sa->sa_bustag,
                          (bus_addr_t)BUS_ADDR(
-                               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_mr) != 0) {
                printf("%s: cannot map registers\n", self->dv_xname);
                return;