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

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

details:   https://anonhg.NetBSD.org/src/rev/33a922a6ed67
branches:  netbsd-1-6
changeset: 529443:33a922a6ed67
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 22 17:36:00 2002 +0000

description:
Pull up revision 1.25 (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/dev/cgfourteen.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 1581a1000eec -r 33a922a6ed67 sys/arch/sparc/dev/cgfourteen.c
--- a/sys/arch/sparc/dev/cgfourteen.c   Fri Nov 22 17:35:44 2002 +0000
+++ b/sys/arch/sparc/dev/cgfourteen.c   Fri Nov 22 17:36:00 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteen.c,v 1.23.4.1 2002/08/07 01:32:10 lukem Exp $ */
+/*     $NetBSD: cgfourteen.c,v 1.23.4.2 2002/11/22 17:36:00 tron Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -231,7 +231,7 @@
                return;
        }
        bcopy(sa->sa_reg, sc->sc_physadr,
-             sa->sa_nreg * sizeof(struct sbus_reg));
+             sa->sa_nreg * sizeof(struct openprom_addr));
 
        /*
         * Now map in the 8 useful pages of registers
@@ -608,8 +608,8 @@
        }
 
        return (bus_space_mmap(sc->sc_bustag,
-               BUS_ADDR(sc->sc_physadr[CG14_PXL_IDX].sbr_slot,
-                       sc->sc_physadr[CG14_PXL_IDX].sbr_offset),
+               BUS_ADDR(sc->sc_physadr[CG14_PXL_IDX].oa_space,
+                       sc->sc_physadr[CG14_PXL_IDX].oa_base),
                off, prot, BUS_SPACE_MAP_LINEAR));
 }