[src/trunk]: src/sys/arch/x68k Eliminate EIOMAPSIZE.

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

details:   https://anonhg.NetBSD.org/src/rev/caf3fe1f7bf9
branches:  trunk
changeset: 502075:caf3fe1f7bf9
user:      minoura <minoura%NetBSD.org@localhost>
date:      Thu Jan 11 10:40:55 2001 +0000

description:
Eliminate EIOMAPSIZE.

diffstat:

 sys/arch/x68k/include/vmparam.h     |   9 +--------
 sys/arch/x68k/x68k/pmap.c           |   4 ++--
 sys/arch/x68k/x68k/pmap_bootstrap.c |  16 ++++++----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diffs (93 lines):

diff -r a98f1eb53318 -r caf3fe1f7bf9 sys/arch/x68k/include/vmparam.h
--- a/sys/arch/x68k/include/vmparam.h   Thu Jan 11 10:36:46 2001 +0000
+++ b/sys/arch/x68k/include/vmparam.h   Thu Jan 11 10:40:55 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.17 2001/01/11 10:36:46 minoura Exp $     */
+/*     $NetBSD: vmparam.h,v 1.18 2001/01/11 10:40:55 minoura Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -111,13 +111,6 @@
 #endif
 
 /*
- * External IO space map size.
- */
-#ifndef EIOMAPSIZE
-#define EIOMAPSIZE     0
-#endif
-
-/*
  * The time for a process to be blocked before being very swappable.
  * This is a number of seconds which the system takes as being a non-trivial
  * amount of real time.  You probably shouldn't change this;
diff -r a98f1eb53318 -r caf3fe1f7bf9 sys/arch/x68k/x68k/pmap.c
--- a/sys/arch/x68k/x68k/pmap.c Thu Jan 11 10:36:46 2001 +0000
+++ b/sys/arch/x68k/x68k/pmap.c Thu Jan 11 10:40:55 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.55 2000/09/28 03:41:50 itohy Exp $  */
+/*     $NetBSD: pmap.c,v 1.56 2001/01/11 10:40:56 minoura Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -405,7 +405,7 @@
         */
        addr = (vaddr_t) intiobase;
        if (uvm_map(kernel_map, &addr,
-                   m68k_ptob(IIOMAPSIZE+EIOMAPSIZE),
+                   m68k_ptob(IIOMAPSIZE),
                    NULL, UVM_UNKNOWN_OFFSET, 0,
                    UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE,
                                UVM_INH_NONE, UVM_ADV_RANDOM,
diff -r a98f1eb53318 -r caf3fe1f7bf9 sys/arch/x68k/x68k/pmap_bootstrap.c
--- a/sys/arch/x68k/x68k/pmap_bootstrap.c       Thu Jan 11 10:36:46 2001 +0000
+++ b/sys/arch/x68k/x68k/pmap_bootstrap.c       Thu Jan 11 10:40:55 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_bootstrap.c,v 1.19 2000/06/29 07:07:56 mrg Exp $  */
+/*     $NetBSD: pmap_bootstrap.c,v 1.20 2001/01/11 10:40:56 minoura Exp $      */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -71,10 +71,6 @@
 
 void   pmap_bootstrap __P((paddr_t, paddr_t));
 
-#ifndef EIOMAPSIZE
-#define EIOMAPSIZE 0
-#endif
-
 /*
  * Special purpose kernel virtual addresses, used for mapping
  * physical pages for a variety of temporary or permanent purposes:
@@ -143,9 +139,9 @@
        nextpa += kstsize * NBPG;
        kptpa = nextpa;
        nptpages = RELOC(Sysptsize, int) +
-               (IIOMAPSIZE + EIOMAPSIZE + NPTEPG - 1) / NPTEPG;
+               (IIOMAPSIZE + NPTEPG - 1) / NPTEPG;
        nextpa += nptpages * NBPG;
-       eiopa = nextpa - EIOMAPSIZE * sizeof(pt_entry_t);
+       eiopa = nextpa;
        iiopa = eiopa - IIOMAPSIZE * sizeof(pt_entry_t);
        kptmpa = nextpa;
        nextpa += NBPG;
@@ -395,16 +391,16 @@
         * kernel page table.
         */
        RELOC(IODEVbase, char *) =
-               (char *)m68k_ptob(nptpages*NPTEPG - (IIOMAPSIZE+EIOMAPSIZE));
+               (char *)m68k_ptob(nptpages*NPTEPG - (IIOMAPSIZE));
        RELOC(intiobase, u_int8_t *) = RELOC(IODEVbase, u_int8_t *); /* XXX */
        RELOC(intiolimit, char *) =
-               (char *)m68k_ptob(nptpages*NPTEPG - EIOMAPSIZE);
+               (char *)m68k_ptob(nptpages*NPTEPG);
        /*
         * extiobase: base of external (DIO-II) IO space.
         * EIOMAPSIZE pages at the end of the static kernel page table.
         */
        RELOC(extiobase, char *) =
-               (char *)m68k_ptob(nptpages*NPTEPG - EIOMAPSIZE);
+               (char *)m68k_ptob(nptpages*NPTEPG);
 
        /*
         * Setup u-area for process 0.