This represents essentially a complete rewrite of the ISA PnP code. The

new system is integrated with the ISA bus code more cleanly and allows
the future addition of more enumerators such as PnPBIOS and ACPI.

This commit also enables the new pcm driver since it is somewhat tied to
the new PnP code.

4 files changed, 8 insertions, 23 deletions

diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index f55ae9e..1ec918c 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -234,7 +234,6 @@ i386/isa/pcvt/pcvt_kbd.c	optional	vt
 i386/isa/pcvt/pcvt_out.c	optional	vt
 i386/isa/pcvt/pcvt_sup.c	optional	vt
 i386/isa/pcvt/pcvt_vtf.c	optional	vt
-i386/isa/pnp.c			optional	pnp
 i386/isa/ppc.c			optional	ppc
 i386/isa/prof_machdep.c		optional	profiling-routine
 i386/isa/random_machdep.c	standard
@@ -244,11 +243,6 @@ i386/isa/scd.c			optional	scd
 i386/isa/si.c			optional	si
 i386/isa/si2_z280.c		optional	si
 i386/isa/si3_t225.c		optional	si
-i386/isa/snd/ad1848.c		optional	pcm
-i386/isa/snd/clones.c		optional	pcm
-i386/isa/snd/dmabuf.c		optional	pcm
-i386/isa/snd/sb_dsp.c		optional	pcm
-i386/isa/snd/sound.c		optional	pcm
 i386/isa/sound/ad1848.c		optional	css
 i386/isa/sound/ad1848.c		optional	gus
 i386/isa/sound/ad1848.c		optional	gusxvi
@@ -391,5 +385,4 @@ libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
-pci/es1370.c			optional	pcm pci
 pci/ide_pci.c			optional	wd pci
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 630bd05..5dbbedd 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -74,12 +74,8 @@
 #include <i386/isa/icu.h>
 #endif /* APIC_IO */
 
-#include "pnp.h"
-#if NPNP > 0
-#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
-#endif
-
+#include "isa.h"
+#include <isa/isavar.h>
 device_t isa_bus_device = 0;
 
 static void	configure_first __P((void *));
@@ -223,17 +219,14 @@ configure(dummy)
 	/* initialize new bus architecture */
 	root_bus_configure();
 
-#if NPNP > 0
-	/* Activate PNP. If no drivers are found, let ISA probe them.. */
-	pnp_configure();
-#endif
-
+#if NISA > 0
 	/*
 	 * Explicitly probe and attach ISA last.  The isa bus saves
 	 * it's device node at attach time for us here.
 	 */
 	if (isa_bus_device)
-		bus_generic_attach(isa_bus_device);
+		isa_probe_children(isa_bus_device);
+#endif
 
 	/*
 	 * Now we're ready to handle (pending) interrupts.
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 65b40aa..7ca8b25 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -125,6 +125,9 @@
 #include <i386/isa/isa_device.h>
 #include "pnp.h"
 
+#undef NPNP
+#define NPNP 0
+
 #if NPNP > 0
 #include <i386/isa/pnp.h>
 #endif
diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h
index e6f57f6..913d967 100644
--- a/sys/i386/isa/isa_compat.h
+++ b/sys/i386/isa/isa_compat.h
@@ -120,7 +120,6 @@ extern struct isa_driver  wldriver;
 extern struct isa_driver  zedriver;
 extern struct isa_driver  zpdriver;
 extern struct isa_driver oltrdriver;
-extern struct isa_driver pcmdriver;
 extern struct isa_driver pasdriver;
 extern struct isa_driver  sbdriver;
 extern struct isa_driver sbxvidriver;
@@ -334,9 +333,6 @@ static struct old_isa_driver old_drivers[] = {
 #if NOLTR > 0
 	{ INTR_TYPE_MISC, &oltrdriver },
 #endif
-#if NPCM > 0
-	{ INTR_TYPE_MISC, &pcmdriver },
-#endif
 #if NPAS > 0
 	{ INTR_TYPE_MISC, &pasdriver },
 #endif