diff options
| author | dg <dg@FreeBSD.org> | 1997-10-03 16:26:15 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1997-10-03 16:26:15 +0000 |
| commit | b25d2d5f2b4ff3abaa0e513c43c0dd41636d3ed2 (patch) | |
| tree | ffa70b8be8e80d0672dc237a399b27171b261821 | |
| parent | 24a6bdc01c91890afdeda4087b6f08cbe270baa0 (diff) | |
| download | FreeBSD-src-b25d2d5f2b4ff3abaa0e513c43c0dd41636d3ed2.zip FreeBSD-src-b25d2d5f2b4ff3abaa0e513c43c0dd41636d3ed2.tar.gz | |
Backed out part of a previous change: don't set ZWS on '790 chips; it has
shown to be harmful in that it results in the card not being detected
properly on warmboot due to the station address failing to be read
correctly from the NVRAM.
| -rw-r--r-- | sys/dev/ed/if_ed.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/if_ed.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index dfa5fed..7b632b7 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.120 1997/09/08 20:00:21 davidg Exp $ + * $Id: if_ed.c,v 1.121 1997/09/10 00:17:39 davidg Exp $ */ /* @@ -730,11 +730,6 @@ ed_probe_WD80x3(isa_dev) if (isa16bit) { if (sc->is790) { sc->wd_laar_proto = inb(sc->asic_addr + ED_WD_LAAR); - /* - * Enable zero waitstate operation - */ - outb(sc->asic_addr + ED_WD790_GCR, inb(sc->asic_addr + - ED_WD790_GCR) | ED_WD790_GCR_ZWSEN); } else { sc->wd_laar_proto = ED_WD_LAAR_L16EN | ED_WD_LAAR_0WS16 | ((kvtop(sc->mem_start) >> 19) & ED_WD_LAAR_ADDRHI); diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index dfa5fed..7b632b7 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ed.c,v 1.120 1997/09/08 20:00:21 davidg Exp $ + * $Id: if_ed.c,v 1.121 1997/09/10 00:17:39 davidg Exp $ */ /* @@ -730,11 +730,6 @@ ed_probe_WD80x3(isa_dev) if (isa16bit) { if (sc->is790) { sc->wd_laar_proto = inb(sc->asic_addr + ED_WD_LAAR); - /* - * Enable zero waitstate operation - */ - outb(sc->asic_addr + ED_WD790_GCR, inb(sc->asic_addr + - ED_WD790_GCR) | ED_WD790_GCR_ZWSEN); } else { sc->wd_laar_proto = ED_WD_LAAR_L16EN | ED_WD_LAAR_0WS16 | ((kvtop(sc->mem_start) >> 19) & ED_WD_LAAR_ADDRHI); |
