Module Name: src
Committed By: tsutsui
Date: Sat May 14 10:19:58 UTC 2011
Modified Files:
src/sys/arch/x68k/conf: files.x68k
src/sys/arch/x68k/x68k: iodevice.h pmap_bootstrap.c
Removed Files:
src/sys/arch/x68k/x68k: x68k_init.c
Log Message:
IODEVbase is the same address as intiobase, so make it an alias macro
and remove now almost empty x68k_init.c.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/x68k/iodevice.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x68k/x68k/pmap_bootstrap.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/x68k/x68k/x68k_init.c
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/x68k/conf/files.x68k
diff -u src/sys/arch/x68k/conf/files.x68k:1.72 src/sys/arch/x68k/conf/files.x68k:1.73
--- src/sys/arch/x68k/conf/files.x68k:1.72 Thu Mar 17 13:25:54 2011
+++ src/sys/arch/x68k/conf/files.x68k Sat May 14 10:19:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.x68k,v 1.72 2011/03/17 13:25:54 tsutsui Exp $
+# $NetBSD: files.x68k,v 1.73 2011/05/14 10:19:58 tsutsui Exp $
#
# new style config file for x68k architecture
#
@@ -24,7 +24,6 @@
define event {}
file arch/x68k/dev/event.c event
-file arch/x68k/x68k/x68k_init.c
file arch/x68k/x68k/autoconf.c
file arch/x68k/x68k/conf.c
file arch/x68k/x68k/disksubr.c disk
Index: src/sys/arch/x68k/x68k/iodevice.h
diff -u src/sys/arch/x68k/x68k/iodevice.h:1.17 src/sys/arch/x68k/x68k/iodevice.h:1.18
--- src/sys/arch/x68k/x68k/iodevice.h:1.17 Sat Jan 17 09:20:46 2009
+++ src/sys/arch/x68k/x68k/iodevice.h Sat May 14 10:19:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iodevice.h,v 1.17 2009/01/17 09:20:46 isaki Exp $ */
+/* $NetBSD: iodevice.h,v 1.18 2011/05/14 10:19:58 tsutsui Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Masaru Oki
@@ -354,6 +354,7 @@
char inscsirom[0x2000]; /* 0x00fc0000 */
};
-#if defined(_KERNEL) && !defined(LOCORE)
-extern volatile struct IODEVICE *IODEVbase;
+#if defined(_KERNEL) && !defined(_LOCORE)
+extern uint8_t *intiobase; /* XXX */
+#define IODEVbase ((volatile struct IODEVICE *)intiobase)
#endif
Index: src/sys/arch/x68k/x68k/pmap_bootstrap.c
diff -u src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.54 src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.55
--- src/sys/arch/x68k/x68k/pmap_bootstrap.c:1.54 Sun Jan 2 18:48:07 2011
+++ src/sys/arch/x68k/x68k/pmap_bootstrap.c Sat May 14 10:19:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.54 2011/01/02 18:48:07 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.55 2011/05/14 10:19:58 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.54 2011/01/02 18:48:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.55 2011/05/14 10:19:58 tsutsui Exp $");
#include "opt_m68k_arch.h"
@@ -360,7 +360,6 @@
protopte = INTIOBASE | PG_RW | PG_CI | PG_V;
epte = &pte[IIOMAPSIZE];
RELOC(intiobase, uint8_t *) = (uint8_t *)PTE2VA(pte);
- RELOC(IODEVbase, uint8_t *) = RELOC(intiobase, uint8_t *); /* XXX */
RELOC(intiolimit, uint8_t *) = (uint8_t *)PTE2VA(epte);
while (pte < epte) {
*pte++ = protopte;
