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

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

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

description:
Pull up revision 1.6 (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/iommuvar.h |  10 +++-------
 sys/arch/sparc/sparc/timer.c    |  10 +++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diffs (61 lines):

diff -r 830f20e43f2d -r a89412229c29 sys/arch/sparc/sparc/iommuvar.h
--- a/sys/arch/sparc/sparc/iommuvar.h   Fri Nov 22 17:38:09 2002 +0000
+++ b/sys/arch/sparc/sparc/iommuvar.h   Fri Nov 22 17:38:22 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommuvar.h,v 1.5 2000/01/11 13:01:52 pk Exp $  */
+/*     $NetBSD: iommuvar.h,v 1.5.22.1 2002/11/22 17:38:22 tron Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,18 +39,14 @@
 #ifndef _IOMMU_VAR_H
 #define _IOMMU_VAR_H
 
-struct iommu_reg {
-       u_int32_t       ior_iospace;
-       u_int32_t       ior_pa;
-       u_int32_t       ior_size;
-};
+#include <machine/bsd_openprom.h>
 
 struct iommu_attach_args {
        bus_space_tag_t iom_bustag;
        bus_dma_tag_t   iom_dmatag;
        char            *iom_name;      /* PROM node name */
         int            iom_node;       /* PROM handle */
-       struct iommu_reg *iom_reg;
+       struct openprom_addr *iom_reg;
        int             iom_nreg;
 };
 
diff -r 830f20e43f2d -r a89412229c29 sys/arch/sparc/sparc/timer.c
--- a/sys/arch/sparc/sparc/timer.c      Fri Nov 22 17:38:09 2002 +0000
+++ b/sys/arch/sparc/sparc/timer.c      Fri Nov 22 17:38:22 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer.c,v 1.3.6.1 2002/07/15 16:27:48 thorpej Exp $ */
+/*     $NetBSD: timer.c,v 1.3.6.2 2002/11/22 17:38:22 tron Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -271,8 +271,8 @@
                i = sa->sa_nreg - 1;
                if (bus_space_map2(sa->sa_bustag,
                                 BUS_ADDR(
-                                       sa->sa_reg[i].sbr_slot,
-                                       sa->sa_reg[i].sbr_offset),
+                                       sa->sa_reg[i].oa_space,
+                                       sa->sa_reg[i].oa_base),
                                 sizeof(struct timer_4m),
                                 BUS_SPACE_MAP_LINEAR,
                                 TIMERREG_VA, &bh) != 0) {
@@ -301,8 +301,8 @@
                        if (cpi == NULL)
                                continue;
                        if (sbus_bus_map(sa->sa_bustag,
-                                        sa->sa_reg[i].sbr_slot,
-                                        sa->sa_reg[i].sbr_offset,
+                                        sa->sa_reg[i].oa_space,
+                                        sa->sa_reg[i].oa_base,
                                         sizeof(struct timer_4m),
                                         BUS_SPACE_MAP_LINEAR,
                                         &bh) != 0) {