Bring forward the Amiga ISA support, and resolve a conflict with if_ed

3 files changed, 236 insertions, 14 deletions

diff --git a/sys/arch/amiga/include/bus.h b/sys/arch/amiga/include/bus.h
new file mode 100644
index 00000000000..4a569dcd621
--- /dev/null
+++ b/sys/arch/amiga/include/bus.h
@@ -0,0 +1,186 @@
+/*	$OpenBSD: bus.h,v 1.1 1996/04/27 18:38:52 niklas Exp $	*/
+
+/*
+ * Copyright (c) 1996 Niklas Hallqvist.
+ * 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 the Niklas Hallqvist.
+ * 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.
+ */
+
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
+
+/* I/O access types.  */
+typedef u_long bus_io_addr_t;
+typedef u_long bus_io_size_t;
+typedef u_long bus_io_handle_t;
+
+/* Memory access types.  */
+typedef u_long bus_mem_addr_t;
+typedef u_long bus_mem_size_t;
+typedef u_long bus_mem_handle_t;
+
+/*
+ * The big switch, that delegates each bus operation to the right
+ * implementation.
+ */
+typedef struct amiga_bus_chipset *bus_chipset_tag_t;
+
+struct amiga_bus_chipset {
+	void	*bc_data;
+
+	int	(*bc_io_map)(bus_chipset_tag_t, bus_io_addr_t, bus_io_size_t,
+	    bus_io_handle_t *);
+	int	(*bc_io_unmap)(bus_io_handle_t, bus_io_size_t);
+
+	u_int8_t (*bc_io_read_1)(bus_io_handle_t, bus_io_size_t);
+	u_int16_t (*bc_io_read_2)(bus_io_handle_t, bus_io_size_t);
+	u_int32_t (*bc_io_read_4)(bus_io_handle_t, bus_io_size_t);
+	u_int64_t (*bc_io_read_8)(bus_io_handle_t, bus_io_size_t);
+
+	void	(*bc_io_read_multi_1)(bus_io_handle_t, bus_io_size_t,
+		    u_int8_t *, bus_io_size_t);
+	void	(*bc_io_read_multi_2)(bus_io_handle_t, bus_io_size_t,
+		    u_int16_t *, bus_io_size_t);
+	void	(*bc_io_read_multi_4)(bus_io_handle_t, bus_io_size_t,
+		    u_int32_t *, bus_io_size_t);
+	void	(*bc_io_read_multi_8)(bus_io_handle_t, bus_io_size_t,
+		    u_int64_t *, bus_io_size_t);
+
+	void	(*bc_io_write_1)(bus_io_handle_t, bus_io_size_t, u_int8_t);
+	void	(*bc_io_write_2)(bus_io_handle_t, bus_io_size_t, u_int16_t);
+	void	(*bc_io_write_4)(bus_io_handle_t, bus_io_size_t, u_int32_t);
+	void	(*bc_io_write_8)(bus_io_handle_t, bus_io_size_t, u_int64_t);
+
+	void	(*bc_io_write_multi_1)(bus_io_handle_t, bus_io_size_t,
+		    const u_int8_t *, bus_io_size_t);
+	void	(*bc_io_write_multi_2)(bus_io_handle_t, bus_io_size_t,
+		    const u_int16_t *, bus_io_size_t);
+	void	(*bc_io_write_multi_4)(bus_io_handle_t, bus_io_size_t,
+		    const u_int32_t *, bus_io_size_t);
+	void	(*bc_io_write_multi_8)(bus_io_handle_t, bus_io_size_t,
+		    const u_int64_t *, bus_io_size_t);
+
+	int	(*bc_mem_map)(bus_chipset_tag_t, bus_mem_addr_t,
+		    bus_mem_size_t, int, bus_mem_handle_t *);
+	int	(*bc_mem_unmap)(bus_mem_handle_t, bus_mem_size_t);
+
+	u_int8_t (*bc_mem_read_1)(bus_mem_handle_t, bus_mem_size_t);
+	u_int16_t (*bc_mem_read_2)(bus_mem_handle_t, bus_mem_size_t);
+	u_int32_t (*bc_mem_read_4)(bus_mem_handle_t, bus_mem_size_t);
+	u_int64_t (*bc_mem_read_8)(bus_mem_handle_t, bus_mem_size_t);
+
+	void	(*bc_mem_write_1)(bus_mem_handle_t, bus_mem_size_t, u_int8_t);
+	void	(*bc_mem_write_2)(bus_mem_handle_t, bus_mem_size_t, u_int16_t);
+	void	(*bc_mem_write_4)(bus_mem_handle_t, bus_mem_size_t, u_int32_t);
+	void	(*bc_mem_write_8)(bus_mem_handle_t, bus_mem_size_t, u_int64_t);
+
+	/* These are extensions to the general NetBSD bus interface.  */
+	u_int16_t (*bc_to_host_2)(u_int16_t);
+	u_int32_t (*bc_to_host_4)(u_int32_t);
+	u_int64_t (*bc_to_host_8)(u_int64_t);
+
+	u_int16_t (*bc_from_host_2)(u_int16_t);
+	u_int32_t (*bc_from_host_4)(u_int32_t);
+	u_int64_t (*bc_from_host_8)(u_int64_t);
+};
+
+#define bus_io_map(t, port, size, iohp) \
+    (*(t)->bc_io_map)((t), (port), (size), (iohp))
+#define bus_io_unmap(t, iohp, size) \
+    (*(t)->bc_io_unmap)((iohp), (size))
+
+#define	bus_io_read_1(t, h, o) \
+    (*(t)->bc_io_read_1)((h), (o))
+#define	bus_io_read_2(t, h, o) \
+    (*(t)->bc_io_read_2)((h), (o))
+#define	bus_io_read_4(t, h, o) \
+    (*(t)->bc_io_read_4)((h), (o))
+#define	bus_io_read_8(t, h, o) \
+    (*(t)->bc_io_read_8)((h), (o))
+
+#define	bus_io_read_multi_1(t, h, o, a, s) \
+    (*(t)->bc_io_read_multi_1)((h), (o), (a), (s))
+#define	bus_io_read_multi_2(t, h, o, a, s) \
+    (*(t)->bc_io_read_multi_2)((h), (o), (a), (s))
+#define	bus_io_read_multi_4(t, h, o, a, s) \
+    (*(t)->bc_io_read_multi_4)((h), (o), (a), (s))
+#define	bus_io_read_multi_8(t, h, o, a, s) \
+    (*(t)->bc_io_read_multi_8)((h), (o), (a), (s))
+
+#define	bus_io_write_1(t, h, o, v) \
+    (*(t)->bc_io_write_1)((h), (o), (v))
+#define	bus_io_write_2(t, h, o, v) \
+    (*(t)->bc_io_write_2)((h), (o), (v))
+#define	bus_io_write_4(t, h, o, v) \
+    (*(t)->bc_io_write_4)((h), (o), (v))
+#define	bus_io_write_8(t, h, o, v) \
+    (*(t)->bc_io_write_8)((h), (o), (v))
+
+#define	bus_io_write_multi_1(t, h, o, a, s) \
+    (*(t)->bc_io_write_multi_1)((h), (o), (a), (s))
+#define	bus_io_write_multi_2(t, h, o, a, s) \
+    (*(t)->bc_io_write_multi_2)((h), (o), (a), (s))
+#define	bus_io_write_multi_4(t, h, o, a, s) \
+    (*(t)->bc_io_write_multi_4)((h), (o), (a), (s))
+#define	bus_io_write_multi_8(t, h, o, a, s) \
+    (*(t)->bc_io_write_multi_8)((h), (o), (a), (s))
+
+#define bus_mem_map(t, port, size, cacheable, mhp) \
+    (*(t)->bc_mem_map)((t), (port), (size), (cacheable), (mhp))
+#define bus_mem_unmap(t, mhp, size) \
+    (*(t)->bc_mem_unmap)((mhp), (size))
+
+#define	bus_mem_read_1(t, h, o) \
+    (*(t)->bc_mem_read_1)((h), (o))
+#define	bus_mem_read_2(t, h, o) \
+    (*(t)->bc_mem_read_2)((h), (o))
+#define	bus_mem_read_4(t, h, o) \
+    (*(t)->bc_mem_read_4)((h), (o))
+#define	bus_mem_read_8(t, h, o) \
+    (*(t)->bc_mem_read_8)((h), (o))
+
+#define	bus_mem_write_1(t, h, o, v) \
+    (*(t)->bc_mem_write_1)((h), (o), (v))
+#define	bus_mem_write_2(t, h, o, v) \
+    (*(t)->bc_mem_write_2)((h), (o), (v))
+#define	bus_mem_write_4(t, h, o, v) \
+    (*(t)->bc_mem_write_4)((h), (o), (v))
+#define	bus_mem_write_8(t, h, o, v) \
+    (*(t)->bc_mem_write_8)((h), (o), (v))
+
+/* These are extensions to the general NetBSD bus interface.  */
+#define bus_to_host_2(t, v) (*(t)->bc_to_host_2)(v)
+#define bus_to_host_4(t, v) (*(t)->bc_to_host_4)(v)
+#define bus_to_host_8(t, v) (*(t)->bc_to_host_8)(v)
+
+#define bus_from_host_2(t, v) (*(t)->bc_from_host_2)(v)
+#define bus_from_host_4(t, v) (*(t)->bc_from_host_4)(v)
+#define bus_from_host_8(t, v) (*(t)->bc_from_host_8)(v)
+
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/amiga/include/intr.h b/sys/arch/amiga/include/intr.h
new file mode 100644
index 00000000000..cc7b6b05f02
--- /dev/null
+++ b/sys/arch/amiga/include/intr.h
@@ -0,0 +1,50 @@
+/*	$OpenBSD: intr.h,v 1.1 1996/04/27 18:38:53 niklas Exp $	*/
+
+/*
+ * Copyright (c) 1996 Niklas Hallqvist
+ * 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 Niklas Hallqvist.
+ * 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.
+ */
+
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
+
+/* Interrupt priority `levels'; not mutually exclusive. */
+#define	IPL_NONE	-1
+#define	IPL_BIO		3	/* block I/O */
+#define	IPL_NET		3	/* network */
+#define	IPL_TTY		4	/* terminal */
+#define	IPL_CLOCK	4	/* clock */
+#define	IPL_IMP		4	/* memory allocation */
+
+/* Interrupt sharing types. */
+#define	IST_NONE	0	/* none */
+#define	IST_PULSE	1	/* pulsed */
+#define	IST_EDGE	2	/* edge-triggered */
+#define	IST_LEVEL	3	/* level-triggered */
+
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h
index 0e1a340cc19..ff340b33085 100644
--- a/sys/arch/amiga/include/psl.h
+++ b/sys/arch/amiga/include/psl.h
@@ -3,20 +3,6 @@
 #ifndef _MACHINE_PSL_H_
 #define _MACHINE_PSL_H_
 
-/* Interrupt priority `levels'; not mutually exclusive. */
-#define	IPL_NONE	-1
-#define	IPL_BIO		3	/* block I/O */
-#define	IPL_NET		3	/* network */
-#define	IPL_TTY		4	/* terminal */
-#define	IPL_CLOCK	4	/* clock */
-#define	IPL_IMP		4	/* memory allocation */
-
-/* Interrupt sharing types. */
-#define	IST_NONE	0	/* none */
-#define	IST_PULSE	1	/* pulsed */
-#define	IST_EDGE	2	/* edge-triggered */
-#define	IST_LEVEL	3	/* level-triggered */
-
 #include <m68k/psl.h>
 
 #endif