Don't declare isa device structs or isa interrupt handlers in <sys/conf>,

and don't depend on them being declared there.  This will cause lots of
warnings for a few minutes until config is updated.  Interrupt handlers
should never have been configured by config, and the machine generated
declarations get in the way of changing the arg type from int to void *.

10 files changed, 68 insertions, 27 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 331770d..3b60112 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.298 1998/06/03 07:56:59 bde Exp $
+ *	$Id: machdep.c,v 1.299 1998/06/07 17:10:01 dfr Exp $
  */
 
 #include "apm.h"
@@ -211,6 +211,9 @@ static vm_offset_t pager_sva, pager_eva;
 #ifdef NETISR
 extern struct linker_set netisr_set;
 #endif
+#if NNPX > 0
+extern struct isa_driver npxdriver;
+#endif
 
 #define offsetof(type, member)	((size_t)(&((type *)0)->member))
 
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index c4bd4db..3af7027 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.11 1998/02/20 13:11:47 bde Exp $ */
+/* $Id: if_wl.c,v 1.12 1998/06/07 17:10:38 dfr Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -263,7 +263,6 @@ static struct wl_softc wl_softc[NWL];
 
 static int	wlprobe(struct isa_device *);
 static int	wlattach(struct isa_device *);
-void   		wlintr(int);	/* no, not static */
 
 struct isa_driver wldriver = {
     wlprobe, wlattach, "wl", 0
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 331770d..3b60112 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.298 1998/06/03 07:56:59 bde Exp $
+ *	$Id: machdep.c,v 1.299 1998/06/07 17:10:01 dfr Exp $
  */
 
 #include "apm.h"
@@ -211,6 +211,9 @@ static vm_offset_t pager_sva, pager_eva;
 #ifdef NETISR
 extern struct linker_set netisr_set;
 #endif
+#if NNPX > 0
+extern struct isa_driver npxdriver;
+#endif
 
 #define offsetof(type, member)	((size_t)(&((type *)0)->member))
 
diff --git a/sys/i386/include/conf.h b/sys/i386/include/conf.h
deleted file mode 100644
index ee6b603..0000000
--- a/sys/i386/include/conf.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _MACHINE_CONF_H_
-#define	_MACHINE_CONF_H_
-
-#ifdef KERNEL
-#ifndef ACTUALLY_LKM_NOT_KERNEL
-#include "ioconf.h"
-#endif
-
-#endif /* KERNEL */
-
-#endif /* !_MACHINE_CONF_H_ */
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index c4bd4db..3af7027 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.11 1998/02/20 13:11:47 bde Exp $ */
+/* $Id: if_wl.c,v 1.12 1998/06/07 17:10:38 dfr Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -263,7 +263,6 @@ static struct wl_softc wl_softc[NWL];
 
 static int	wlprobe(struct isa_device *);
 static int	wlattach(struct isa_device *);
-void   		wlintr(int);	/* no, not static */
 
 struct isa_driver wldriver = {
     wlprobe, wlattach, "wl", 0
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 89b14e4..61accbaf 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.46 1997/08/28 03:37:46 msmith Exp $
+ *	$Id: isa_device.h,v 1.47 1997/09/21 21:41:19 gibbs Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -122,6 +122,57 @@ int	isa_dmastatus __P((int chan));
 int	isa_dmastop __P((int chan));
 void	reconfig_isadev __P((struct isa_device *isdp, u_int *mp));
 
+inthand2_t	adintr;
+inthand2_t	ahaintr;
+inthand2_t	aicintr;
+inthand2_t	alogintr;
+inthand2_t	arintr;
+inthand2_t	ascintr;
+inthand2_t	bt_isa_intr;
+inthand2_t	cxintr;
+inthand2_t	cyintr;
+inthand2_t	edintr;
+inthand2_t	egintr;
+inthand2_t	elintr;
+inthand2_t	epintr;
+inthand2_t	exintr;
+inthand2_t	fdintr;
+inthand2_t	feintr;
+inthand2_t	gusintr;
+inthand2_t	ieintr;
+inthand2_t	labpcintr;
+inthand2_t	le_intr;
+inthand2_t	lncintr;
+inthand2_t	loranintr;
+inthand2_t	lptintr;
+inthand2_t	m6850intr;
+inthand2_t	mcdintr;
+inthand2_t	mseintr;
+inthand2_t	ncaintr;
+inthand2_t	npxintr;
+inthand2_t	pasintr;
+inthand2_t	pcrint;
+inthand2_t	ppcintr;
+inthand2_t	psmintr;
+inthand2_t	rcintr;
+inthand2_t	sbintr;
+inthand2_t	scintr;
+inthand2_t	seaintr;
+inthand2_t	siointr;
+inthand2_t	sndintr;
+inthand2_t	spigintr;
+inthand2_t	srintr;
+inthand2_t	sscapeintr;
+inthand2_t	stlintr;
+inthand2_t	twintr;
+inthand2_t	uhaintr;
+inthand2_t	wdintr;
+inthand2_t	wdsintr;
+inthand2_t	wlintr;
+inthand2_t	wtintr;
+inthand2_t	zeintr;
+inthand2_t	zpintr;
+
 #endif /* KERNEL */
 
 #endif /* !_I386_ISA_ISA_DEVICE_H_ */
diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index 3773ace..fbd5051 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -57,7 +57,9 @@
 #include <i386/isa/sound/ad1848_mixer.h>
 #include <i386/isa/sound/iwdefs.h>
 
-#if !defined(CONFIG_CS4232) 
+#if defined(CONFIG_CS4232) 
+extern struct isa_driver cssdriver;
+#else
 extern struct isa_driver mssdriver;
 #endif
 
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index 9f90ffc..8f5ec43 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.10 1998/04/15 17:47:00 bde Exp $
+ *	$Id: ide_pci.c,v 1.11 1998/06/17 12:14:55 bde Exp $
  */
 
 #include "pci.h"
@@ -168,7 +168,6 @@ static struct ide_pci_softc softc;
 
 static int ide_pci_softc_cookies_initted = 0;
 
-inthand2_t wdintr;
 extern struct isa_driver wdcdriver;
 
 /*
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index db0b2bb..43096d3 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.39 1998/02/13 12:46:28 phk Exp $
+ * $Id: conf.h,v 1.40 1998/06/07 17:12:57 dfr Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -286,6 +286,4 @@ int	iszerodev __P((dev_t dev));
 void	setconf __P((void));
 #endif /* KERNEL */
 
-#include <machine/conf.h>
-
 #endif /* !_SYS_CONF_H_ */
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index db0b2bb..43096d3 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.39 1998/02/13 12:46:28 phk Exp $
+ * $Id: conf.h,v 1.40 1998/06/07 17:12:57 dfr Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -286,6 +286,4 @@ int	iszerodev __P((dev_t dev));
 void	setconf __P((void));
 #endif /* KERNEL */
 
-#include <machine/conf.h>
-
 #endif /* !_SYS_CONF_H_ */