[src/trunk]: src/sys/dev/scsipi Since we always defer probing SCSI and ATAPI ...

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

details:   https://anonhg.NetBSD.org/src/rev/b346757fc4c7
branches:  trunk
changeset: 570045:b346757fc4c7
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Sep 18 18:29:00 2004 +0000

description:
Since we always defer probing SCSI and ATAPI devices now, we can never be
"cold" -- so change the check for this to a KASSERT().

diffstat:

 sys/dev/scsipi/scsipi_base.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 4eeae610c375 -r b346757fc4c7 sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Sat Sep 18 18:00:05 2004 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Sat Sep 18 18:29:00 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.118 2004/09/18 18:00:05 mycroft Exp $        */
+/*     $NetBSD: scsipi_base.c,v 1.119 2004/09/18 18:29:00 mycroft Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.118 2004/09/18 18:00:05 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.119 2004/09/18 18:29:00 mycroft Exp $");
 
 #include "opt_scsi.h"
 
@@ -386,11 +386,7 @@
 
        SC_DEBUG(periph, SCSIPI_DB3, ("scsipi_get_xs\n"));
 
-       /*
-        * If we're cold, make sure we poll.
-        */
-       if (cold)
-               flags |= XS_CTL_NOSLEEP | XS_CTL_POLL;
+       KASSERT(!cold);
 
 #ifdef DIAGNOSTIC
        /*
@@ -1874,6 +1870,8 @@
        struct scsipi_channel *chan = periph->periph_channel;
        int oasync, async, poll, retries, error, s;
 
+       KASSERT(!cold);
+
        (chan->chan_bustype->bustype_cmd)(xs);
 
        if (xs->xs_control & XS_CTL_DATA_ONSTACK) {