[src/trunk]: src/sys/arch/sparc64/dev use struct iommureg_old.

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

details:   https://anonhg.NetBSD.org/src/rev/28db85469be5
branches:  trunk
changeset: 763277:28db85469be5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 16 03:51:29 2011 +0000

description:
use struct iommureg_old.

diffstat:

 sys/arch/sparc64/dev/psycho.c    |  6 +++---
 sys/arch/sparc64/dev/psychoreg.h |  4 ++--
 sys/arch/sparc64/dev/sbus.c      |  6 +++---
 sys/arch/sparc64/dev/sbusreg.h   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 10a8004bb615 -r 28db85469be5 sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Wed Mar 16 03:49:53 2011 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Wed Mar 16 03:51:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psycho.c,v 1.102 2011/02/13 11:54:24 nakayama Exp $    */
+/*     $NetBSD: psycho.c,v 1.103 2011/03/16 03:51:29 mrg Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.102 2011/02/13 11:54:24 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.103 2011/03/16 03:51:29 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -996,7 +996,7 @@
        is->is_bustag = sc->sc_bustag;
        bus_space_subregion(sc->sc_bustag, sc->sc_bh,
                offsetof(struct psychoreg, psy_iommu),
-               sizeof (struct iommureg),
+               sizeof (struct iommureg_old),
                &is->is_iommu);
 
        /*
diff -r 10a8004bb615 -r 28db85469be5 sys/arch/sparc64/dev/psychoreg.h
--- a/sys/arch/sparc64/dev/psychoreg.h  Wed Mar 16 03:49:53 2011 +0000
+++ b/sys/arch/sparc64/dev/psychoreg.h  Wed Mar 16 03:51:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psychoreg.h,v 1.15 2011/03/10 08:46:12 mrg Exp $ */
+/*     $NetBSD: psychoreg.h,v 1.16 2011/03/16 03:51:29 mrg Exp $ */
 
 /*
  * Copyright (c) 1999 Matthew R. Green
@@ -110,7 +110,7 @@
 
        uint64_t        pad2[30];
 
-       struct iommureg psy_iommu;                                                      /* 1fe.0000.0200,0210 */
+       struct iommureg_old psy_iommu;                                          /* 1fe.0000.0200,0210 */
 
        uint64_t        pad3[317];
 
diff -r 10a8004bb615 -r 28db85469be5 sys/arch/sparc64/dev/sbus.c
--- a/sys/arch/sparc64/dev/sbus.c       Wed Mar 16 03:49:53 2011 +0000
+++ b/sys/arch/sparc64/dev/sbus.c       Wed Mar 16 03:51:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbus.c,v 1.85 2009/09/17 16:28:12 tsutsui Exp $ */
+/*     $NetBSD: sbus.c,v 1.86 2011/03/16 03:51:29 mrg Exp $ */
 
 /*
  * Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.85 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.86 2011/03/16 03:51:29 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -234,7 +234,7 @@
        sc->sc_is.is_bustag = sc->sc_bustag;
        bus_space_subregion(sc->sc_bustag, sc->sc_bh, 
                (vaddr_t)&((struct sysioreg *)NULL)->sys_iommu, 
-               sizeof (struct iommureg), &sc->sc_is.is_iommu);
+               sizeof (struct iommureg_old), &sc->sc_is.is_iommu);
  
        /* initialize our strbuf_ctl */
        sc->sc_is.is_sb[0] = &sc->sc_sb;
diff -r 10a8004bb615 -r 28db85469be5 sys/arch/sparc64/dev/sbusreg.h
--- a/sys/arch/sparc64/dev/sbusreg.h    Wed Mar 16 03:49:53 2011 +0000
+++ b/sys/arch/sparc64/dev/sbusreg.h    Wed Mar 16 03:51:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbusreg.h,v 1.8 2006/02/13 21:47:12 cdi Exp $ */
+/*     $NetBSD: sbusreg.h,v 1.9 2011/03/16 03:51:29 mrg Exp $ */
 
 /*
  * Copyright (c) 1996-1999 Eduardo Horvath
@@ -94,7 +94,7 @@
 
        uint64_t        pad3[117];
 
-       struct iommureg sys_iommu;                                                      /* 1fe.0000.2400,2410 */
+       struct iommureg_old     sys_iommu;                                              /* 1fe.0000.2400,2410 */
 
        uint64_t        pad4[125];