summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/i82365.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index d86a1390fd9..b3618b3095b 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365.c,v 1.19 2001/06/24 20:34:20 fgsch Exp $ */
+/* $OpenBSD: i82365.c,v 1.20 2001/08/17 20:44:11 millert Exp $ */
/* $NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $ */
/*
@@ -103,7 +103,6 @@ void pcic_event_process __P((struct pcic_handle *, struct pcic_event *));
void pcic_queue_event __P((struct pcic_handle *, int));
void pcic_wait_ready __P((struct pcic_handle *));
-void pcic_delay __P((int));
u_int8_t st_pcic_read __P((struct pcic_handle *, int));
void st_pcic_write __P((struct pcic_handle *, int, int));
@@ -1399,7 +1398,7 @@ pcic_chip_socket_enable(pch)
* wait 300ms until power fails (Tpf). Then, wait 100ms since
* we are changing Vcc (Toff).
*/
- pcic_delay((300 + 100) * 1000);
+ delay((300 + 100) * 1000);
if (h->vendor == PCIC_VENDOR_VADEM_VG469) {
reg = pcic_read(h, PCIC_VG469_VSELECT);
@@ -1419,7 +1418,7 @@ pcic_chip_socket_enable(pch)
* some machines require some more time to be settled
* (another 200ms is added here).
*/
- pcic_delay((100 + 20 + 200) * 1000);
+ delay((100 + 20 + 200) * 1000);
pcic_write(h, PCIC_PWRCTL, PCIC_PWRCTL_DISABLE_RESETDRV |
PCIC_PWRCTL_OE | PCIC_PWRCTL_PWR_ENABLE);
@@ -1495,21 +1494,7 @@ pcic_chip_socket_disable(pch)
/*
* wait 300ms until power fails (Tpf).
*/
- pcic_delay(300 * 1000);
-}
-
-void
-pcic_delay(ms)
- int ms;
-{
- int ticks;
-
- ticks = (hz * ms) / 1000000;
-
- if (cold)
- delay(ms);
- else
- tsleep(&ticks, PWAIT, "pcicdel", ticks);
+ delay(300 * 1000);
}
u_int8_t