diff options
Diffstat (limited to 'sys/dev/isa/isa.c')
| -rw-r--r-- | sys/dev/isa/isa.c | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index f85294f24ae..057ac452207 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.22 1997/01/04 14:14:55 niklas Exp $ */ +/* $OpenBSD: isa.c,v 1.23 1997/12/21 14:41:23 downsj Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /*- @@ -43,8 +43,6 @@ #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> -#include "isapnp.h" - int isamatch __P((struct device *, void *, void *)); void isaattach __P((struct device *, struct device *, void *)); @@ -79,9 +77,6 @@ isaattach(parent, self, aux) { struct isa_softc *sc = (struct isa_softc *)self; struct isabus_attach_args *iba = aux; -#if NISAPNP > 0 - void postisapnpattach __P((struct device *, struct device *, void *)); -#endif /* NISAPNP > 0 */ isa_attach_hook(parent, self, iba); printf("\n"); @@ -100,10 +95,6 @@ isaattach(parent, self, aux) TAILQ_INIT(&sc->sc_subdevs); config_scan(isascan, self); - -#if NISAPNP > 0 - postisapnpattach(parent, self, aux); -#endif /* NISAPNP > 0 */ } int @@ -137,19 +128,6 @@ isascan(parent, match) struct device *dev = match; struct cfdata *cf = dev->dv_cfdata; struct isa_attach_args ia; -#if 0 - struct emap *io_map, *mem_map, *irq_map, *drq_map; -#endif - - if (cf->cf_loc[6] != -1) /* pnp device, scanned later */ - return; - -#if 0 - io_map = find_emap("io"); - mem_map = find_emap("mem"); - irq_map = find_emap("irq"); - drq_map = find_emap("drq"); -#endif ia.ia_iot = sc->sc_iot; ia.ia_memt = sc->sc_memt; @@ -171,16 +149,6 @@ isascan(parent, match) sc->sc_dev.dv_xname); ia2.ia_iosize = 0; } -#if 0 - if (ia2.ia_iobase != -1 && ia2.ia_iosize > 0) - add_extent(io_map, ia2.ia_iobase, ia2.ia_iosize); - if (ia.ia_maddr != -1 && ia.ia_msize > 0) - add_extent(mem_map, ia2.ia_maddr, ia2.ia_msize); - if (ia2.ia_irq != -1) - add_extent(irq_map, ia2.ia_irq, 1); - if (ia2.ia_drq != -1) - add_extent(drq_map, ia2.ia_drq, 1); -#endif config_attach(parent, dev, &ia2, isaprint); dev = config_make_softc(parent, cf); ia2 = ia; @@ -189,19 +157,8 @@ isascan(parent, match) return; } - if ((*cf->cf_attach->ca_match)(parent, dev, &ia) > 0) { -#if 0 - if (ia.ia_iobase > 0 && ia.ia_iosize > 0) - add_extent(io_map, ia.ia_iobase, ia.ia_iosize); - if (ia.ia_maddr > 0 && ia.ia_msize > 0) - add_extent(mem_map, ia.ia_maddr, ia.ia_msize); - if (ia.ia_irq > 0) - add_extent(irq_map, ia.ia_irq, 1); - if (ia.ia_drq > 0) - add_extent(drq_map, ia.ia_drq, 1); -#endif + if ((*cf->cf_attach->ca_match)(parent, dev, &ia) > 0) config_attach(parent, dev, &ia, isaprint); - } else free(dev, M_DEVBUF); } |