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_*.

1 files changed, 114 insertions, 0 deletions

diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
new file mode 100644
index 00000000000..76c44721873
--- /dev/null
+++ b/sys/arch/macppc/include/autoconf.h
@@ -0,0 +1,114 @@
+/*	$OpenBSD: autoconf.h,v 1.1 2001/09/01 15:49:06 drahn Exp $ */
+
+/*
+ * Copyright (c) 1997 Per Fogelstrom
+ * 
+ * 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 for RTMX inc
+ *      by Per Fogelstrom, Opsycon AB.
+ * 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.
+ *
+ */
+/*
+ * Machine-dependent structures of autoconfiguration
+ */
+
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
+
+#include <machine/bus.h>
+
+/*
+ *   System types.
+ */
+#define OFWMACH         0       /* Openfirmware drivers */
+#define	POWER4e		1	/* V.I Power.4e board */
+#define	PWRSTK		2	/* Motorola Powerstack series */
+#define	APPL		3	/* Apple PowerMac machines (OFW?) */
+
+extern int system_type;
+
+/**/
+struct confargs;
+
+typedef int (*intr_handler_t) __P((void *));
+
+typedef struct bushook {
+	struct	device *bh_dv;
+	int	bh_type;
+	void	(*bh_intr_establish)
+		    __P((struct confargs *, intr_handler_t, void *));
+	void	(*bh_intr_disestablish)
+		    __P((struct confargs *));
+	int	(*bh_matchname)	
+		    __P((struct confargs *, char *));
+} bushook_t;
+
+#define	BUS_MAIN	1		/* mainbus */
+#define	BUS_ISABR	2		/* ISA Bridge Bus */
+#define	BUS_PCIBR	3		/* PCI bridge */
+#define	BUS_VMEBR	4		/* VME bridge */
+
+#define	BUS_INTR_ESTABLISH(ca, handler, val)				\
+	    (*(ca)->ca_bus->bh_intr_establish)((ca), (handler), (val))
+#define	BUS_INTR_DISESTABLISH(ca)					\
+	    (*(ca)->ca_bus->bh_intr_establish)(ca)
+#define	BUS_CVTADDR(ca)							\
+	    (*(ca)->ca_bus->bh_cvtaddr)(ca)
+#define	BUS_MATCHNAME(ca, name)						\
+	    (*(ca)->ca_bus->bh_matchname)((ca), (name))
+
+struct confargs {
+	char	*ca_name;		/* Device name. */
+	bushook_t *ca_bus;		/* bus device resides on. */
+	/* macobio hooks ?? */
+	bus_space_tag_t ca_iot;
+	bus_space_tag_t ca_memt; /* XXX */
+	u_int32_t ca_node;
+	int ca_nreg;
+	u_int32_t *ca_reg;
+	int ca_nintr;
+	int32_t *ca_intr;
+	u_int ca_baseaddr;
+
+};
+
+void	set_clockintr __P((void (*)(struct clockframe *)));
+void	set_iointr __P((void (*)(void *, int)));
+int	badaddr	__P((void *, u_int32_t));
+void calc_delayconst(void);
+void ofrootfound(void);
+
+typedef int mac_intr_handle_t;
+typedef void     *(intr_establish_t) __P((void *, mac_intr_handle_t,
+    int, int, int (*func)(void *), void *, char *));
+typedef void     (intr_disestablish_t) __P((void *, void *));
+
+intr_establish_t mac_intr_establish;
+intr_disestablish_t mac_intr_disestablish;
+extern intr_establish_t *intr_establish_func;
+extern intr_disestablish_t *intr_disestablish_func;
+
+#endif /* _MACHINE_AUTOCONF_H_ */