diff options
| author | David Greenman <dg@FreeBSD.org> | 1997-11-02 07:12:52 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1997-11-02 07:12:52 +0000 |
| commit | 12a5bd8bcf6d006004f05c6eccdb9df826691b6a (patch) | |
| tree | b1833e785a1802aac2c97975b60fc2342eacaaf3 /sys | |
| parent | 6632f06e7a9f53671b66acdc67298607a74c9987 (diff) | |
| download | src-12a5bd8bcf6d006004f05c6eccdb9df826691b6a.tar.gz src-12a5bd8bcf6d006004f05c6eccdb9df826691b6a.zip | |
Sigh, kill setting of 0WS...it breaks more machines than it fixes.
Notes
Notes:
svn path=/head/; revision=30892
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 f54ee7e80e1e..5a3df2f68601 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 f54ee7e80e1e..5a3df2f68601 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); } /* |