[src/netbsd-1-6]: src/sys/arch/sparc/sparc Pull up revision 1.66 (requested b...

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

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

description:
Pull up revision 1.66 (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/sparc/iommu.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 49f1b6a4d070 -r 8475e45ff520 sys/arch/sparc/sparc/iommu.c
--- a/sys/arch/sparc/sparc/iommu.c      Fri Nov 22 17:36:49 2002 +0000
+++ b/sys/arch/sparc/sparc/iommu.c      Fri Nov 22 17:37:03 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommu.c,v 1.63 2002/03/11 16:27:03 pk Exp $ */
+/*     $NetBSD: iommu.c,v 1.63.6.1 2002/11/22 17:37:03 tron Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -311,7 +311,7 @@
         */
        if (js1_implicit_iommu) {
                struct iommu_attach_args ia;
-               struct iommu_reg sbus_iommu_reg = { 0, 0x10001000, 0x28 };
+               struct openprom_addr sbus_iommu_reg = { 0, 0x10001000, 0x28 };
 
                bzero(&ia, sizeof ia);
 
@@ -344,7 +344,7 @@
                ia.iom_node = node;
 
                ia.iom_reg = NULL;
-               PROM_getprop(node, "reg", sizeof(struct sbus_reg),
+               PROM_getprop(node, "reg", sizeof(struct openprom_addr),
                        &ia.iom_nreg, (void **)&ia.iom_reg);
 
                (void) config_found(&sc->sc_dev, (void *)&ia, iommu_print);