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

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

details:   https://anonhg.NetBSD.org/src/rev/c59116cd82ab
branches:  netbsd-1-6
changeset: 529457:c59116cd82ab
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:39:21 2002 +0000

description:
Pull up revision 1.33 (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/be.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r 447a31cfa812 -r c59116cd82ab sys/dev/sbus/be.c
--- a/sys/dev/sbus/be.c Fri Nov 22 17:38:54 2002 +0000
+++ b/sys/dev/sbus/be.c Fri Nov 22 17:39:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: be.c,v 1.31 2002/03/20 20:39:15 eeh Exp $      */
+/*     $NetBSD: be.c,v 1.31.6.1 2002/11/22 17:39:21 tron Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.31 2002/03/20 20:39:15 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.31.6.1 2002/11/22 17:39:21 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -259,9 +259,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("beattach: cannot map registers\n");
                return;
@@ -269,9 +269,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_br) != 0) {
                printf("beattach: cannot map registers\n");
                return;
@@ -279,9 +279,9 @@
 
        if (bus_space_map(sa->sa_bustag,
                          (bus_addr_t)BUS_ADDR(
-                               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_tr) != 0) {
                printf("beattach: cannot map registers\n");
                return;