[src/netbsd-1-5]: src/sys/arch/macppc/dev Pull up revision 1.8 (requested by ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e259351b41b9
branches:  netbsd-1-5
changeset: 492620:e259351b41b9
user:      he <he%NetBSD.org@localhost>
date:      Thu Jan 24 22:47:28 2002 +0000

description:
Pull up revision 1.8 (requested by briggs):
  Honour SCSI command timeout.  This fixes a problem with some SCSI
  commands which take longer than 10s to complete, and were falling
  into a timeout, e.g. CD-R fixating.

diffstat:

 sys/arch/macppc/dev/mesh.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 86543a0e67c3 -r e259351b41b9 sys/arch/macppc/dev/mesh.c
--- a/sys/arch/macppc/dev/mesh.c        Thu Jan 24 22:44:51 2002 +0000
+++ b/sys/arch/macppc/dev/mesh.c        Thu Jan 24 22:47:28 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mesh.c,v 1.4.4.1 2001/02/26 21:16:35 he Exp $  */
+/*     $NetBSD: mesh.c,v 1.4.4.2 2002/01/24 22:47:28 he Exp $  */
 
 /*-
  * Copyright (c) 2000  Tsubai Masanari.
@@ -480,6 +480,7 @@
        struct mesh_scb *scb;
 {
        struct mesh_tinfo *ti = &sc->sc_tinfo[scb->target];
+       int timeout;
 
        DPRINTF("mesh_select\n");
 
@@ -508,7 +509,11 @@
        sc->sc_prevphase = MESH_SELECTING;
        sc->sc_nextstate = MESH_IDENTIFY;
 
-       callout_reset(&scb->xs->xs_callout, 10 * hz, mesh_timeout, scb);
+       timeout = scb->xs->timeout * hz / 1000;
+       if (timeout == 0)
+               timeout = 1;
+
+       callout_reset(&scb->xs->xs_callout, timeout, mesh_timeout, scb);
 }
 
 void