summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2001-03-19 20:25:01 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2001-03-19 20:25:01 +0000
commit1a81f32563c6bef01a31c1ed8cdb0e0ed2c623dc (patch)
treef2c07125bc7f9a96fb359c501bcce17741975659 /sys
parent44386d4a80b5c66ce4025d5eea2efc0c9517b513 (diff)
DELAY(1) is nicer than DELAY(10), multiply loop counter by 10 due to that.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pcmcia/if_wi.c10
-rw-r--r--sys/dev/pcmcia/if_wireg.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pcmcia/if_wi.c b/sys/dev/pcmcia/if_wi.c
index 25b4544d8d2..b74bd77518f 100644
--- a/sys/dev/pcmcia/if_wi.c
+++ b/sys/dev/pcmcia/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.26 2001/03/19 20:13:43 niklas Exp $ */
+/* $OpenBSD: if_wi.c,v 1.27 2001/03/19 20:24:59 niklas Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -133,7 +133,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.26 2001/03/19 20:13:43 niklas Exp $";
+ "$OpenBSD: if_wi.c,v 1.27 2001/03/19 20:24:59 niklas Exp $";
#endif /* lint */
#ifdef foo
@@ -671,7 +671,7 @@ wi_cmd(sc, cmd, val)
CSR_WRITE_2(sc, WI_PARAM0, val);
CSR_WRITE_2(sc, WI_COMMAND, cmd);
- for (i = WI_TIMEOUT; i--; DELAY(10)) {
+ for (i = WI_TIMEOUT; i--; DELAY(1)) {
/*
* Wait for 'command complete' bit to be
* set in the event status register.
@@ -809,7 +809,7 @@ wi_seek(sc, id, off, chan)
CSR_WRITE_2(sc, selreg, id);
CSR_WRITE_2(sc, offreg, off);
- for (i = WI_TIMEOUT; i--; DELAY(10))
+ for (i = WI_TIMEOUT; i--; DELAY(1))
if (!(CSR_READ_2(sc, offreg) & (WI_OFF_BUSY|WI_OFF_ERR)))
break;
@@ -905,7 +905,7 @@ wi_alloc_nicmem(sc, len, id)
return(ENOMEM);
}
- for (i = WI_TIMEOUT; i--; DELAY(10)) {
+ for (i = WI_TIMEOUT; i--; DELAY(1)) {
if (CSR_READ_2(sc, WI_EVENT_STAT) & WI_EV_ALLOC)
break;
}
diff --git a/sys/dev/pcmcia/if_wireg.h b/sys/dev/pcmcia/if_wireg.h
index 225e6a323d4..68e85eb4e90 100644
--- a/sys/dev/pcmcia/if_wireg.h
+++ b/sys/dev/pcmcia/if_wireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wireg.h,v 1.8 2001/03/19 20:13:44 niklas Exp $ */
+/* $OpenBSD: if_wireg.h,v 1.9 2001/03/19 20:25:00 niklas Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -117,7 +117,7 @@ struct wi_softc {
struct timeout sc_timo;
};
-#define WI_TIMEOUT 5000 /* XXX just a guess at a good value. */
+#define WI_TIMEOUT 50000 /* XXX just a guess at a good value. */
#define WI_PORT0 0
#define WI_PORT1 1