diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-05-19 16:51:58 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-05-19 16:51:58 +0000 |
commit | 1bbb70e9c72298386ea712312d0475d87d8eb395 (patch) | |
tree | 2baeb6fbbcc00ca1ec3f3e0c4dd55ab3f73813ad /sys/dev | |
parent | 1a43722d80ef8a95841a901905fb9e9cfb06a9f1 (diff) |
My 3c905C needs a brief pause after reset for PIO too, at least on hppa.
tested by thib@, ok deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ic/xl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index bfce9c21945..f2f1b9d3f2c 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.77 2007/05/05 13:24:04 deraadt Exp $ */ +/* $OpenBSD: xl.c,v 1.78 2007/05/19 16:51:57 kettenis Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -807,14 +807,12 @@ xl_reset(struct xl_softc *sc) XL_RESETOPT_DISADVFD:0)); /* - * If we're using memory mapped register mode, pause briefly - * after issuing the reset command before trying to access any - * other registers. With my 3c575C cardbus card, failing to do - * this results in the system locking up while trying to poll - * the command busy bit in the status register. + * Pause briefly after issuing the reset command before trying + * to access any other registers. With my 3c575C cardbus card, + * failing to do this results in the system locking up while + * trying to poll the command busy bit in the status register. */ - if (sc->xl_flags & XL_FLAG_USE_MMIO) - DELAY(100000); + DELAY(100000); for (i = 0; i < XL_TIMEOUT; i++) { DELAY(10); |