[src/netbsd-1-4]: src/sys/dev/sbus Pull up revisions 1.19-1.20 (via patch, re...

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

details:   https://anonhg.NetBSD.org/src/rev/8cc81d5942e0
branches:  netbsd-1-4
changeset: 470025:8cc81d5942e0
user:      he <he%NetBSD.org@localhost>
date:      Sat Jan 15 16:19:44 2000 +0000

description:
Pull up revisions 1.19-1.20 (via patch, requested by mjacob):
  Fix a bug where the sense of when to sleep waiting for DMA
  resources was reversed.  Fix internal functionality where it's
  now a firmware pointer being NULL instead of firmware length
  being zero that disables f/w loading.

diffstat:

 sys/dev/sbus/isp_sbus.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 058061050890 -r 8cc81d5942e0 sys/dev/sbus/isp_sbus.c
--- a/sys/dev/sbus/isp_sbus.c   Sat Jan 15 16:15:40 2000 +0000
+++ b/sys/dev/sbus/isp_sbus.c   Sat Jan 15 16:19:44 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.10.2.2 2000/01/08 22:44:56 he Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.10.2.3 2000/01/15 16:19:44 he Exp $ */
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -125,6 +125,7 @@
        return (rv);
 }
 
+
 static void
 isp_sbus_attach(parent, self, aux)
         struct device *parent, *self;
@@ -180,7 +181,7 @@
         */
        if (strcmp("PTI,ptisp", sa->sa_name) == 0 ||
            strcmp("ptisp", sa->sa_name) == 0) {
-               sbc->sbus_mdvec.dv_fwlen = 0;
+               sbc->sbus_mdvec.dv_ispfw = NULL;
        }
 
        isp->isp_mdvec = &sbc->sbus_mdvec;
@@ -337,7 +338,7 @@
 {
        struct isp_sbussoftc *sbc = (struct isp_sbussoftc *) isp;
        bus_dmamap_t dmamap;
-       int dosleep = (xs->flags & SCSI_NOSLEEP) != 0;
+       int cansleep = (xs->flags & SCSI_NOSLEEP) == 0;
        int in = (xs->flags & SCSI_DATA_IN) != 0;
 
        if (xs->datalen == 0) {
@@ -351,7 +352,7 @@
                /* NOTREACHED */
        }
        if (bus_dmamap_load(sbc->sbus_dmatag, dmamap, xs->data, xs->datalen,
-           NULL, dosleep ? BUS_DMA_WAITOK : BUS_DMA_NOWAIT) != 0) {
+           NULL, cansleep? BUS_DMA_WAITOK : BUS_DMA_NOWAIT) != 0) {
                XS_SETERR(xs, HBA_BOTCH);
                return (CMD_COMPLETE);
        }