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

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

details:   https://anonhg.NetBSD.org/src/rev/382b9226badc
branches:  netbsd-1-6
changeset: 529459:382b9226badc
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:40:05 2002 +0000

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

diffs (20 lines):

diff -r f6c7112f459e -r 382b9226badc sys/arch/sparc/sparc/autoconf.c
--- a/sys/arch/sparc/sparc/autoconf.c   Fri Nov 22 17:39:37 2002 +0000
+++ b/sys/arch/sparc/sparc/autoconf.c   Fri Nov 22 17:40:05 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.168.4.1 2002/06/21 14:45:42 lukem Exp $ */
+/*     $NetBSD: autoconf.c,v 1.168.4.2 2002/11/22 17:40:05 tron Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -1745,8 +1745,8 @@
                    "want space %#x pa %#x have space %#x pa %#x\n",
                     bp->val[0], bp->val[1], iom->iom_reg[0].ior_iospace,
                     iom->iom_reg[0].ior_pa));
-               if ((u_int32_t)bp->val[0] == iom->iom_reg[0].ior_iospace &&
-                   (u_int32_t)bp->val[1] == iom->iom_reg[0].ior_pa)
+               if ((u_int32_t)bp->val[0] == iom->iom_reg[0].oa_space &&
+                   (u_int32_t)bp->val[1] == iom->iom_reg[0].oa_base)
                        return (1);
                break;
        case BUSCLASS_XDC: