From 69d8f0e09ab4eb115b31f10695ca3e47e9a579ba Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Fri, 12 Apr 1996 05:39:02 +0000
Subject: [PATCH] define all of the appropriate functions, as indirections
 through a function switch.

---
 sys/arch/alpha/eisa/eisa_machdep.h | 64 ++++++++++++++++++++++++++++++
 sys/arch/alpha/isa/isa_machdep.h   | 27 ++++++++++++-
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 sys/arch/alpha/eisa/eisa_machdep.h

diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h
new file mode 100644
index 000000000000..0968ee61c9d7
--- /dev/null
+++ b/sys/arch/alpha/eisa/eisa_machdep.h
@@ -0,0 +1,64 @@
+/*	$NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+/*
+ * Types provided to machine-independent EISA code.
+ */
+typedef struct alpha_eisa_chipset *eisa_chipset_tag_t;
+typedef int eisa_intr_handle_t;
+
+struct alpha_eisa_chipset {
+	void	*ec_v;
+
+	void	(*ec_attach_hook) __P((struct device *, struct device *,
+		    struct eisabus_attach_args *));
+	int	(*ec_maxslots) __P((void *));
+	int	(*ec_intr_map) __P((void *, u_int,
+		    eisa_intr_handle_t *));
+	const char *(*ec_intr_string) __P((void *, eisa_intr_handle_t));
+	void	*(*ec_intr_establish) __P((void *, eisa_intr_handle_t,
+		    int, int, int (*)(void *), void *));
+	void	(*ec_intr_disestablish) __P((void *, void *));
+};
+
+/*
+ * Functions provided to machine-independent EISA code.
+ */
+#define	eisa_attach_hook(p, s, a)					\
+    (*(a)->eba_ec->ec_attach_hook)((p), (s), (a))
+#define	eisa_maxslots(c)						\
+    (*(c)->ec_maxslots)((c)->ec_v)
+#define	eisa_intr_map(c, i, hp)						\
+    (*(c)->ec_intr_map)((c)->ec_v, (i), (hp))
+#define	eisa_intr_string(c, h)						\
+    (*(c)->ec_intr_string)((c)->ec_v, (h))
+#define	eisa_intr_establish(c, h, t, l, f, a)				\
+    (*(c)->ec_intr_establish)((c)->ec_v, (h), (t), (l), (f), (a))
+#define	eisa_intr_disestablish(c, h)					\
+    (*(c)->ec_intr_disestablish)((c)->ec_v, (h))
diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h
index 2c332759f317..051811ecafef 100644
--- a/sys/arch/alpha/isa/isa_machdep.h
+++ b/sys/arch/alpha/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.1 1996/04/12 01:57:42 cgd Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.2 1996/04/12 05:39:02 cgd Exp $	*/
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -27,4 +27,27 @@
  * rights to redistribute these changes.
  */
 
-typedef	void *isa_chipset_tag_t;
+/*
+ * Types provided to machine-independent ISA code.
+ */
+typedef struct alpha_isa_chipset *isa_chipset_tag_t;
+
+struct alpha_isa_chipset {
+	void	*ic_v;
+
+	void	(*ic_attach_hook) __P((struct device *, struct device *,
+		    struct isabus_attach_args *));
+	void	*(*ic_intr_establish) __P((void *, int, int, int,
+		    int (*)(void *), void *));
+	void	(*ic_intr_disestablish) __P((void *, void *));
+};
+
+/*
+ * Functions provided to machine-independent ISA code.
+ */
+#define	isa_attach_hook(p, s, a)					\
+    (*(a)->iba_ic->ic_attach_hook)((p), (s), (a))
+#define	isa_intr_establish(c, i, t, l, f, a)				\
+    (*(c)->ic_intr_establish)((c)->ic_v, (i), (t), (l), (f), (a))
+#define	isa_intr_disestablish(c, h)					\
+    (*(c)->ic_intr_disestablish)((c)->ic_v, (h))