[src/thorpej_scsipi]: src/sys/arch Pass compile-test on i386

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

details:   https://anonhg.NetBSD.org/src/rev/8738a758004e
branches:  thorpej_scsipi
changeset: 477437:8738a758004e
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Mar 29 10:34:33 2001 +0000

description:
Pass compile-test on i386

diffstat:

 sys/arch/newsmips/apbus/spifi.c |   3 ++-
 sys/arch/newsmips/dev/sc_wrap.c |  12 ++++++------
 sys/arch/pmax/dev/sii.c         |   5 ++---
 sys/arch/pmax/dev/siivar.h      |   4 ++--
 sys/arch/pmax/tc/asc_ioasic.c   |   8 +++++---
 sys/arch/pmax/tc/asc_pmaz.c     |   8 +++++---
 6 files changed, 22 insertions(+), 18 deletions(-)

diffs (154 lines):

diff -r 461ffdd16d99 -r 8738a758004e sys/arch/newsmips/apbus/spifi.c
--- a/sys/arch/newsmips/apbus/spifi.c   Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/newsmips/apbus/spifi.c   Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spifi.c,v 1.1.2.3 2001/01/22 18:25:14 bouyer Exp $     */
+/*     $NetBSD: spifi.c,v 1.1.2.4 2001/03/29 10:34:33 bouyer Exp $     */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -268,6 +268,7 @@
                                if (spifi_poll(sc))
                                        printf("spifi: timeout again\n");
                        }
+               }
                return;
        case ADAPTER_REQ_GROW_RESOURCES:
                /* XXX Not supported. */
diff -r 461ffdd16d99 -r 8738a758004e sys/arch/newsmips/dev/sc_wrap.c
--- a/sys/arch/newsmips/dev/sc_wrap.c   Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/newsmips/dev/sc_wrap.c   Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sc_wrap.c,v 1.11.2.3 2001/01/22 18:25:14 bouyer Exp $  */
+/*     $NetBSD: sc_wrap.c,v 1.11.2.4 2001/03/29 10:34:33 bouyer Exp $  */
 
 /*
  * This driver is slow!  Need to rewrite.
@@ -105,7 +105,7 @@
        sc->sc_channel.chan_adapter = &sc->sc_adapter;
        sc->sc_channel.chan_bustype = &scsi_bustype;
        sc->sc_channel.chan_channel = 0;
-       sc->sc_channel.chan_ntargets = (sc->features & SF_BUS_WIDE) ? 16 : 8;  
+       sc->sc_channel.chan_ntargets = 8;
        sc->sc_channel.chan_nluns = 8;
        sc->sc_channel.chan_id = 7;
 
@@ -191,7 +191,7 @@
        struct sc_softc *sc = (void *)chan->chan_adapter->adapt_dev;
        struct sc_scb *scb;
        int flags, s;
-       int chan;
+       int target;
 
        switch (req) {
        case ADAPTER_REQ_RUN_XFER:
@@ -218,10 +218,10 @@
                splx(s);
 
                if (flags & XS_CTL_POLL) {
-                       chan = periph->periph_target;
-                       if (sc_poll(sc, chan, xs->timeout)) {
+                       target = periph->periph_target;
+                       if (sc_poll(sc, target, xs->timeout)) {
                                printf("sc: timeout (retry)\n");
-                               if (sc_poll(sc, chan, xs->timeout)) {
+                               if (sc_poll(sc, target, xs->timeout)) {
                                        printf("sc: timeout\n");
                                }
                        }
diff -r 461ffdd16d99 -r 8738a758004e sys/arch/pmax/dev/sii.c
--- a/sys/arch/pmax/dev/sii.c   Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/pmax/dev/sii.c   Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sii.c,v 1.36.2.2 2001/03/29 09:03:03 bouyer Exp $      */
+/*     $NetBSD: sii.c,v 1.36.2.3 2001/03/29 10:42:22 bouyer Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -168,9 +168,8 @@
  */
 void
 #if NXSII > 0
-siiattach(sc, dev)
+siiattach(sc)
        struct siisoftc *sc;
-       struct scsipi_device *dev;
 #else
 siiattach(sc)
        struct siisoftc *sc;
diff -r 461ffdd16d99 -r 8738a758004e sys/arch/pmax/dev/siivar.h
--- a/sys/arch/pmax/dev/siivar.h        Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/pmax/dev/siivar.h        Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siivar.h,v 1.4.16.2 2001/03/29 09:03:03 bouyer Exp $   */
+/*     $NetBSD: siivar.h,v 1.4.16.3 2001/03/29 10:42:23 bouyer Exp $   */
 
 #ifndef _SIIVAR_H
 #define _SIIVAR_H
@@ -54,7 +54,7 @@
 /* Machine-indepedent back-end attach entry point */
 
 #if NXSII > 0
-void   siiattach __P((struct siisoftc *, struct scsipi_device *));
+void   siiattach __P((struct siisoftc *));
 void   sii_scsi_request __P((struct scsipi_channel *,
                                scsipi_adapter_req_t, void *));
 #else
diff -r 461ffdd16d99 -r 8738a758004e sys/arch/pmax/tc/asc_ioasic.c
--- a/sys/arch/pmax/tc/asc_ioasic.c     Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/pmax/tc/asc_ioasic.c     Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_ioasic.c,v 1.1.4.1 2000/11/20 20:20:49 bouyer Exp $ */
+/* $NetBSD: asc_ioasic.c,v 1.1.4.2 2001/03/29 10:42:23 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.1.4.1 2000/11/20 20:20:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.1.4.2 2001/03/29 10:42:23 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -190,7 +190,9 @@
        sc->sc_maxxfer = 64 * 1024;
 
        /* Do the common parts of attachment. */
-       ncr53c9x_attach(sc, NULL, NULL);
+       sc->sc_adapter.adapt_minphys = minphys;
+       sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request;
+       ncr53c9x_attach(sc);
 }
 
 void
diff -r 461ffdd16d99 -r 8738a758004e sys/arch/pmax/tc/asc_pmaz.c
--- a/sys/arch/pmax/tc/asc_pmaz.c       Thu Mar 29 10:30:34 2001 +0000
+++ b/sys/arch/pmax/tc/asc_pmaz.c       Thu Mar 29 10:34:33 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_pmaz.c,v 1.1.4.2 2001/03/29 09:03:04 bouyer Exp $ */
+/* $NetBSD: asc_pmaz.c,v 1.1.4.3 2001/03/29 10:42:24 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: asc_pmaz.c,v 1.1.4.2 2001/03/29 09:03:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_pmaz.c,v 1.1.4.3 2001/03/29 10:42:24 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -198,7 +198,9 @@
        sc->sc_maxxfer = 64 * 1024;
 
        /* Do the common parts of attachment. */
-       ncr53c9x_attach(sc, NULL, NULL);
+       sc->sc_adapter.adapt_minphys = minphys;
+       sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request;
+       ncr53c9x_attach(sc);
 }
 
 static void