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

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

details:   https://anonhg.NetBSD.org/src/rev/66487af82e15
branches:  netbsd-1-6
changeset: 529452:66487af82e15
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:37:56 2002 +0000

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

diffs (44 lines):

diff -r bbd1fcb9db12 -r 66487af82e15 sys/dev/sbus/esp_sbus.c
--- a/sys/dev/sbus/esp_sbus.c   Fri Nov 22 17:37:45 2002 +0000
+++ b/sys/dev/sbus/esp_sbus.c   Fri Nov 22 17:37:56 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_sbus.c,v 1.20 2002/03/21 00:16:15 eeh Exp $        */
+/*     $NetBSD: esp_sbus.c,v 1.20.6.1 2002/11/22 17:37:56 tron Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.20 2002/03/21 00:16:15 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.20.6.1 2002/11/22 17:37:56 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -212,9 +212,9 @@
                                sa->sa_promvaddrs[0], &lsc->sc_regs);
                } else {
                        if (sbus_bus_map(sa->sa_bustag,
-                               sa->sa_reg[0].sbr_slot,
-                               sa->sa_reg[0].sbr_offset,
-                               sa->sa_reg[0].sbr_size,
+                               sa->sa_reg[0].oa_space,
+                               sa->sa_reg[0].oa_base,
+                               sa->sa_reg[0].oa_size,
                                0, &lsc->sc_regs) != 0) {
                                printf("%s: cannot map dma registers\n",
                                        self->dv_xname);
@@ -262,9 +262,9 @@
                                sa->sa_promvaddrs[1], &esc->sc_reg);
                } else {
                        if (sbus_bus_map(sa->sa_bustag,
-                               sa->sa_reg[1].sbr_slot,
-                               sa->sa_reg[1].sbr_offset,
-                               sa->sa_reg[1].sbr_size,
+                               sa->sa_reg[1].oa_space,
+                               sa->sa_reg[1].oa_base,
+                               sa->sa_reg[1].oa_size,
                                0, &esc->sc_reg) != 0) {
                                printf("%s @ sbus: "
                                        "cannot map scsi core registers\n",