diff options
| author | fvdl <fvdl> | 2000-11-19 12:34:22 +0000 |
|---|---|---|
| committer | fvdl <fvdl> | 2000-11-19 12:34:22 +0000 |
| commit | 28cbd3f0f241f83c3a2b81e083124b5e2b0e3e07 (patch) | |
| tree | 8c58d7aa8655f4d7247c69e0ff6e1924778fc330 /audio | |
| parent | ea31a8ad7b7dfe11fe2cd7d81183f6eb76e6ccd6 (diff) | |
| download | pkgsrc-28cbd3f0f241f83c3a2b81e083124b5e2b0e3e07.tar.gz | |
The timeout value for a scsireq is reset by libscsi in scsi_build. So,
set it *after* scsi_build, so that the actual intented timeout value
is used, avoiding timeouts, bus resets and people putting the blame
on controllers/drivers.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/tosha/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/tosha/patches/patch-ab | 30 |
2 files changed, 30 insertions, 4 deletions
diff --git a/audio/tosha/files/patch-sum b/audio/tosha/files/patch-sum index 7f2caf28a03..ec2dd641092 100644 --- a/audio/tosha/files/patch-sum +++ b/audio/tosha/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/09/10 22:50:34 wiz Exp $ +$NetBSD: patch-sum,v 1.4 2000/11/19 12:34:22 fvdl Exp $ MD5 (patch-aa) = 76c5d61b5f11952f61a2e69aa554f9bf -MD5 (patch-ab) = 669a847df03905937c90134cbc5e91b3 +MD5 (patch-ab) = 6fe50d77b5d0c56f748b293f0404cb30 MD5 (patch-ac) = 437f91a3398bde284ccc57b098c9934f MD5 (patch-af) = 3f099e4413e88748adb63f29521656da diff --git a/audio/tosha/patches/patch-ab b/audio/tosha/patches/patch-ab index ec1cc3dafa2..a51f05eb680 100644 --- a/audio/tosha/patches/patch-ab +++ b/audio/tosha/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.5 2000/09/10 22:50:34 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2000/11/19 12:34:23 fvdl Exp $ --- tosha.c.orig Wed May 21 02:11:49 1997 -+++ tosha.c ++++ tosha.c Sun Nov 19 13:01:03 2000 @@ -49,7 +49,8 @@ #include <sys/uio.h> #include <sys/scsiio.h> @@ -21,6 +21,16 @@ $NetBSD: patch-ab,v 1.5 2000/09/10 22:50:34 wiz Exp $ struct scsireq *sreq; /* SCSI device request structure */ int scsifd; /* SCSI device file descriptor */ +@@ -127,8 +128,8 @@ + int result; + + scsireq_reset (sreq); +- sreq->timeout = 10000; + scsireq_build (sreq, size, (char *) buf, flags, cmd); ++ sreq->timeout = 10000; + result = scsireq_enter (scsifd, sreq); + #ifndef DEBUG + if (SCSIREQ_ERROR (sreq)) @@ -182,7 +183,8 @@ char *tracklstr = "1-100"; @@ -31,6 +41,22 @@ $NetBSD: patch-ab,v 1.5 2000/09/10 22:50:34 wiz Exp $ int indexonly = FALSE; int quiet = FALSE; int verbose = FALSE; +@@ -387,7 +389,6 @@ + if ((secread = framesperbuf) > endpp - sec) + secread = endpp - sec; + scsireq_reset (sreq); +- sreq->timeout = 10000; + if (readcmd == 0xd8) + scsireq_build (sreq, FRAMESIZE * secread, + (char *) buf, SCCMD_READ, +@@ -398,6 +399,7 @@ + (char *) buf, SCCMD_READ, + "v 0 0 v:i3 0 0 v 0", readcmd, + sec, secread); ++ sreq->timeout = 10000; + result = scsireq_enter (scsifd, sreq); + #ifndef DEBUG + if (SCSIREQ_ERROR (sreq)) @@ -464,6 +466,8 @@ int singlefile = FALSE; int modechange = TRUE, denschange = 0; |