summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mvme68k/include')
-rw-r--r--sys/arch/mvme68k/include/ansi.h2
-rw-r--r--sys/arch/mvme68k/include/asm.h2
-rw-r--r--sys/arch/mvme68k/include/autoconf.h5
-rw-r--r--sys/arch/mvme68k/include/cdefs.h2
-rw-r--r--sys/arch/mvme68k/include/cpu.h90
-rw-r--r--sys/arch/mvme68k/include/db_machdep.h4
-rw-r--r--sys/arch/mvme68k/include/endian.h2
-rw-r--r--sys/arch/mvme68k/include/exec.h2
-rw-r--r--sys/arch/mvme68k/include/float.h2
-rw-r--r--sys/arch/mvme68k/include/frame.h2
-rw-r--r--sys/arch/mvme68k/include/ieeefp.h2
-rw-r--r--sys/arch/mvme68k/include/limits.h2
-rw-r--r--sys/arch/mvme68k/include/mioctl.h5
-rw-r--r--sys/arch/mvme68k/include/nvram.h5
-rw-r--r--sys/arch/mvme68k/include/param.h2
-rw-r--r--sys/arch/mvme68k/include/pcb.h2
-rw-r--r--sys/arch/mvme68k/include/pmap.h11
-rw-r--r--sys/arch/mvme68k/include/proc.h6
-rw-r--r--sys/arch/mvme68k/include/profile.h2
-rw-r--r--sys/arch/mvme68k/include/prom.h5
-rw-r--r--sys/arch/mvme68k/include/psl.h2
-rw-r--r--sys/arch/mvme68k/include/pte.h12
-rw-r--r--sys/arch/mvme68k/include/ptrace.h2
-rw-r--r--sys/arch/mvme68k/include/reg.h2
-rw-r--r--sys/arch/mvme68k/include/setjmp.h2
-rw-r--r--sys/arch/mvme68k/include/signal.h2
-rw-r--r--sys/arch/mvme68k/include/stdarg.h2
-rw-r--r--sys/arch/mvme68k/include/trap.h2
-rw-r--r--sys/arch/mvme68k/include/types.h2
-rw-r--r--sys/arch/mvme68k/include/varargs.h2
-rw-r--r--sys/arch/mvme68k/include/vmparam.h4
31 files changed, 121 insertions, 68 deletions
diff --git a/sys/arch/mvme68k/include/ansi.h b/sys/arch/mvme68k/include/ansi.h
index 745f1b30ca2..5243cfacc36 100644
--- a/sys/arch/mvme68k/include/ansi.h
+++ b/sys/arch/mvme68k/include/ansi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.1.1.1 1995/07/25 23:12:12 chuck Exp $ */
+/* $Id: ansi.h,v 1.2 1995/11/07 08:49:44 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/ansi.h>
diff --git a/sys/arch/mvme68k/include/asm.h b/sys/arch/mvme68k/include/asm.h
index e4f75e3949f..32692e40f5c 100644
--- a/sys/arch/mvme68k/include/asm.h
+++ b/sys/arch/mvme68k/include/asm.h
@@ -1,3 +1,3 @@
-/* $NetBSD: asm.h,v 1.1.1.1 1995/07/25 23:12:13 chuck Exp $ */
+/* $Id: asm.h,v 1.2 1995/11/07 08:49:45 deraadt Exp $ */
#include <m68k/asm.h>
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h
index e470530d15d..f1ad108dd57 100644
--- a/sys/arch/mvme68k/include/autoconf.h
+++ b/sys/arch/mvme68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD$ */
+/* $Id: autoconf.h,v 1.2 1995/11/07 08:49:46 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -14,7 +14,8 @@
* 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 Theo de Raadt
+ * This product includes software developed under OpenBSD by
+ * Theo de Raadt for Willowglen Singapore.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/cdefs.h b/sys/arch/mvme68k/include/cdefs.h
index 641030e3e30..ffd0e8f2a8d 100644
--- a/sys/arch/mvme68k/include/cdefs.h
+++ b/sys/arch/mvme68k/include/cdefs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.1.1.1 1995/07/25 23:12:19 chuck Exp $ */
+/* $Id: cdefs.h,v 1.2 1995/11/07 08:49:47 deraadt Exp $ */
#ifndef _MACHINE_CDEFS_H_
#define _MACHINE_CDEFS_H_
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index aec3e71fbe6..16ea864334c 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,6 +1,35 @@
-/* $NetBSD: cpu.h,v 1.1.1.1 1995/07/25 23:12:13 chuck Exp $ */
+/* $Id: cpu.h,v 1.2 1995/11/07 08:49:47 deraadt Exp $ */
/*
+ * Copyright (c) 1995 Theo de Raadt
+ *
+ * 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 under OpenBSD by
+ * Theo de Raadt for Willowglen Singapore.
+ * 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.
+ *
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -57,7 +86,7 @@
/*
* Arguments to hardclock and gatherstats encapsulate the previous
- * machine state in an opaque clockframe. One the mvme68k, we use
+ * machine state in an opaque clockframe. One the m68k, we use
* what the hardware pushes on an interrupt (frame format 0).
*/
struct clockframe {
@@ -86,7 +115,7 @@ struct clockframe {
/*
* Give a profiling tick to the current process when the user profiling
- * buffer pages are invalid. On the hp300, request an ast to send us
+ * buffer pages are invalid. On the m68k, request an ast to send us
* through trap, marking the proc as needing a profiling tick.
*/
#define need_proftick(p) { (p)->p_flag |= P_OWEUPC; aston(); }
@@ -112,11 +141,9 @@ extern unsigned char ssir;
#define SIR_CLOCK 0x2
#define setsoftint(x) ssir |= (x)
-#define siroff(x) ssir &= ~(x)
#define setsoftnet() ssir |= SIR_NET
#define setsoftclock() ssir |= SIR_CLOCK
-
-extern unsigned long allocate_sir();
+u_long allocate_sir __P((void (*proc)(), void *arg));
/*
* CTL_MACHDEP definitions.
@@ -139,23 +166,25 @@ extern unsigned long allocate_sir();
#define EC_NONE 0 /* no external cache */
#define EC_VIRT 1 /* external virtual address cache */
-#define MHZ_16 2 /* XXX kill */
-
-
#ifdef _KERNEL
extern int mmutype, ectype;
-extern int cpuspeed; /* XXX kill */
extern char *intiobase, *intiolimit;
+extern char *iiomapbase;
+extern int iiomapsize;
#endif
/* physical memory sections for mvme147 */
-#define INTIOBASE (0xfffe0000)
-#define INTIOTOP (0xfffe5000)
+#define INTIOBASE_147 (0xfffe0000)
+#define INTIOTOP_147 (0xfffe5000)
+#define INTIOSIZE_147 ((INTIOTOP_147-INTIOBASE_147)/NBPG)
+
+/* physical memory sections for mvme16x */
+#define INTIOBASE_162 (0xfff00000)
+#define INTIOTOP_162 (0xfffd0000) /* was 0xfff50000 */
+#define INTIOSIZE_162 ((INTIOTOP_162-INTIOBASE_162)/NBPG)
/*
- * Internal IO space:
- *
- * Ranges from 0x800000 to 0x1000000 (IIOMAPSIZE).
+ * Internal IO space (iiomapsize).
*
* Internal IO space is mapped in the kernel from ``intiobase'' to
* ``intiolimit'' (defined in locore.s). Since it is always mapped,
@@ -163,10 +192,9 @@ extern char *intiobase, *intiolimit;
*/
#define ISIIOVA(va) \
((char *)(va) >= intiobase && (char *)(va) < intiolimit)
-#define IIOV(pa) ((int)(pa)-INTIOBASE+(int)intiobase)
-#define IIOP(va) ((int)(va)-(int)intiobase+INTIOBASE)
-#define IIOPOFF(pa) ((int)(pa)-INTIOBASE)
-#define IIOMAPSIZE btoc(INTIOTOP-INTIOBASE) /* 1mb */
+#define IIOV(pa) ((int)(pa)-(int)iiomapbase+(int)intiobase)
+#define IIOP(va) ((int)(va)-(int)intiobase+(int)iiomapbase)
+#define IIOPOFF(pa) ((int)(pa)-(int)iiomapbase)
/*
* 68851 and 68030 MMU
@@ -223,8 +251,30 @@ extern char *intiobase, *intiolimit;
#define DC_CLEAR (DC_WA|DC_BE|DC_CLR|DC_ENABLE|IC_BE|IC_ENABLE)
/* 68040 cache control register */
-#define IC4_ENABLE 0x8000 /* instruction cache enable bit */
+#define IC4_ENABLE 0x00008000 /* instruction cache enable bit */
#define DC4_ENABLE 0x80000000 /* data cache enable bit */
#define CACHE4_ON (IC4_ENABLE|DC4_ENABLE)
#define CACHE4_OFF (0)
+
+extern int cputyp;
+#define CPU_147 0x147
+#define CPU_162 0x162
+#define CPU_166 0x166
+#define CPU_167 0x167
+#define CPU_172 0x172
+#define CPU_177 0x177
+
+struct intrhand {
+ struct intrhand *ih_next;
+ int (*ih_fn)();
+ void *ih_arg;
+ int ih_ipl;
+ int ih_wantframe;
+};
+
+struct haltvec {
+ struct haltvec *hv_next;
+ void (*hv_fn) __P((void));
+ int hv_pri;
+};
diff --git a/sys/arch/mvme68k/include/db_machdep.h b/sys/arch/mvme68k/include/db_machdep.h
index a736e228618..4b4f3ad69dd 100644
--- a/sys/arch/mvme68k/include/db_machdep.h
+++ b/sys/arch/mvme68k/include/db_machdep.h
@@ -1,4 +1,6 @@
-/* $NetBSD: db_machdep.h,v 1.1.1.1 1995/07/25 23:12:14 chuck Exp $ */
+/* $Id: db_machdep.h,v 1.2 1995/11/07 08:49:48 deraadt Exp $ */
+
+#define DB_MACHINE_COMMANDS
/* Just use the common m68k definition */
#include <m68k/db_machdep.h>
diff --git a/sys/arch/mvme68k/include/endian.h b/sys/arch/mvme68k/include/endian.h
index 3876563a9f3..42e215473aa 100644
--- a/sys/arch/mvme68k/include/endian.h
+++ b/sys/arch/mvme68k/include/endian.h
@@ -1,4 +1,4 @@
-/* $NetBSD: endian.h,v 1.1.1.1 1995/07/25 23:12:15 chuck Exp $ */
+/* $Id: endian.h,v 1.2 1995/11/07 08:49:49 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/endian.h>
diff --git a/sys/arch/mvme68k/include/exec.h b/sys/arch/mvme68k/include/exec.h
index eea9bf11738..26db9171851 100644
--- a/sys/arch/mvme68k/include/exec.h
+++ b/sys/arch/mvme68k/include/exec.h
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.1.1.1 1995/07/25 23:12:15 chuck Exp $ */
+/* $Id: exec.h,v 1.2 1995/11/07 08:49:50 deraadt Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
diff --git a/sys/arch/mvme68k/include/float.h b/sys/arch/mvme68k/include/float.h
index 5eeebfa7f4b..e09bdec1d73 100644
--- a/sys/arch/mvme68k/include/float.h
+++ b/sys/arch/mvme68k/include/float.h
@@ -1,4 +1,4 @@
-/* $NetBSD: float.h,v 1.1.1.1 1995/07/25 23:12:15 chuck Exp $ */
+/* $Id: float.h,v 1.2 1995/11/07 08:49:50 deraadt Exp $ */
#ifndef _MACHINE_FLOAT_H_
#define _MACHINE_FLOAT_H_
diff --git a/sys/arch/mvme68k/include/frame.h b/sys/arch/mvme68k/include/frame.h
index a6b1f3c584b..dc6892d7f1e 100644
--- a/sys/arch/mvme68k/include/frame.h
+++ b/sys/arch/mvme68k/include/frame.h
@@ -1,3 +1,3 @@
-/* $NetBSD: frame.h,v 1.1.1.1 1995/07/25 23:12:15 chuck Exp $ */
+/* $Id: frame.h,v 1.2 1995/11/07 08:49:51 deraadt Exp $ */
#include <m68k/frame.h>
diff --git a/sys/arch/mvme68k/include/ieeefp.h b/sys/arch/mvme68k/include/ieeefp.h
index 8d6941e81b5..ddc75724183 100644
--- a/sys/arch/mvme68k/include/ieeefp.h
+++ b/sys/arch/mvme68k/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:08 jtc Exp $ */
+/* $Id: ieeefp.h,v 1.2 1995/11/07 08:49:52 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/ieeefp.h>
diff --git a/sys/arch/mvme68k/include/limits.h b/sys/arch/mvme68k/include/limits.h
index ab36a0f1dc7..38f30a8723e 100644
--- a/sys/arch/mvme68k/include/limits.h
+++ b/sys/arch/mvme68k/include/limits.h
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.1.1.1 1995/07/25 23:12:16 chuck Exp $ */
+/* $Id: limits.h,v 1.2 1995/11/07 08:49:53 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/limits.h>
diff --git a/sys/arch/mvme68k/include/mioctl.h b/sys/arch/mvme68k/include/mioctl.h
index ba76d4a441a..0cfe2cdaffb 100644
--- a/sys/arch/mvme68k/include/mioctl.h
+++ b/sys/arch/mvme68k/include/mioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD$ */
+/* $Id: mioctl.h,v 1.2 1995/11/07 08:49:54 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -14,7 +14,8 @@
* 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 Theo de Raadt
+ * This product includes software developed under OpenBSD by
+ * Theo de Raadt for Willowglen Singapore.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/nvram.h b/sys/arch/mvme68k/include/nvram.h
index 91690b7ba4d..b5fb692e1c7 100644
--- a/sys/arch/mvme68k/include/nvram.h
+++ b/sys/arch/mvme68k/include/nvram.h
@@ -1,4 +1,4 @@
-/* $NetBSD$ */
+/* $Id: nvram.h,v 1.2 1995/11/07 08:49:54 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -14,7 +14,8 @@
* 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 Theo de Raadt
+ * This product includes software developed under OpenBSD by
+ * Theo de Raadt for Willowglen Singapore.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index e6140206e68..199771f9aa2 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.9 1995/03/28 18:15:38 jtc Exp $ */
+/* $Id: param.h,v 1.3 1995/11/07 08:49:55 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/mvme68k/include/pcb.h b/sys/arch/mvme68k/include/pcb.h
index 001543c03c4..4edade720df 100644
--- a/sys/arch/mvme68k/include/pcb.h
+++ b/sys/arch/mvme68k/include/pcb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.1.1.1 1995/07/25 23:12:16 chuck Exp $ */
+/* $Id: pcb.h,v 1.2 1995/11/07 08:49:56 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h
index 323861224dd..8103a94c8f2 100644
--- a/sys/arch/mvme68k/include/pmap.h
+++ b/sys/arch/mvme68k/include/pmap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.1.1.1 1995/07/25 23:12:16 chuck Exp $ */
+/* $Id: pmap.h,v 1.2 1995/11/07 08:49:57 deraadt Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@@ -46,13 +46,13 @@
#include <machine/pte.h>
#if defined(M68040)
-#define HP_SEG_SIZE (mmutype == MMU_68040 ? 0x40000 : NBSEG)
+#define M68K_SEG_SIZE (mmutype == MMU_68040 ? 0x40000 : NBSEG)
#else
-#define HP_SEG_SIZE NBSEG
+#define M68K_SEG_SIZE NBSEG
#endif
-#define m68k_trunc_seg(x) (((unsigned)(x)) & ~(HP_SEG_SIZE-1))
-#define m68k_round_seg(x) m68k_trunc_seg((unsigned)(x) + HP_SEG_SIZE-1)
+#define m68k_trunc_seg(x) (((unsigned)(x)) & ~(M68K_SEG_SIZE-1))
+#define m68k_round_seg(x) m68k_trunc_seg((unsigned)(x) + M68K_SEG_SIZE-1)
/*
* Pmap stuff
@@ -138,7 +138,6 @@ struct pv_page {
#ifdef _KERNEL
extern struct pmap kernel_pmap_store;
-extern vm_offset_t vm_first_phys, vm_num_phys;
#define pmap_kernel() (&kernel_pmap_store)
#define active_pmap(pm) \
diff --git a/sys/arch/mvme68k/include/proc.h b/sys/arch/mvme68k/include/proc.h
index e50f573dea8..2165ed8a821 100644
--- a/sys/arch/mvme68k/include/proc.h
+++ b/sys/arch/mvme68k/include/proc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.1.1.1 1995/07/25 23:12:16 chuck Exp $ */
+/* $Id: proc.h,v 1.2 1995/11/07 08:49:58 deraadt Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -44,9 +44,7 @@ struct mdproc {
};
/* md_flags */
-#define MDP_STACKADJ 0x0002 /* frame SP adjusted, might have to
- undo when system call returns
- ERESTART. */
+#define MDP_STACKADJ 0x0002 /* frame SP adjusted; undo when syscall does ERESTART */
#define MDP_HPUXTRACE 0x0004 /* being traced by HP-UX process */
#define MDP_HPUXMMAP 0x0008 /* VA space is multiply mapped */
#define MDP_CCBDATA 0x0010 /* copyback caching of data (68040) */
diff --git a/sys/arch/mvme68k/include/profile.h b/sys/arch/mvme68k/include/profile.h
index 135774c7a25..95cf0fbc485 100644
--- a/sys/arch/mvme68k/include/profile.h
+++ b/sys/arch/mvme68k/include/profile.h
@@ -1,3 +1,3 @@
-/* $NetBSD: profile.h,v 1.1.1.1 1995/07/25 23:12:17 chuck Exp $ */
+/* $Id: profile.h,v 1.2 1995/11/07 08:49:58 deraadt Exp $ */
#include <m68k/profile.h>
diff --git a/sys/arch/mvme68k/include/prom.h b/sys/arch/mvme68k/include/prom.h
index 60514bda0dc..2325b5806cb 100644
--- a/sys/arch/mvme68k/include/prom.h
+++ b/sys/arch/mvme68k/include/prom.h
@@ -1,4 +1,4 @@
-/* $NetBSD$ */
+/* $Id: prom.h,v 1.2 1995/11/07 08:49:59 deraadt Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -14,7 +14,8 @@
* 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 Theo de Raadt
+ * This product includes software developed under OpenBSD by
+ * Theo de Raadt for Willowglen Singapore.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/psl.h b/sys/arch/mvme68k/include/psl.h
index e374e95e9bb..5243a91651c 100644
--- a/sys/arch/mvme68k/include/psl.h
+++ b/sys/arch/mvme68k/include/psl.h
@@ -1,3 +1,3 @@
-/* $NetBSD: psl.h,v 1.1.1.1 1995/07/25 23:12:17 chuck Exp $ */
+/* $Id: psl.h,v 1.2 1995/11/07 08:50:00 deraadt Exp $ */
#include <m68k/psl.h>
diff --git a/sys/arch/mvme68k/include/pte.h b/sys/arch/mvme68k/include/pte.h
index e7c55296f1e..173c7c4647d 100644
--- a/sys/arch/mvme68k/include/pte.h
+++ b/sys/arch/mvme68k/include/pte.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.1.1.1 1995/07/25 23:12:17 chuck Exp $ */
+/* $Id: pte.h,v 1.2 1995/11/07 08:50:01 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -132,12 +132,12 @@ typedef int pt_entry_t; /* Mach page table entry */
#define PG_CIN 0x00000060 /* cache inhibited nonserialized */
#define PG_SO 0x00000080 /* supervisor only */
-#define HP_STSIZE (MAXUL2SIZE*SG4_LEV2SIZE*sizeof(st_entry_t))
+#define M68K_STSIZE (MAXUL2SIZE*SG4_LEV2SIZE*sizeof(st_entry_t))
/* user process segment table size */
-#define HP_MAX_PTSIZE 0x400000 /* max size of UPT */
-#define HP_MAX_KPTSIZE 0x100000 /* max memory to allocate to KPT */
-#define HP_PTBASE 0x10000000 /* UPT map base address */
-#define HP_PTMAXSIZE 0x70000000 /* UPT map maximum size */
+#define M68K_MAX_PTSIZE 0x400000 /* max size of UPT */
+#define M68K_MAX_KPTSIZE 0x100000 /* max memory to allocate to KPT */
+#define M68K_PTBASE 0x10000000 /* UPT map base address */
+#define M68K_PTMAXSIZE 0x70000000 /* UPT map maximum size */
/*
* Kernel virtual address to page table entry and to physical address.
diff --git a/sys/arch/mvme68k/include/ptrace.h b/sys/arch/mvme68k/include/ptrace.h
index 5a92bbbe410..906da20f4ca 100644
--- a/sys/arch/mvme68k/include/ptrace.h
+++ b/sys/arch/mvme68k/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.1.1.1 1995/07/25 23:12:17 chuck Exp $ */
+/* $Id: ptrace.h,v 1.2 1995/11/07 08:50:01 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/ptrace.h>
diff --git a/sys/arch/mvme68k/include/reg.h b/sys/arch/mvme68k/include/reg.h
index a78c3a7c910..3599a943dd9 100644
--- a/sys/arch/mvme68k/include/reg.h
+++ b/sys/arch/mvme68k/include/reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: reg.h,v 1.1.1.1 1995/07/25 23:12:18 chuck Exp $ */
+/* $Id: reg.h,v 1.2 1995/11/07 08:50:02 deraadt Exp $ */
#ifndef _MACHINE_REG_H_
#define _MACHINE_REG_H_
diff --git a/sys/arch/mvme68k/include/setjmp.h b/sys/arch/mvme68k/include/setjmp.h
index bccffd9143b..0843a9c3c53 100644
--- a/sys/arch/mvme68k/include/setjmp.h
+++ b/sys/arch/mvme68k/include/setjmp.h
@@ -1,3 +1,3 @@
-/* $NetBSD: setjmp.h,v 1.1.1.1 1995/07/25 23:12:18 chuck Exp $ */
+/* $Id: setjmp.h,v 1.2 1995/11/07 08:50:03 deraadt Exp $ */
#include <m68k/setjmp.h>
diff --git a/sys/arch/mvme68k/include/signal.h b/sys/arch/mvme68k/include/signal.h
index a00ca454c06..feac291319b 100644
--- a/sys/arch/mvme68k/include/signal.h
+++ b/sys/arch/mvme68k/include/signal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.1.1.1 1995/07/25 23:12:18 chuck Exp $ */
+/* $Id: signal.h,v 1.2 1995/11/07 08:50:04 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/signal.h>
diff --git a/sys/arch/mvme68k/include/stdarg.h b/sys/arch/mvme68k/include/stdarg.h
index 5018e7e3993..65d252073c7 100644
--- a/sys/arch/mvme68k/include/stdarg.h
+++ b/sys/arch/mvme68k/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdarg.h,v 1.1.1.1 1995/07/25 23:12:18 chuck Exp $ */
+/* $Id: stdarg.h,v 1.2 1995/11/07 08:50:05 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/stdarg.h>
diff --git a/sys/arch/mvme68k/include/trap.h b/sys/arch/mvme68k/include/trap.h
index 881b0ad8e3a..515baf90403 100644
--- a/sys/arch/mvme68k/include/trap.h
+++ b/sys/arch/mvme68k/include/trap.h
@@ -1,3 +1,3 @@
-/* $NetBSD: trap.h,v 1.1.1.1 1995/07/25 23:12:19 chuck Exp $ */
+/* $Id: trap.h,v 1.2 1995/11/07 08:50:06 deraadt Exp $ */
#include <m68k/trap.h>
diff --git a/sys/arch/mvme68k/include/types.h b/sys/arch/mvme68k/include/types.h
index 0a0c7885eec..69ae636bac1 100644
--- a/sys/arch/mvme68k/include/types.h
+++ b/sys/arch/mvme68k/include/types.h
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.1.1.1 1995/07/25 23:12:19 chuck Exp $ */
+/* $Id: types.h,v 1.2 1995/11/07 08:50:06 deraadt Exp $ */
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
diff --git a/sys/arch/mvme68k/include/varargs.h b/sys/arch/mvme68k/include/varargs.h
index 797ad3e7e0c..653572172a3 100644
--- a/sys/arch/mvme68k/include/varargs.h
+++ b/sys/arch/mvme68k/include/varargs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: varargs.h,v 1.1.1.1 1995/07/25 23:12:19 chuck Exp $ */
+/* $Id: varargs.h,v 1.2 1995/11/07 08:50:07 deraadt Exp $ */
/* Just use the common m68k definition */
#include <m68k/varargs.h>
diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h
index 7e274b713dc..4b75b1ec4ce 100644
--- a/sys/arch/mvme68k/include/vmparam.h
+++ b/sys/arch/mvme68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.1.1.1 1995/07/25 23:12:19 chuck Exp $ */
+/* $Id: vmparam.h,v 1.2 1995/11/07 08:50:08 deraadt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -120,7 +120,7 @@
* External IO space map size.
*/
#ifndef EIOMAPSIZE
-#define EIOMAPSIZE 0 /* nothing */
+#define EIOMAPSIZE 1024 /* in pages */
#endif
/*