diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-19 19:47:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-19 19:47:06 +0000 |
| commit | cd5293e3e5c1c683611bab645153dd14f527e682 (patch) | |
| tree | 1ba62088d7acbe912ae52210355c450090c52d81 | |
| parent | 01ecddc3bf36a151b02e79433164b3e70bc36261 (diff) | |
further fixes for strange wss isapnp cards; apollo@slcnet.net
| -rw-r--r-- | sys/dev/isa/ad1848.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/wss_isapnp.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index 3da6230f5b7..29844ff77d0 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.17 1999/05/03 18:50:01 deraadt Exp $ */ +/* $OpenBSD: ad1848.c,v 1.18 1999/07/19 19:47:05 deraadt Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -404,8 +404,10 @@ ad1848_probe(sc) for (i = 0; i < 16; i++) if ((tmp1 = ad_read(sc, i)) != (tmp2 = ad_read(sc, i + 16))) { - DPRINTF(("ad_detect_F(%d/%x/%x)\n", i, tmp1, tmp2)); - goto bad; + if (i != SP_TEST_AND_INIT) { + DPRINTF(("ad_detect_F(%d/%x/%x)\n", i, tmp1, tmp2)); + goto bad; + } } /* diff --git a/sys/dev/isa/wss_isapnp.c b/sys/dev/isa/wss_isapnp.c index 4170709ecf0..1cf51eb5e41 100644 --- a/sys/dev/isa/wss_isapnp.c +++ b/sys/dev/isa/wss_isapnp.c @@ -99,8 +99,7 @@ wss_isapnp_attach(parent, self, aux) struct isa_attach_args *ipa = aux; /* probably broken */ - if (bus_space_read_1(ipa->ia_iot, ipa->ipa_io[0].h, 0x0) == 0x01) - isapnp_write_reg(pnp, ISAPNP_CONFIG_CONTROL, 0x02); + isapnp_write_reg(pnp, ISAPNP_CONFIG_CONTROL, 0x02); sc->sc_iot = ipa->ia_iot; sc->sc_ioh = ipa->ipa_io[0].h; |