[src/trunk]: src/sys/arch/x68k IODEVbase is the same address as intiobase, so...

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

details:   https://anonhg.NetBSD.org/src/rev/6878fd134ef5
branches:  trunk
changeset: 764956:6878fd134ef5
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat May 14 10:19:58 2011 +0000

description:
IODEVbase is the same address as intiobase, so make it an alias macro
and remove now almost empty x68k_init.c.

diffstat:

 sys/arch/x68k/conf/files.x68k       |   3 +-
 sys/arch/x68k/x68k/iodevice.h       |   7 +++--
 sys/arch/x68k/x68k/pmap_bootstrap.c |   5 +--
 sys/arch/x68k/x68k/x68k_init.c      |  44 -------------------------------------
 4 files changed, 7 insertions(+), 52 deletions(-)

diffs (110 lines):

diff -r bdf33cfd6ea9 -r 6878fd134ef5 sys/arch/x68k/conf/files.x68k
--- a/sys/arch/x68k/conf/files.x68k     Sat May 14 02:58:27 2011 +0000
+++ b/sys/arch/x68k/conf/files.x68k     Sat May 14 10:19:58 2011 +0000
@@ -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
diff -r bdf33cfd6ea9 -r 6878fd134ef5 sys/arch/x68k/x68k/iodevice.h
--- a/sys/arch/x68k/x68k/iodevice.h     Sat May 14 02:58:27 2011 +0000
+++ b/sys/arch/x68k/x68k/iodevice.h     Sat May 14 10:19:58 2011 +0000
@@ -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
diff -r bdf33cfd6ea9 -r 6878fd134ef5 sys/arch/x68k/x68k/pmap_bootstrap.c
--- a/sys/arch/x68k/x68k/pmap_bootstrap.c       Sat May 14 02:58:27 2011 +0000
+++ b/sys/arch/x68k/x68k/pmap_bootstrap.c       Sat May 14 10:19:58 2011 +0000
@@ -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;
diff -r bdf33cfd6ea9 -r 6878fd134ef5 sys/arch/x68k/x68k/x68k_init.c
--- a/sys/arch/x68k/x68k/x68k_init.c    Sat May 14 02:58:27 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*     $NetBSD: x68k_init.c,v 1.13 2008/12/18 05:19:52 isaki Exp $     */
-
-/*
- * Copyright (c) 1996 Masaru Oki.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Masaru Oki.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x68k_init.c,v 1.13 2008/12/18 05:19:52 isaki Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-
-#include <machine/bus.h>
-
-#include <arch/x68k/dev/intiovar.h>
-#include <x68k/x68k/iodevice.h>
-
-volatile struct IODEVICE *IODEVbase;