diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-20 20:39:32 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-20 20:39:32 +0000 |
| commit | a4d81c5df63c216a6f512eef1e78e889094914fb (patch) | |
| tree | da61552f81c9021ef54f75779ebb9a206f2a09ea /sys/dev/isa/isa.c | |
| parent | 85d079162669fb4fb5151e58089629c1e768385a (diff) | |
rev 1.29 really was the version 1.28 should have been, and 1.28 already
contained the diffs 1.29 was said to have. So this is a revert to 1.28
Diffstat (limited to 'sys/dev/isa/isa.c')
| -rw-r--r-- | sys/dev/isa/isa.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 2a3e514e0fc..2f7da070cb8 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.29 1998/01/20 19:05:05 niklas Exp $ */ +/* $OpenBSD: isa.c,v 1.30 1998/01/20 20:39:31 niklas Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /* @@ -79,6 +79,8 @@ int isamatch __P((struct device *, void *, void *)); void isaattach __P((struct device *, struct device *, void *)); +extern int autoconf_verbose; + struct cfattach isa_ca = { sizeof(struct isa_softc), isamatch, isaattach }; @@ -201,7 +203,14 @@ isascan(parent, match) if (cf->cf_fstate == FSTATE_STAR) { struct isa_attach_args ia2 = ia; + if (autoconf_verbose) + printf(">>> probing for %s*\n", + cf->cf_driver->cd_name); while ((*cf->cf_attach->ca_match)(parent, dev, &ia2) > 0) { + if (autoconf_verbose) + printf(">>> probe for %s* clone into %s%d\n", + cf->cf_driver->cd_name, + cf->cf_driver->cd_name, cf->cf_unit); if (ia2.ia_iosize == 0x666) { printf("%s: iosize not repaired by driver\n", sc->sc_dev.dv_xname); @@ -216,19 +225,30 @@ isascan(parent, match) ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq); #endif /* NISAMDA > 0 */ } + if (autoconf_verbose) + printf(">>> probing for %s* finished\n", + cf->cf_driver->cd_name); free(dev, M_DEVBUF); return; } + if (autoconf_verbose) + printf(">>> probing for %s%d\n", cf->cf_driver->cd_name, + cf->cf_unit); if ((*cf->cf_attach->ca_match)(parent, dev, &ia) > 0) { + printf(">>> probing for %s%d succeeded\n", + cf->cf_driver->cd_name, cf->cf_unit); config_attach(parent, dev, &ia, isaprint); #if NISADMA > 0 if (ia.ia_drq != DRQUNK) ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq); #endif /* NISAMDA > 0 */ - } else + } else { + printf(">>> probing for %s%d failed\n", + cf->cf_driver->cd_name, cf->cf_unit); free(dev, M_DEVBUF); + } } char * |