Index: dev/ic/wdc.c =================================================================== RCS file: /u/open/cvs/src/sys/dev/ic/wdc.c,v retrieving revision 1.60 diff -u -r1.60 wdc.c --- dev/ic/wdc.c 21 Feb 2003 20:10:33 -0000 1.60 +++ dev/ic/wdc.c 14 May 2003 17:19:05 -0000 @@ -1108,7 +1108,7 @@ :"none", chp->channel), DEBUG_STATUS); chp->ch_error = 0; - timeout = timeout * 1000 / WDCDELAY; /* delay uses microseconds */ + timeout = (cold ? timeout : 10000) * 1000 / WDCDELAY; for (;;) { chp->ch_status = status = CHP_READ_REG(chp, wdr_status); @@ -1123,8 +1123,8 @@ if ((status & WDCS_BSY) == 0 && (status & mask) == bits) break; if (++time > timeout) { - WDCDEBUG_PRINT(("wdcwait: timeout, status %x " - "error %x\n", status, + WDCDEBUG_PRINT(("wdcwait: timeout %d status %x " + "error %x\n", timeout, status, CHP_READ_REG(chp, wdr_error)), DEBUG_STATUSX | DEBUG_STATUS); return -1;