The "powerpc" port which has supported the newer Apple Macintosh powerpc based

is being renamed to macppc. This is to allow sharing of common code
between different powerpc base platforms.

Most of the work involved in the renaming process was performed by miod@

Files moved from powerpc/include to macppc/include
Some files were not "moved" but wrapper files were created which include
the powerpc/include version.

Several of the powerpc/include files where changed to reflect that they
are POWERPC_* not MACHINE_*.

77 files changed, 354 insertions, 261 deletions

diff --git a/sys/arch/powerpc/include/adbsys.h b/sys/arch/macppc/include/adbsys.h
index 16ebcf83fb5..c06fadaef87 100644
--- a/sys/arch/powerpc/include/adbsys.h
+++ b/sys/arch/macppc/include/adbsys.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbsys.h,v 1.5 2001/07/01 04:31:23 drahn Exp $	*/
+/*	$OpenBSD: adbsys.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: adbsys.h,v 1.4 2000/12/19 02:59:24 tsubai Exp $	*/
 
 /*-
diff --git a/sys/arch/macppc/include/ansi.h b/sys/arch/macppc/include/ansi.h
new file mode 100644
index 00000000000..a72d06c30f1
--- /dev/null
+++ b/sys/arch/macppc/include/ansi.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: ansi.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/ansi.h>
diff --git a/sys/arch/macppc/include/asm.h b/sys/arch/macppc/include/asm.h
new file mode 100644
index 00000000000..a2c91a90c0d
--- /dev/null
+++ b/sys/arch/macppc/include/asm.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: asm.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/asm.h>
diff --git a/sys/arch/powerpc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index d98451caec8..76c44721873 100644
--- a/sys/arch/powerpc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.10 2001/07/09 02:14:05 mickey Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.1 2001/09/01 15:49:06 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
diff --git a/sys/arch/macppc/include/bat.h b/sys/arch/macppc/include/bat.h
new file mode 100644
index 00000000000..fad8efe22b8
--- /dev/null
+++ b/sys/arch/macppc/include/bat.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: bat.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/bat.h>
diff --git a/sys/arch/powerpc/include/bus.h b/sys/arch/macppc/include/bus.h
index 1f60b398f6f..eb4904a0ad5 100644
--- a/sys/arch/powerpc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.18 2001/08/01 23:53:09 pvalchev Exp $	*/
+/*	$OpenBSD: bus.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
diff --git a/sys/arch/macppc/include/cdefs.h b/sys/arch/macppc/include/cdefs.h
new file mode 100644
index 00000000000..894bf65d451
--- /dev/null
+++ b/sys/arch/macppc/include/cdefs.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: cdefs.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/cdefs.h>
diff --git a/sys/arch/powerpc/include/conf.h b/sys/arch/macppc/include/conf.h
index 91bf6266337..d262a59c7c3 100644
--- a/sys/arch/powerpc/include/conf.h
+++ b/sys/arch/macppc/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.1 2001/06/25 00:04:42 drahn Exp $	*/
+/*	$OpenBSD: conf.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $	*/
 
 /*
diff --git a/sys/arch/macppc/include/cpu.h b/sys/arch/macppc/include/cpu.h
new file mode 100644
index 00000000000..bc2918a4d48
--- /dev/null
+++ b/sys/arch/macppc/include/cpu.h
@@ -0,0 +1,63 @@
+/*	$OpenBSD: cpu.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+/*	$NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $	*/
+
+/*
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * 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 TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
+ */
+#ifndef	_MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
+
+#include <powerpc/cpu.h>
+
+void	child_return __P((struct proc *));
+
+#define	CACHELINESIZE	32			/* For now		XXX */
+
+static __inline void
+syncicache(void *from, int len)
+{
+	int l = len;
+	char *p = from;
+	
+	do {
+		__asm__ __volatile__ ("dcbst 0,%0" :: "r"(p));
+		p += CACHELINESIZE;
+	} while ((l -= CACHELINESIZE) > 0);
+	__asm__ __volatile__ ("sync");
+	p = from;
+	l = len;
+	do {
+		__asm__ __volatile__ ("icbi 0,%0" :: "r"(p));
+		p += CACHELINESIZE;
+	} while ((l -= CACHELINESIZE) > 0);
+	__asm__ __volatile__ ("isync");
+}
+
+#endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/macppc/include/db_machdep.h
index 879da1f742f..a02ccbc1d4d 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/macppc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.14 2001/08/19 19:06:46 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /*
diff --git a/sys/arch/powerpc/include/disklabel.h b/sys/arch/macppc/include/disklabel.h
index 3ec45cd4b23..b3e13648d3f 100644
--- a/sys/arch/powerpc/include/disklabel.h
+++ b/sys/arch/macppc/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.15 2001/06/24 04:54:21 drahn Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
diff --git a/sys/arch/macppc/include/dlfcn.h b/sys/arch/macppc/include/dlfcn.h
new file mode 100644
index 00000000000..8c6e04499a7
--- /dev/null
+++ b/sys/arch/macppc/include/dlfcn.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: dlfcn.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/dlfcn.h>
diff --git a/sys/arch/macppc/include/elf_abi.h b/sys/arch/macppc/include/elf_abi.h
new file mode 100644
index 00000000000..285d92f192d
--- /dev/null
+++ b/sys/arch/macppc/include/elf_abi.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: elf_abi.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/elf_abi.h>
diff --git a/sys/arch/macppc/include/endian.h b/sys/arch/macppc/include/endian.h
new file mode 100644
index 00000000000..07bb123f31d
--- /dev/null
+++ b/sys/arch/macppc/include/endian.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: endian.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/endian.h>
diff --git a/sys/arch/macppc/include/exec.h b/sys/arch/macppc/include/exec.h
new file mode 100644
index 00000000000..a3aea3d5eda
--- /dev/null
+++ b/sys/arch/macppc/include/exec.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: exec.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/exec.h>
diff --git a/sys/arch/macppc/include/float.h b/sys/arch/macppc/include/float.h
new file mode 100644
index 00000000000..fd859b43d83
--- /dev/null
+++ b/sys/arch/macppc/include/float.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: float.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/float.h>
diff --git a/sys/arch/macppc/include/fpu.h b/sys/arch/macppc/include/fpu.h
new file mode 100644
index 00000000000..24b13de9abb
--- /dev/null
+++ b/sys/arch/macppc/include/fpu.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: fpu.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/fpu.h>
diff --git a/sys/arch/macppc/include/frame.h b/sys/arch/macppc/include/frame.h
new file mode 100644
index 00000000000..4029b0913c3
--- /dev/null
+++ b/sys/arch/macppc/include/frame.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: frame.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/frame.h>
diff --git a/sys/arch/macppc/include/ieee.h b/sys/arch/macppc/include/ieee.h
new file mode 100644
index 00000000000..53ba80f7a94
--- /dev/null
+++ b/sys/arch/macppc/include/ieee.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: ieee.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/ieee.h>
diff --git a/sys/arch/macppc/include/ieeefp.h b/sys/arch/macppc/include/ieeefp.h
new file mode 100644
index 00000000000..b21eda1bb04
--- /dev/null
+++ b/sys/arch/macppc/include/ieeefp.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: ieeefp.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/ieeefp.h>
diff --git a/sys/arch/macppc/include/intr.h b/sys/arch/macppc/include/intr.h
new file mode 100644
index 00000000000..b90e8aa7f79
--- /dev/null
+++ b/sys/arch/macppc/include/intr.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: intr.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/intr.h>
diff --git a/sys/arch/macppc/include/ipkdb.h b/sys/arch/macppc/include/ipkdb.h
new file mode 100644
index 00000000000..db0ddf831df
--- /dev/null
+++ b/sys/arch/macppc/include/ipkdb.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: ipkdb.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/ipkdb.h>
diff --git a/sys/arch/macppc/include/kbio.h b/sys/arch/macppc/include/kbio.h
new file mode 100644
index 00000000000..754bd3e960d
--- /dev/null
+++ b/sys/arch/macppc/include/kbio.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: kbio.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/kbio.h>
diff --git a/sys/arch/macppc/include/kcore.h b/sys/arch/macppc/include/kcore.h
new file mode 100644
index 00000000000..0ae90babbc2
--- /dev/null
+++ b/sys/arch/macppc/include/kcore.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: kcore.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/kcore.h>
diff --git a/sys/arch/macppc/include/limits.h b/sys/arch/macppc/include/limits.h
new file mode 100644
index 00000000000..2b76ef417cd
--- /dev/null
+++ b/sys/arch/macppc/include/limits.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: limits.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/limits.h>
diff --git a/sys/arch/macppc/include/link.h b/sys/arch/macppc/include/link.h
new file mode 100644
index 00000000000..d54ca2548af
--- /dev/null
+++ b/sys/arch/macppc/include/link.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: link.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/link.h>
diff --git a/sys/arch/powerpc/include/loadfile_machdep.h b/sys/arch/macppc/include/loadfile_machdep.h
index 617fdc1e2d2..43225874849 100644
--- a/sys/arch/powerpc/include/loadfile_machdep.h
+++ b/sys/arch/macppc/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2001/07/04 08:38:48 niklas Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $	*/
 
 /*-
diff --git a/sys/arch/macppc/include/param.h b/sys/arch/macppc/include/param.h
new file mode 100644
index 00000000000..a046ab6f7f1
--- /dev/null
+++ b/sys/arch/macppc/include/param.h
@@ -0,0 +1,59 @@
+/*	$OpenBSD: param.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+/*	$NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
+
+/*-
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * 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 TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
+ */
+
+#ifdef	_KERNEL
+#ifndef	_LOCORE
+#include <machine/cpu.h>
+#endif	/* _LOCORE */
+#endif
+
+#include <powerpc/param.h>
+
+/*
+ * Machine dependent constants for macppc (32-bit only currently)
+ */
+#define	MACHINE		"macppc"
+#define	_MACHINE	macppc
+
+#define	KERNBASE	0x100000
+
+#define MSGBUFSIZE	(NBPG*2)
+
+/*
+ * Size of kernel malloc arena in logical pages.
+ */
+#ifndef	NKMEMCLUSTERS
+#define	NKMEMCLUSTERS	(16 * 1024 * 1024 / PAGE_SIZE)
+#endif
+
diff --git a/sys/arch/macppc/include/pcb.h b/sys/arch/macppc/include/pcb.h
new file mode 100644
index 00000000000..19082e03bfc
--- /dev/null
+++ b/sys/arch/macppc/include/pcb.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: pcb.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/pcb.h>
diff --git a/sys/arch/macppc/include/pio.h b/sys/arch/macppc/include/pio.h
new file mode 100644
index 00000000000..bdc8c3df3c4
--- /dev/null
+++ b/sys/arch/macppc/include/pio.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: pio.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/pio.h>
diff --git a/sys/arch/macppc/include/pmap.h b/sys/arch/macppc/include/pmap.h
new file mode 100644
index 00000000000..ef0a613595a
--- /dev/null
+++ b/sys/arch/macppc/include/pmap.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: pmap.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/pmap.h>
diff --git a/sys/arch/powerpc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h
index 731c7fd1da8..937dab7c7f3 100644
--- a/sys/arch/powerpc/include/powerpc.h
+++ b/sys/arch/macppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powerpc.h,v 1.6 2001/06/29 06:07:09 drahn Exp $	*/
+/*	$OpenBSD: powerpc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $	*/
 
 /*
diff --git a/sys/arch/macppc/include/proc.h b/sys/arch/macppc/include/proc.h
new file mode 100644
index 00000000000..8fc70f202cf
--- /dev/null
+++ b/sys/arch/macppc/include/proc.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: proc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/proc.h>
diff --git a/sys/arch/macppc/include/profile.h b/sys/arch/macppc/include/profile.h
new file mode 100644
index 00000000000..09383464754
--- /dev/null
+++ b/sys/arch/macppc/include/profile.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: profile.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/profile.h>
diff --git a/sys/arch/macppc/include/psl.h b/sys/arch/macppc/include/psl.h
new file mode 100644
index 00000000000..fbf4953cd09
--- /dev/null
+++ b/sys/arch/macppc/include/psl.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: psl.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/psl.h>
diff --git a/sys/arch/macppc/include/pte.h b/sys/arch/macppc/include/pte.h
new file mode 100644
index 00000000000..44921f1fbb9
--- /dev/null
+++ b/sys/arch/macppc/include/pte.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: pte.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/pte.h>
diff --git a/sys/arch/macppc/include/ptrace.h b/sys/arch/macppc/include/ptrace.h
new file mode 100644
index 00000000000..dee26ef5ba5
--- /dev/null
+++ b/sys/arch/macppc/include/ptrace.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: ptrace.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/ptrace.h>
diff --git a/sys/arch/macppc/include/reg.h b/sys/arch/macppc/include/reg.h
new file mode 100644
index 00000000000..a1af184bfb9
--- /dev/null
+++ b/sys/arch/macppc/include/reg.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: reg.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/reg.h>
diff --git a/sys/arch/macppc/include/reloc.h b/sys/arch/macppc/include/reloc.h
new file mode 100644
index 00000000000..4a4ec299b27
--- /dev/null
+++ b/sys/arch/macppc/include/reloc.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: reloc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/reloc.h>
diff --git a/sys/arch/macppc/include/setjmp.h b/sys/arch/macppc/include/setjmp.h
new file mode 100644
index 00000000000..181909705f4
--- /dev/null
+++ b/sys/arch/macppc/include/setjmp.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: setjmp.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/setjmp.h>
diff --git a/sys/arch/macppc/include/signal.h b/sys/arch/macppc/include/signal.h
new file mode 100644
index 00000000000..f3317493ecb
--- /dev/null
+++ b/sys/arch/macppc/include/signal.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: signal.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/signal.h>
diff --git a/sys/arch/macppc/include/spinlock.h b/sys/arch/macppc/include/spinlock.h
new file mode 100644
index 00000000000..e6756e8ebf8
--- /dev/null
+++ b/sys/arch/macppc/include/spinlock.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: spinlock.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/spinlock.h>
diff --git a/sys/arch/macppc/include/stdarg.h b/sys/arch/macppc/include/stdarg.h
new file mode 100644
index 00000000000..09c1b9eaa2f
--- /dev/null
+++ b/sys/arch/macppc/include/stdarg.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: stdarg.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/stdarg.h>
diff --git a/sys/arch/macppc/include/trap.h b/sys/arch/macppc/include/trap.h
new file mode 100644
index 00000000000..8d86b45aead
--- /dev/null
+++ b/sys/arch/macppc/include/trap.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: trap.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/trap.h>
diff --git a/sys/arch/macppc/include/types.h b/sys/arch/macppc/include/types.h
new file mode 100644
index 00000000000..cf88ff7f027
--- /dev/null
+++ b/sys/arch/macppc/include/types.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: types.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/types.h>
diff --git a/sys/arch/macppc/include/va-ppc.h b/sys/arch/macppc/include/va-ppc.h
new file mode 100644
index 00000000000..33c345562a7
--- /dev/null
+++ b/sys/arch/macppc/include/va-ppc.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: va-ppc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/va-ppc.h>
diff --git a/sys/arch/macppc/include/varargs.h b/sys/arch/macppc/include/varargs.h
new file mode 100644
index 00000000000..3264e7de1c4
--- /dev/null
+++ b/sys/arch/macppc/include/varargs.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: varargs.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/varargs.h>
diff --git a/sys/arch/powerpc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h
index ce784b191cf..20a96a8ab22 100644
--- a/sys/arch/powerpc/include/vmparam.h
+++ b/sys/arch/macppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.10 2001/06/27 06:19:53 art Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
diff --git a/sys/arch/macppc/include/vuid_event.h b/sys/arch/macppc/include/vuid_event.h
new file mode 100644
index 00000000000..1ece71c00f2
--- /dev/null
+++ b/sys/arch/macppc/include/vuid_event.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: vuid_event.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/vuid_event.h>
diff --git a/sys/arch/macppc/include/wsconsio.h b/sys/arch/macppc/include/wsconsio.h
new file mode 100644
index 00000000000..818379958f1
--- /dev/null
+++ b/sys/arch/macppc/include/wsconsio.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: wsconsio.h,v 1.1 2001/09/01 15:49:06 drahn Exp $	*/
+
+#include <powerpc/wsconsio.h>
diff --git a/sys/arch/powerpc/include/asm.h b/sys/arch/powerpc/include/asm.h
index 9f0b64d108a..d77fb2a2e19 100644
--- a/sys/arch/powerpc/include/asm.h
+++ b/sys/arch/powerpc/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.4 1999/03/12 04:56:44 rahnds Exp $	*/
+/*	$OpenBSD: asm.h,v 1.5 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: asm.h,v 1.1 1996/09/30 16:34:20 ws Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PPC_ASM_H_
-#define _PPC_ASM_H_
+#ifndef _POWERPC_ASM_H_
+#define _POWERPC_ASM_H_
 
 /* XXX */
 #define TARGET_ELF
@@ -103,4 +103,4 @@ _TMP_LABEL(y):; \
 
 #define RCSID(x)	.text; .asciz x
 
-#endif /* !_PPC_ASM_H_ */
+#endif /* !_POWERPC_ASM_H_ */
diff --git a/sys/arch/powerpc/include/bat.h b/sys/arch/powerpc/include/bat.h
index ef1d8cf446f..0979388d76b 100644
--- a/sys/arch/powerpc/include/bat.h
+++ b/sys/arch/powerpc/include/bat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bat.h,v 1.3 1997/10/13 10:53:41 pefo Exp $	*/
+/*	$OpenBSD: bat.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,8 +31,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHINE_BAT_H_
-#define	_MACHINE_BAT_H_
+#ifndef	_POWERPC_BAT_H_
+#define	_POWERPC_BAT_H_
 
 struct bat {
 	u_int32_t batu;
@@ -51,4 +51,4 @@ struct bat {
 extern struct bat battable[16];
 #endif
 
-#endif	/* _MACHINE_BAT_H_ */
+#endif	/* _POWERPC_BAT_H_ */
diff --git a/sys/arch/powerpc/include/cdefs.h b/sys/arch/powerpc/include/cdefs.h
index ccc21bdaf25..8238ad9bca9 100644
--- a/sys/arch/powerpc/include/cdefs.h
+++ b/sys/arch/powerpc/include/cdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdefs.h,v 1.2 1996/12/28 06:25:01 rahnds Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.3 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: cdefs.h,v 1.1 1996/09/30 16:34:21 ws Exp $	*/
 
 /*
@@ -6,8 +6,8 @@
  * Public domain.
  */
 
-#ifndef	_MACHINE_CDEFS_H_
-#define	_MACHINE_CDEFS_H_
+#ifndef	_POWERPC_CDEFS_H_
+#define	_POWERPC_CDEFS_H_
 
 #ifdef __STDC__
 #define _C_LABEL(x)	_STRING(_ ## x)
@@ -40,4 +40,4 @@
 */
 #endif
 
-#endif /* !_MACHINE_CDEFS_H_ */
+#endif /* !_POWERPC_CDEFS_H_ */
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index 9568ea5ac25..bc1341ed852 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.7 2001/07/09 01:35:32 mickey Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.8 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_CPU_H_
-#define	_MACHINE_CPU_H_
+#ifndef	_POWERPC_CPU_H_
+#define	_POWERPC_CPU_H_
 
 #include <machine/frame.h>
 
@@ -46,7 +46,6 @@
 #define	cpu_swapout(p)
 #define cpu_wait(p)
 
-void	child_return __P((struct proc *));
 void	delay __P((unsigned));
 #define	DELAY(n)		delay(n)
 
@@ -57,28 +56,6 @@ extern volatile int astpending;
 #define	need_proftick(p)	((p)->p_flag |= P_OWEUPC, astpending = 1)
 #define	signotify(p)		(astpending = 1)
 
-#define	CACHELINESIZE	32			/* For now		XXX */
-
-static __inline void
-syncicache(void *from, int len)
-{
-	int l = len;
-	char *p = from;
-	
-	do {
-		__asm__ __volatile__ ("dcbst 0,%0" :: "r"(p));
-		p += CACHELINESIZE;
-	} while ((l -= CACHELINESIZE) > 0);
-	__asm__ __volatile__ ("sync");
-	p = from;
-	l = len;
-	do {
-		__asm__ __volatile__ ("icbi 0,%0" :: "r"(p));
-		p += CACHELINESIZE;
-	} while ((l -= CACHELINESIZE) > 0);
-	__asm__ __volatile__ ("isync");
-}
-
 extern char *bootpath;
 
-#endif	/* _MACHINE_CPU_H_ */
+#endif	/* _POWERPC_CPU_H_ */
diff --git a/sys/arch/powerpc/include/exec.h b/sys/arch/powerpc/include/exec.h
index 5bb05a8ccfa..f7d7fc79973 100644
--- a/sys/arch/powerpc/include/exec.h
+++ b/sys/arch/powerpc/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.6 2001/01/22 14:51:06 art Exp $ */
+/*	$OpenBSD: exec.h,v 1.7 2001/09/01 15:49:05 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB.
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.h,v 1.6 2001/01/22 14:51:06 art Exp $
+ *	$Id: exec.h,v 1.7 2001/09/01 15:49:05 drahn Exp $
  */
 
-#ifndef _MACHINE_EXEC_H_
-#define _MACHINE_EXEC_H_
+#ifndef _POWERPC_EXEC_H_
+#define _POWERPC_EXEC_H_
 
 #define __LDPGSZ	4096	/* linker page size */
 
@@ -54,4 +54,4 @@
 
 #define _KERN_DO_ELF
 
-#endif  /* _MACHINE_EXEC_H_ */
+#endif  /* _POWERPC_EXEC_H_ */
diff --git a/sys/arch/powerpc/include/float.h b/sys/arch/powerpc/include/float.h
index 9067ea0926e..ac0586aa93f 100644
--- a/sys/arch/powerpc/include/float.h
+++ b/sys/arch/powerpc/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.4 1997/10/13 10:53:43 pefo Exp $	*/
+/*	$OpenBSD: float.h,v 1.5 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -35,8 +35,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
+#ifndef _POWERPC_FLOAT_H_
+#define _POWERPC_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -77,4 +77,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _MACHINE_FLOAT_H_ */
+#endif	/* _POWERPC_FLOAT_H_ */
diff --git a/sys/arch/powerpc/include/fpu.h b/sys/arch/powerpc/include/fpu.h
index 67f38f0bfdc..b845691b37a 100644
--- a/sys/arch/powerpc/include/fpu.h
+++ b/sys/arch/powerpc/include/fpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.h,v 1.4 2001/06/24 05:07:13 drahn Exp $	*/
+/*	$OpenBSD: fpu.h,v 1.5 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*-
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -30,8 +30,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_FPU_H_
-#define	_MACHINE_FPU_H_
+#ifndef	_POWERPC_FPU_H_
+#define	_POWERPC_FPU_H_
 
 #define	FPCSR_FX	0x80000000
 #define	FPCSR_FEX	0x40000000
@@ -68,4 +68,4 @@
 
 void enable_fpu(struct proc *p);
 void save_fpu(struct proc *p);
-#endif	/* _MACHINE_FPU_H_ */
+#endif	/* _POWERPC_FPU_H_ */
diff --git a/sys/arch/powerpc/include/frame.h b/sys/arch/powerpc/include/frame.h
index 4d958a3ce28..d7628de7cbd 100644
--- a/sys/arch/powerpc/include/frame.h
+++ b/sys/arch/powerpc/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.4 1997/10/13 10:53:44 pefo Exp $	*/
+/*	$OpenBSD: frame.h,v 1.5 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -30,8 +30,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_FRAME_H_
-#define	_MACHINE_FRAME_H_
+#ifndef	_POWERPC_FRAME_H_
+#define	_POWERPC_FRAME_H_
 
 #include <machine/types.h>
 
@@ -73,4 +73,4 @@ struct sigframe {
 	struct sigcontext sf_sc;
 	siginfo_t sf_si;
 };
-#endif	/* _MACHINE_FRAME_H_ */
+#endif	/* _POWERPC_FRAME_H_ */
diff --git a/sys/arch/powerpc/include/ieeefp.h b/sys/arch/powerpc/include/ieeefp.h
index 96336de4963..98aacf621c6 100644
--- a/sys/arch/powerpc/include/ieeefp.h
+++ b/sys/arch/powerpc/include/ieeefp.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ieeefp.h,v 1.3 2001/03/29 18:52:19 drahn Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  */
 
-#ifndef _MACHINE_IEEEFP_H_
-#define _MACHINE_IEEEFP_H_
+#ifndef _POWERPC_IEEEFP_H_
+#define _POWERPC_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_IMP	0x01	/* imprecise (loss of precision) */
@@ -21,4 +21,4 @@ typedef enum {
     FP_RP=3			/* round toward positive infinity */
 } fp_rnd;
 
-#endif /* _MACHINE_IEEEFP_H_ */
+#endif /* _POWERPC_IEEEFP_H_ */
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index 32b18dd0f86..0618a585495 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.11 2001/06/24 23:26:29 drahn Exp $ */
+/*	$OpenBSD: intr.h,v 1.12 2001/09/01 15:49:05 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef _MACHINE_INTR_H_
-#define _MACHINE_INTR_H_
+#ifndef _POWERPC_INTR_H_
+#define _POWERPC_INTR_H_
 
 #define	IPL_BIO		0
 #define	IPL_NET		1
@@ -167,4 +167,4 @@ void softnet(int isr);
 #endif /* _LOCORE */
 
 
-#endif /* _MACHINE_INTR_H_ */
+#endif /* _POWERPC_INTR_H_ */
diff --git a/sys/arch/powerpc/include/ipkdb.h b/sys/arch/powerpc/include/ipkdb.h
index d677e74192c..6977f908323 100644
--- a/sys/arch/powerpc/include/ipkdb.h
+++ b/sys/arch/powerpc/include/ipkdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipkdb.h,v 1.3 1997/10/13 10:53:46 pefo Exp $	*/
+/*	$OpenBSD: ipkdb.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
diff --git a/sys/arch/powerpc/include/kbio.h b/sys/arch/powerpc/include/kbio.h
deleted file mode 100644
index d6a3e38edf2..00000000000
--- a/sys/arch/powerpc/include/kbio.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$OpenBSD: kbio.h,v 1.1 1998/09/27 03:55:57 rahnds Exp $ */
-/*	$NetBSD: kbio.h,v 1.1 1996/04/12 01:45:45 cgd Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory.
- *
- * 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 the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- *	@(#)kbio.h	8.1 (Berkeley) 6/11/93
- */
-
-#if 0 /* XXX */
-/*
- * The following is a minimal emulation of Sun's `kio' structures
- * and related operations necessary to make X11 happy (i.e., make it
- * compile, and make old X11 binaries run).
- */
-
-/*
- * The kiockey structure apparently gets and/or sets keyboard mappings.
- * It seems to be kind of useless, but X11 uses it (according to the
- * comments) to figure out when a Sun 386i has a type-4 keyboard but
- * claims to have a type-3 keyboard.  We need just enough to cause the
- * appropriate ioctl to return the appropriate magic value.
- *
- * KIOCGETKEY fills in kio_entry from kio_station.  Not sure what tablemask
- * is for; X sets it before the call, so it is not an output, but we do not
- * care anyway.  KIOCSDIRECT is supposed to tell the kernel whether to send
- * keys to the console or to X; we just send them to X whenever the keyboard
- * is open at all.  (XXX may need to change this later)
- *
- * Keyboard commands and types are defined in kbd.h as they are actually
- * real hardware commands and type numbers.
- */
-struct okiockey { /* Out-dated key translation structure */
-	int	kio_tablemask;	/* whatever */
-	u_char	kio_station;	/* key number */
-	u_char	kio_entry;	/* HOLE if not present */
-	char	kio_text[10];	/* the silly escape sequences (unsupported) */
-};
-
-struct kiockey {
-	int	kio_tablemask;	/* whatever */
-	u_char	kio_station;	/* key number */
-	u_short	kio_entry;	/* HOLE if not present */
-	char	kio_text[10];	/* the silly escape sequences (unsupported) */
-};
-
-/*
- * Values for kio_tablemask. These determine which table to read/modify
- * in KIOC[SG]KEY ioctls. Currently, we only have "non-shift" and "shift"
- * tables.
- */
-#define KIOC_NOMASK	0x0
-#define KIOC_CAPSMASK	0x1
-#define KIOC_SHIFTMASK	0xe
-#define KIOC_CTRLMASK	0x30
-#define KIOC_ALTGMASK	0x200
-#define KIOC_NUMLMASK	0x800
-
-#define	HOLE	0x302		/* value for kio_entry to say `really type 3' */
-
-#define	KIOCTRANS	_IOW('k', 0, int)	/* set translation mode */
-			/* (we only accept TR_UNTRANS_EVENT) */
-#define	KIOCGETKEY	_IOWR('k', 2, struct okiockey) /* fill in kio_entry */
-#define	KIOCGTRANS	_IOR('k', 5, int)	/* get translation mode */
-#define	KIOCCMD		_IOW('k', 8, int)	/* X uses this to ring bell */
-#define	KIOCTYPE	_IOR('k', 9, int)	/* get keyboard type */
-#endif /* 0 XXX */
-#define	KIOCSDIRECT	_IOW('k', 10, int)	/* keys to console? */
-#if 0 /* XXX */
-#define KIOCSKEY	_IOW('k', 12, struct kiockey) /* set xlat mode */
-#define KIOCGKEY	_IOWR('k', 13, struct kiockey) /* get xlat mode */
-#define	KIOCLAYOUT	_IOR('k', 20, int)	/* get keyboard layout */
-#define	KIOCSLED	_IOW('k', 14, char)	/* set LED state */
-#define	KIOCGLED	_IOR('k', 15, char)	/* get LED state */
-
-#define	TR_NONE			0	/* X compat, unsupported */
-#define	TR_ASCII		1	/* X compat, unsupported */
-#define	TR_EVENT		2	/* X compat, unsupported */
-#define	TR_UNTRANS_EVENT	3
-#endif /* 0 XXX */
diff --git a/sys/arch/powerpc/include/kcore.h b/sys/arch/powerpc/include/kcore.h
index cf947ae0fc8..a85d9390d51 100644
--- a/sys/arch/powerpc/include/kcore.h
+++ b/sys/arch/powerpc/include/kcore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kcore.h,v 1.2 1996/12/28 06:25:15 rahnds Exp $	*/
+/*	$OpenBSD: kcore.h,v 1.3 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: kcore.h,v 1.1 1996/09/30 16:34:26 ws Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHINE_KCORE_H_
-#define	_MACHINE_KCORE_H_
+#ifndef	_POWERPC_KCORE_H_
+#define	_POWERPC_KCORE_H_
 
 #define	NPHYS_RAM_SEGS	4
 
@@ -43,4 +43,4 @@ typedef struct cpu_kcore_hdr {
 	phys_ram_seg_t	ram_segs[NPHYS_RAM_SEGS];
 } cpu_kcore_hdr_t;
 
-#endif	/* _MACHINE_KCORE_H_ */
+#endif	/* _POWERPC_KCORE_H_ */
diff --git a/sys/arch/powerpc/include/limits.h b/sys/arch/powerpc/include/limits.h
index b112768cb12..8b7a8659981 100644
--- a/sys/arch/powerpc/include/limits.h
+++ b/sys/arch/powerpc/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.8 2000/07/31 20:06:03 millert Exp $	*/
+/*	$OpenBSD: limits.h,v 1.9 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: limits.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define _MACHINE_LIMITS_H_
+#ifndef _POWERPC_LIMITS_H_
+#define _POWERPC_LIMITS_H_
 
 #define	CHAR_BIT	8		/* bits per char		*/
 #define	MB_LEN_MAX	1		/* no multibyte characters	*/
@@ -85,4 +85,4 @@
 #define FLT_MAX		3.40282347E+38F
 #define FLT_MIN		1.17549435E-38F
 #endif
-#endif /* _MACHINE_LIMITS_H_ */
+#endif /* _POWERPC_LIMITS_H_ */
diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index 8de202ada69..9d4ce5045c4 100644
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.17 2001/07/09 02:14:05 mickey Exp $	*/
+/*	$OpenBSD: param.h,v 1.18 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
 
 /*-
@@ -32,18 +32,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef	_POWERPC_PARAM_H_
+#define	_POWERPC_PARAM_H_
+
 #ifdef	_KERNEL
 #ifndef	_LOCORE
 #include <machine/cpu.h>
 #endif	/* _LOCORE */
 #endif
 
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define	MACHINE		"powerpc"
-#define	_MACHINE	powerpc
 #define	MACHINE_ARCH	"powerpc"
 #define	_MACHINE_ARCH	powerpc
 
@@ -68,8 +68,6 @@
 #define	UPAGES		4
 #define	USPACE		(UPAGES * NBPG)
 
-#define	KERNBASE	0x100000
-
 /*
  * Constants related to network buffer management.
  * MCLBYTES must be no larger than the software page size, and,
@@ -90,15 +88,6 @@
 #endif
 #endif
 
-#define MSGBUFSIZE	(NBPG*2)
-
-/*
- * Size of kernel malloc arena in logical pages.
- */
-#ifndef	NKMEMCLUSTERS
-#define	NKMEMCLUSTERS	(16 * 1024 * 1024 / PAGE_SIZE)
-#endif
-
 /*
  * pages ("clicks") to disk blocks
  */
@@ -137,8 +126,6 @@
 #define	EMPTY_SEGMENT	0xfffff0
 #define	USER_ADDR	((void *)(USER_SR << ADDR_SR_SHFT))
 
-#define	__COMPAT_OLD_TIMEOUTS
-
 /*
  * Some system constants
  */
@@ -150,3 +137,5 @@
  * Temporary kludge till we do (ov)bcopy in assembler
  */
 #define	ovbcopy	bcopy
+
+#endif	/* _POWERPC_PARAM_H_ */
diff --git a/sys/arch/powerpc/include/pcb.h b/sys/arch/powerpc/include/pcb.h
index 1229b0b1168..dabc3d740c5 100644
--- a/sys/arch/powerpc/include/pcb.h
+++ b/sys/arch/powerpc/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.5 2001/06/29 06:07:09 drahn Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.6 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: pcb.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_PCB_H_
-#define	_MACHINE_PCB_H_
+#ifndef	_POWERPC_PCB_H_
+#define	_POWERPC_PCB_H_
 
 #include <machine/reg.h>
 
@@ -69,4 +69,4 @@ extern struct pmap *curpm;
 extern struct proc *fpuproc;
 int  setfault __P((faultbuf env));
 #endif
-#endif	/* _MACHINE_PCB_H_ */
+#endif	/* _POWERPC_PCB_H_ */
diff --git a/sys/arch/powerpc/include/pio.h b/sys/arch/powerpc/include/pio.h
index b58a7a20b68..25331fdc954 100644
--- a/sys/arch/powerpc/include/pio.h
+++ b/sys/arch/powerpc/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.6 2001/06/29 06:07:09 drahn Exp $ */
+/*	$OpenBSD: pio.h,v 1.7 2001/09/01 15:49:05 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef _MACHINE_PIO_H_
-#define _MACHINE_PIO_H_
+#ifndef _POWERPC_PIO_H_
+#define _POWERPC_PIO_H_
 /*
  * I/O macros.
  */
@@ -178,4 +178,4 @@ __flash_led(bits, count)
 }
 #endif /* DEBUG */
 
-#endif /*_MACHINE_PIO_H_*/
+#endif /*_POWERPC_PIO_H_*/
diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h
index 0040d215477..dd41a91007e 100644
--- a/sys/arch/powerpc/include/pmap.h
+++ b/sys/arch/powerpc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.17 2001/08/18 20:50:18 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.18 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHINE_PMAP_H_
-#define	_MACHINE_PMAP_H_
+#ifndef	_POWERPC_PMAP_H_
+#define	_POWERPC_PMAP_H_
 
 #include <machine/pte.h>
 
@@ -106,4 +106,4 @@ paddr_t vtophys __P((vaddr_t));
 
 #endif	/* _KERNEL */
 #endif	/* _LOCORE */
-#endif	/* _MACHINE_PMAP_H_ */
+#endif	/* _POWERPC_PMAP_H_ */
diff --git a/sys/arch/powerpc/include/proc.h b/sys/arch/powerpc/include/proc.h
index dee3238977d..1582ddd1a12 100644
--- a/sys/arch/powerpc/include/proc.h
+++ b/sys/arch/powerpc/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.2 1996/12/28 06:25:22 rahnds Exp $	*/
+/*	$OpenBSD: proc.h,v 1.3 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: proc.h,v 1.1 1996/09/30 16:34:31 ws Exp $	*/
 
 /*-
@@ -32,9 +32,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef	_POWERPC_PROC_H_
+#define	_POWERPC_PROC_H_
+
 /*
  * Machine-dependent part of the proc structure
  */
 struct mdproc {
 	int dummy;
 };
+
+#endif	/* _POWERPC_PROC_H_ */
diff --git a/sys/arch/powerpc/include/psl.h b/sys/arch/powerpc/include/psl.h
index be357039b71..1bf401927b8 100644
--- a/sys/arch/powerpc/include/psl.h
+++ b/sys/arch/powerpc/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.3 1997/10/13 10:53:48 pefo Exp $	*/
+/*	$OpenBSD: psl.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: psl.h,v 1.1 1996/09/30 16:34:32 ws Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_PSL_H_
-#define	_MACHINE_PSL_H_
+#ifndef	_POWERPC_PSL_H_
+#define	_POWERPC_PSL_H_
 
 /*
  * Flags in MSR:
@@ -74,4 +74,4 @@
 
 #include <machine/intr.h>
 
-#endif	/* _MACHINE_PSL_H_ */
+#endif	/* _POWERPC_PSL_H_ */
diff --git a/sys/arch/powerpc/include/pte.h b/sys/arch/powerpc/include/pte.h
index 522dea54ac2..9775dc3b183 100644
--- a/sys/arch/powerpc/include/pte.h
+++ b/sys/arch/powerpc/include/pte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.2 1996/12/28 06:25:25 rahnds Exp $	*/
+/*	$OpenBSD: pte.h,v 1.3 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: pte.h,v 1.1 1996/09/30 16:34:32 ws Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHINE_PTE_H_
-#define	_MACHINE_PTE_H_
+#ifndef	_POWERPC_PTE_H_
+#define	_POWERPC_PTE_H_
 
 #include <sys/queue.h>
 
@@ -110,4 +110,4 @@ extern u_int dsisr __P((void));
 extern vm_offset_t dar __P((void));
 #endif	/* _KERNEL */
 #endif	/* _LOCORE */
-#endif	/* _MACHINE_PTE_H_ */
+#endif	/* _POWERPC_PTE_H_ */
diff --git a/sys/arch/powerpc/include/signal.h b/sys/arch/powerpc/include/signal.h
index cec57b43580..46067127310 100644
--- a/sys/arch/powerpc/include/signal.h
+++ b/sys/arch/powerpc/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.3 1997/02/18 15:54:27 rahnds Exp $	*/
+/*	$OpenBSD: signal.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: signal.h,v 1.1 1996/09/30 16:34:34 ws Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_SIGNAL_H_
-#define	_MACHINE_SIGNAL_H_
+#ifndef	_POWERPC_SIGNAL_H_
+#define	_POWERPC_SIGNAL_H_
 
 typedef int sig_atomic_t;
 
@@ -65,4 +65,4 @@ struct sigcontext {
 	int sc_mask;			/* saved signal mask */
 	struct trapframe sc_frame;	/* saved registers */
 };
-#endif	/* _MACHINE_SIGNAL_H_ */
+#endif	/* _POWERPC_SIGNAL_H_ */
diff --git a/sys/arch/powerpc/include/spinlock.h b/sys/arch/powerpc/include/spinlock.h
index 16e1f34312c..9058f266343 100644
--- a/sys/arch/powerpc/include/spinlock.h
+++ b/sys/arch/powerpc/include/spinlock.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: spinlock.h,v 1.1 1999/01/08 08:25:36 d Exp $	*/
+/*	$OpenBSD: spinlock.h,v 1.2 2001/09/01 15:49:05 drahn Exp $	*/
 
-#ifndef _MACHINE_SPINLOCK_H_
-#define _MACHINE_SPINLOCK_H_
+#ifndef _POWERPC_SPINLOCK_H_
+#define _POWERPC_SPINLOCK_H_
 
 #define _SPINLOCK_UNLOCKED	(0)
 #define _SPINLOCK_LOCKED	(1)
diff --git a/sys/arch/powerpc/include/stdarg.h b/sys/arch/powerpc/include/stdarg.h
index 785387980cc..dc432bc3f60 100644
--- a/sys/arch/powerpc/include/stdarg.h
+++ b/sys/arch/powerpc/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.3 2001/03/29 18:52:19 drahn Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.1 1996/09/30 16:34:35 ws Exp $	*/
 
 /*-
@@ -36,8 +36,8 @@
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MACHINE_STDARG_H_
-#define	_MACHINE_STDARG_H_
+#ifndef _POWERPC_STDARG_H_
+#define	_POWERPC_STDARG_H_
 
 #include <machine/ansi.h>
 
@@ -48,4 +48,4 @@
 
 typedef _BSD_VA_LIST_	va_list;
 
-#endif /* !_MACHINE_STDARG_H_ */
+#endif /* !_POWERPC_STDARG_H_ */
diff --git a/sys/arch/powerpc/include/trap.h b/sys/arch/powerpc/include/trap.h
index 9dd4ba98335..219cbd6b83b 100644
--- a/sys/arch/powerpc/include/trap.h
+++ b/sys/arch/powerpc/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.3 2001/06/10 18:45:02 drahn Exp $	*/
+/*	$OpenBSD: trap.h,v 1.4 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: trap.h,v 1.1 1996/09/30 16:34:35 ws Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACHINE_TRAP_H_
-#define	_MACHINE_TRAP_H_
+#ifndef	_POWERPC_TRAP_H_
+#define	_POWERPC_TRAP_H_
 
 #define	EXC_RSVD	0x0000		/* Reserved */
 #define	EXC_RST		0x0100		/* Reset */
@@ -77,9 +77,10 @@
 #define EXC_ALI_OPCODE_INDICATOR(dsisr) ((dsisr >> 10) & 0x7f)
 #define EXC_ALI_LFD	0x09
 #define EXC_ALI_STFD	0x0b
+#define EXC_ALI_DCBZ	0x5f
 
 /* Macros to extract register information */
 #define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f)   /* source or target */
 #define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
 
-#endif	/* _MACHINE_TRAP_H_ */
+#endif	/* _POWERPC_TRAP_H_ */
diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h
index 30f94d0dad1..80d425de7f3 100644
--- a/sys/arch/powerpc/include/types.h
+++ b/sys/arch/powerpc/include/types.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: types.h,v 1.1 1996/09/30 16:34:36 ws Exp $	*/
-/*	$OpenBSD: types.h,v 1.9 1999/11/09 04:13:54 rahnds Exp $	*/
+/*	$OpenBSD: types.h,v 1.10 2001/09/01 15:49:05 drahn Exp $	*/
 
 /*-
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -32,8 +32,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHINE_TYPES_H_
-#define	_MACHINE_TYPES_H_
+#ifndef	_POWERPC_TYPES_H_
+#define	_POWERPC_TYPES_H_
 
 #include <sys/cdefs.h>
 
@@ -67,4 +67,4 @@ typedef struct label_t {
 
 #define	__BROKEN_INDIRECT_CONFIG
 
-#endif	/* _MACHINE_TYPES_H_ */
+#endif	/* _POWERPC_TYPES_H_ */
diff --git a/sys/arch/powerpc/include/varargs.h b/sys/arch/powerpc/include/varargs.h
index cbc021a5ef7..4f01472a81c 100644
--- a/sys/arch/powerpc/include/varargs.h
+++ b/sys/arch/powerpc/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.2 2001/03/29 18:52:19 drahn Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.3 2001/09/01 15:49:05 drahn Exp $	*/
 /*	$NetBSD: varargs.h,v 1.1 1996/09/30 16:34:37 ws Exp $	*/
 
 /*-
@@ -41,8 +41,8 @@
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
-#ifndef _PPC_VARARGS_H_
-#define	_PPC_VARARGS_H_
+#ifndef _POWERPC_VARARGS_H_
+#define	_POWERPC_VARARGS_H_
 
 #define _VARARGS_H
 
@@ -51,4 +51,4 @@
 
 typedef _BSD_VA_LIST_ va_list;
 
-#endif /* !_PPC_VARARGS_H_ */
+#endif /* !_POWERPC_VARARGS_H_ */