From f3b97d128722556a1f7f3a2d0be1a7c6d1bdca85 Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 11 Apr 1996 22:10:11 +0000
Subject: [PATCH] prototype MD functions for use by MI ISA code
 (isa_attach_hook(), isa_intr_{,dis}establish()) here.  Make this file safely
 includable by <dev/isa/isavar.h> and by all of the places in the i386 that
 are currently including it, which means multiple inclusion protection and a
 few otherwise-extraneous 'forward' structure declarations. 
 isa_intr_establish() and isa_intr_disestablish() now take as their first
 argument a machine-dependent cookie of type isa_chipset_tag_t, which is also
 defined here.

---
 sys/arch/i386/isa/isa_machdep.h | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index a118e7fc17aa..36bc681ce00d 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.4 1995/05/04 19:39:46 cgd Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.5 1996/04/11 22:10:11 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,6 +38,14 @@
  *	@(#)isa.h	5.7 (Berkeley) 5/9/91
  */
 
+/*
+ * Various pieces of the i386 port want to include this file without
+ * or in spite of using isavar.h, and should be fixed.
+ */
+
+#ifndef _I386_ISA_MACHDEP_H_			/* XXX */
+#define _I386_ISA_MACHDEP_H_			/* XXX */
+
 /*
  * XXX THIS FILE IS A MESS.  copyright: berkeley's probably.
  * contents from isavar.h and isareg.h, mostly the latter.
@@ -46,7 +54,27 @@
  * copyright from berkeley's isa.h which is now dev/isa/isareg.h.
  */
 
+/*
+ * Types provided to machine-independent ISA code.
+ */
+typedef void *isa_chipset_tag_t;
 
+struct device;			/* XXX */
+struct isabus_attach_args;	/* XXX */
+
+/*
+ * Functions provided to machine-independent ISA code.
+ */
+void	isa_attach_hook __P((struct device *, struct device *,
+	    struct isabus_attach_args *));
+void	*isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type,
+	    int level, int (*ih_fun)(void *), void *ih_arg));
+void	isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler));
+
+/*
+ * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
+ * BY PORTABLE CODE.
+ */
 /*
  * XXX Various seemingly PC-specific constants, some of which may be
  * unnecessary anyway.
@@ -135,3 +163,5 @@ extern u_long atdevbase;           /* kernel virtual address of "hole" */
  * Miscellanous functions.
  */
 void sysbeep __P((int, int));		/* beep with the system speaker */
+
+#endif /* _I386_ISA_MACHDEP_H_ XXX */