diff options
| author | dfr <dfr@FreeBSD.org> | 1999-09-01 20:53:43 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-09-01 20:53:43 +0000 |
| commit | f351c4f3dc1d761f44335d85fee57eb133919756 (patch) | |
| tree | f5d858916a67aca8a86dac46559341c270c6d087 /sys/amd64 | |
| parent | c93ae1166c126cfb59736d68f475ad5948708da7 (diff) | |
| download | FreeBSD-src-f351c4f3dc1d761f44335d85fee57eb133919756.zip FreeBSD-src-f351c4f3dc1d761f44335d85fee57eb133919756.tar.gz | |
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.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 630bd05..5dbbedd 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/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. |
