[src/trunk]: src/sys/dev/ic If we need to poll, set SCSIPI_ADAPT_POLL_ONLY ra...

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

details:   https://anonhg.NetBSD.org/src/rev/cb8d27e74030
branches:  trunk
changeset: 570029:cb8d27e74030
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Sep 18 02:18:39 2004 +0000

description:
If we need to poll, set SCSIPI_ADAPT_POLL_ONLY rather than a homegrown flag.

diffstat:

 sys/dev/ic/sunscpal.c    |  11 ++++-------
 sys/dev/ic/sunscpalvar.h |   5 ++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r ccb8aca83ac6 -r cb8d27e74030 sys/dev/ic/sunscpal.c
--- a/sys/dev/ic/sunscpal.c     Sat Sep 18 00:21:03 2004 +0000
+++ b/sys/dev/ic/sunscpal.c     Sat Sep 18 02:18:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunscpal.c,v 1.14 2003/05/03 18:11:24 wiz Exp $        */
+/*     $NetBSD: sunscpal.c,v 1.15 2004/09/18 02:18:39 mycroft Exp $    */
 
 /*
  * Copyright (c) 2001 Matthew Fredette
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.14 2003/05/03 18:11:24 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.15 2004/09/18 02:18:39 mycroft Exp $");
 
 #include "opt_ddb.h"
 
@@ -752,9 +752,6 @@
                periph = xs->xs_periph;
                flags = xs->xs_control;
 
-               if (sc->sc_flags & SUNSCPAL_FORCE_POLLING)
-                       flags |= XS_CTL_POLL;
-
                if (flags & XS_CTL_DATA_UIO)
                        panic("sunscpal: scsi data uio requested");
 
@@ -2079,8 +2076,6 @@
         */
        printf(": options=0x%x\n", options);
        sc->sc_parity_disable = (options & SUNSCPAL_OPT_NO_PARITY_CHK);
-       if (options & SUNSCPAL_OPT_FORCE_POLLING)
-               sc->sc_flags |= SUNSCPAL_FORCE_POLLING;
        if (options & SUNSCPAL_OPT_DISABLE_DMA)
                sc->sc_flags |= SUNSCPAL_DISABLE_DMA;
 
@@ -2094,6 +2089,8 @@
        sc->sc_adapter.adapt_max_periph = 1;
        sc->sc_adapter.adapt_request = sunscpal_scsipi_request;
        sc->sc_adapter.adapt_minphys = sunscpal_minphys;
+       if (options & SUNSCPAL_OPT_FORCE_POLLING)
+               sc->sc_adapter.adapt_flags |= SCSIPI_ADAPT_POLL_ONLY;
 
        sc->sc_channel.chan_adapter = &sc->sc_adapter;
        sc->sc_channel.chan_bustype = &scsi_bustype;
diff -r ccb8aca83ac6 -r cb8d27e74030 sys/dev/ic/sunscpalvar.h
--- a/sys/dev/ic/sunscpalvar.h  Sat Sep 18 00:21:03 2004 +0000
+++ b/sys/dev/ic/sunscpalvar.h  Sat Sep 18 02:18:39 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunscpalvar.h,v 1.3 2003/11/02 11:07:46 wiz Exp $      */
+/*     $NetBSD: sunscpalvar.h,v 1.4 2004/09/18 02:18:39 mycroft Exp $  */
 
 /*
  * Copyright (c) 2001 Matthew Fredette
@@ -203,8 +203,7 @@
        void            (*sc_intr_off) __P((struct sunscpal_softc *));
 
        int             sc_flags;       /* Misc. flags and capabilities */
-#define        SUNSCPAL_FORCE_POLLING  1       /* Do not use interrupts. */
-#define        SUNSCPAL_DISABLE_DMA    2       /* Do not use DMA. */
+#define        SUNSCPAL_DISABLE_DMA    1       /* Do not use DMA. */
 
        /* Set bits in this to disable parity for some target. */
        int             sc_parity_disable;