diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-02-08 10:46:10 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2009-02-08 10:46:10 +0000 |
| commit | 394c5aecf568d01416109c3e22a6441f4af3a4ab (patch) | |
| tree | a43fb86a3efbc07d51a926b58079d038c2ba4522 /sys | |
| parent | 259e1db9a22ff45c6384449bac34dcb7c9e2d4e9 (diff) | |
ips is not a real scsi controller and not supposed to talk directly to
various flacky scsi hardware (at least until passthrough implemented).
So reduce huge default scsibus timeout values to somewhat reasonable.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/ips.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 2e7bb860f25..d557c78313b 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.33 2009/02/08 09:07:36 grange Exp $ */ +/* $OpenBSD: ips.c,v 1.34 2009/02/08 10:46:09 grange Exp $ */ /* * Copyright (c) 2006, 2007 Alexander Yurchenko <grange@openbsd.org> @@ -66,6 +66,8 @@ int ips_debug = IPS_D_ERR; #define IPS_SGSZ sizeof(struct ips_sg) #define IPS_SECSZ 512 +#define IPS_TIMEOUT 5 /* seconds */ + /* Command codes */ #define IPS_CMD_READ 0x02 #define IPS_CMD_WRITE 0x03 @@ -710,7 +712,7 @@ ips_cmd(struct ips_softc *sc, int code, int drive, u_int32_t lba, void *data, } else { /* Set watchdog timer */ timeout_set(&xs->stimeout, ips_timeout, ccb); - timeout_add_msec(&xs->stimeout, xs->timeout); + timeout_add_sec(&xs->stimeout, IPS_TIMEOUT); } return (error); |