diff options
author | dg <dg@FreeBSD.org> | 1997-11-02 07:12:52 +0000 |
---|---|---|
committer | dg <dg@FreeBSD.org> | 1997-11-02 07:12:52 +0000 |
commit | cd43239919002f0f18ab8b9197cd3d2a1141b109 (patch) | |
tree | 985a63cd074db76e7fbdb32453a1817a27777344 /sys | |
parent | 8df776813bd8c6ef2c655f706c835282d958eef3 (diff) | |
download | FreeBSD-src-cd43239919002f0f18ab8b9197cd3d2a1141b109.zip FreeBSD-src-cd43239919002f0f18ab8b9197cd3d2a1141b109.tar.gz |
Sigh, kill setting of 0WS...it breaks more machines than it fixes.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ed/if_ed.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/if_ed.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index f54ee7e..5a3df2f 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.125 1997/10/26 21:08:40 nate Exp $ + * $Id: if_ed.c,v 1.126 1997/10/29 00:51:50 jdp Exp $ */ /* @@ -681,14 +681,13 @@ ed_probe_WD80x3(isa_dev) sc->arpcom.ac_enaddr[i] = inb(sc->asic_addr + ED_WD_PROM + i); /* - * Set upper address bits, 8/16 bit access to shared memory, and - * zero waitstate operation for 16 bit cards. + * Set upper address bits and 8/16 bit access to shared memory. */ if (isa16bit) { if (sc->is790) { sc->wd_laar_proto = inb(sc->asic_addr + ED_WD_LAAR); } else { - sc->wd_laar_proto = ED_WD_LAAR_L16EN | ED_WD_LAAR_0WS16 | + sc->wd_laar_proto = ED_WD_LAAR_L16EN | ((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 f54ee7e..5a3df2f 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.125 1997/10/26 21:08:40 nate Exp $ + * $Id: if_ed.c,v 1.126 1997/10/29 00:51:50 jdp Exp $ */ /* @@ -681,14 +681,13 @@ ed_probe_WD80x3(isa_dev) sc->arpcom.ac_enaddr[i] = inb(sc->asic_addr + ED_WD_PROM + i); /* - * Set upper address bits, 8/16 bit access to shared memory, and - * zero waitstate operation for 16 bit cards. + * Set upper address bits and 8/16 bit access to shared memory. */ if (isa16bit) { if (sc->is790) { sc->wd_laar_proto = inb(sc->asic_addr + ED_WD_LAAR); } else { - sc->wd_laar_proto = ED_WD_LAAR_L16EN | ED_WD_LAAR_0WS16 | + sc->wd_laar_proto = ED_WD_LAAR_L16EN | ((kvtop(sc->mem_start) >> 19) & ED_WD_LAAR_ADDRHI); } /* |