Module Name: src
Committed By: mrg
Date: Wed Mar 16 03:51:29 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: psycho.c psychoreg.h sbus.c sbusreg.h
Log Message:
use struct iommureg_old.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/dev/psychoreg.h
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc64/dev/sbusreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.102 src/sys/arch/sparc64/dev/psycho.c:1.103
--- src/sys/arch/sparc64/dev/psycho.c:1.102 Sun Feb 13 11:54:24 2011
+++ src/sys/arch/sparc64/dev/psycho.c Wed Mar 16 03:51:29 2011
@@ -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);
/*
Index: src/sys/arch/sparc64/dev/psychoreg.h
diff -u src/sys/arch/sparc64/dev/psychoreg.h:1.15 src/sys/arch/sparc64/dev/psychoreg.h:1.16
--- src/sys/arch/sparc64/dev/psychoreg.h:1.15 Thu Mar 10 08:46:12 2011
+++ src/sys/arch/sparc64/dev/psychoreg.h Wed Mar 16 03:51:29 2011
@@ -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];
Index: src/sys/arch/sparc64/dev/sbus.c
diff -u src/sys/arch/sparc64/dev/sbus.c:1.85 src/sys/arch/sparc64/dev/sbus.c:1.86
--- src/sys/arch/sparc64/dev/sbus.c:1.85 Thu Sep 17 16:28:12 2009
+++ src/sys/arch/sparc64/dev/sbus.c Wed Mar 16 03:51:29 2011
@@ -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;
Index: src/sys/arch/sparc64/dev/sbusreg.h
diff -u src/sys/arch/sparc64/dev/sbusreg.h:1.8 src/sys/arch/sparc64/dev/sbusreg.h:1.9
--- src/sys/arch/sparc64/dev/sbusreg.h:1.8 Mon Feb 13 21:47:12 2006
+++ src/sys/arch/sparc64/dev/sbusreg.h Wed Mar 16 03:51:29 2011
@@ -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];
