[src/thorpej_scsipi]: src/sys/dev/scsipi If SCSIPI_CHAN_NOSETTLE is set in th...

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

details:   https://anonhg.NetBSD.org/src/rev/ecaa1a75a164
branches:  thorpej_scsipi
changeset: 477488:ecaa1a75a164
user:      ad <ad%NetBSD.org@localhost>
date:      Mon Apr 23 16:14:57 2001 +0000

description:
If SCSIPI_CHAN_NOSETTLE is set in the channel's flags, then don't bother
with SCSI_DELAY.

diffstat:

 sys/dev/scsipi/scsiconf.c   |  5 +++--
 sys/dev/scsipi/scsipiconf.h |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r f0c49eea3534 -r ecaa1a75a164 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Mon Apr 23 16:11:27 2001 +0000
+++ b/sys/dev/scsipi/scsiconf.c Mon Apr 23 16:14:57 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.130.2.12 2001/04/11 01:19:47 mjacob Exp $       */
+/*     $NetBSD: scsiconf.c,v 1.130.2.13 2001/04/23 16:14:57 ad Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -182,7 +182,8 @@
 #define SCSI_DELAY 2
 #endif
 
-       if (SCSI_DELAY > 0) {
+       if ((sc->sc_channel->chan_flags & SCSIPI_CHAN_NOSETTLE) == 0 &&
+           SCSI_DELAY > 0) {
                printf("%s: waiting %d seconds for devices to settle...\n",
                    self->dv_xname, SCSI_DELAY);
                /* ...an identifier we know no one will use... */
diff -r f0c49eea3534 -r ecaa1a75a164 sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h       Mon Apr 23 16:11:27 2001 +0000
+++ b/sys/dev/scsipi/scsipiconf.h       Mon Apr 23 16:14:57 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.h,v 1.32.2.14 2001/04/22 16:40:29 bouyer Exp $      */
+/*     $NetBSD: scsipiconf.h,v 1.32.2.15 2001/04/23 16:14:57 ad Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -295,6 +295,7 @@
 #define        SCSIPI_CHAN_SHUTDOWN    0x01    /* channel is shutting down */
 #define        SCSIPI_CHAN_OPENINGS    0x02    /* use chan_openings */
 #define        SCSIPI_CHAN_CANGROW     0x04    /* channel can grow resources */
+#define        SCSIPI_CHAN_NOSETTLE    0x08    /* don't wait for devices to settle */
 
 #define        SCSIPI_CHAN_MAX_PERIPH(chan)                                    \
        (((chan)->chan_flags & SCSIPI_CHAN_OPENINGS) ?                  \