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

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

details:   https://anonhg.NetBSD.org/src/rev/3c0f991a45ff
branches:  thorpej_scsipi
changeset: 477435:3c0f991a45ff
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Mar 29 10:17:50 2001 +0000

description:
Pass compile-test on i386

diffstat:

 sys/arch/macppc/dev/esp.c   |   6 ++++--
 sys/arch/macppc/dev/mesh.c  |   4 ++--
 sys/arch/mipsco/obio/asc.c  |   6 ++++--
 sys/arch/mvme68k/dev/sbic.c |  14 +++++++-------
 sys/arch/mvme68k/dev/siop.c |  10 +++++-----
 5 files changed, 22 insertions(+), 18 deletions(-)

diffs (165 lines):

diff -r 0ab15c207fbf -r 3c0f991a45ff sys/arch/macppc/dev/esp.c
--- a/sys/arch/macppc/dev/esp.c Thu Mar 29 10:13:25 2001 +0000
+++ b/sys/arch/macppc/dev/esp.c Thu Mar 29 10:17:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp.c,v 1.9.10.1 2000/11/20 20:12:56 bouyer Exp $      */
+/*     $NetBSD: esp.c,v 1.9.10.2 2001/03/29 10:17:50 bouyer Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -250,7 +250,9 @@
        shutdownhook_establish(esp_shutdownhook, sc);
 
        /* 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);
 
        /* Turn on target selection using the `dma' method */
        ncr53c9x_dmaselect = 1;
diff -r 0ab15c207fbf -r 3c0f991a45ff sys/arch/macppc/dev/mesh.c
--- a/sys/arch/macppc/dev/mesh.c        Thu Mar 29 10:13:25 2001 +0000
+++ b/sys/arch/macppc/dev/mesh.c        Thu Mar 29 10:17:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mesh.c,v 1.2.2.4 2001/03/27 13:16:24 bouyer Exp $      */
+/*     $NetBSD: mesh.c,v 1.2.2.5 2001/03/29 10:17:50 bouyer Exp $      */
 
 /*-
  * Copyright (c) 2000  Tsubai Masanari.
@@ -155,7 +155,7 @@
 void mesh_scsi_request __P((struct scsipi_channel *,
                                scsipi_adapter_req_t, void *));
 void mesh_sched __P((struct mesh_softc *));
-void mesh_poll __P((struct mesh_softc *, struct scsipi_xfer *));
+int mesh_poll __P((struct mesh_softc *, struct scsipi_xfer *));
 void mesh_done __P((struct mesh_softc *, struct mesh_scb *));
 void mesh_timeout __P((void *));
 void mesh_minphys __P((struct buf *));
diff -r 0ab15c207fbf -r 3c0f991a45ff sys/arch/mipsco/obio/asc.c
--- a/sys/arch/mipsco/obio/asc.c        Thu Mar 29 10:13:25 2001 +0000
+++ b/sys/arch/mipsco/obio/asc.c        Thu Mar 29 10:17:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc.c,v 1.5.2.4 2001/03/12 13:29:04 bouyer Exp $       */
+/*     $NetBSD: asc.c,v 1.5.2.5 2001/03/29 10:19:48 bouyer Exp $       */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -195,7 +195,9 @@
 #endif
 
        ncr53c9x_dmaselect = 0;
-       ncr53c9x_attach(sc, NULL, NULL);
+       sc->sc_adapter.adapt_minphys = minphys;
+       sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request;
+       ncr53c9x_attach(sc);
 
        bus_intr_establish(esc->sc_bst, SYS_INTR_SCSI, 0, 0, asc_intr, esc); 
 }
diff -r 0ab15c207fbf -r 3c0f991a45ff sys/arch/mvme68k/dev/sbic.c
--- a/sys/arch/mvme68k/dev/sbic.c       Thu Mar 29 10:13:25 2001 +0000
+++ b/sys/arch/mvme68k/dev/sbic.c       Thu Mar 29 10:17:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbic.c,v 1.10.2.2 2001/03/29 09:03:00 bouyer Exp $     */
+/*     $NetBSD: sbic.c,v 1.10.2.3 2001/03/29 10:26:01 bouyer Exp $     */
 
 /*
  * Changes Copyright (c) 1996 Steve Woodford
@@ -366,7 +366,7 @@
        void *arg;
 {
     struct scsipi_xfer *xs;
-    struct scsipi_periph;
+    struct scsipi_periph *periph;
     struct sbic_softc   *dev = (void *)chan->chan_adapter->adapt_dev;
     struct sbic_acb     *acb;
     int                 flags, s;
@@ -375,7 +375,7 @@
     case ADAPTER_REQ_RUN_XFER:
        xs = arg;
        periph = xs->xs_periph;
-        flags = xs->xs_control
+        flags = xs->xs_control;
 
         if ( flags & XS_CTL_DATA_UIO )
             panic("sbic: scsi data uio requested");
@@ -566,7 +566,7 @@
 {
     struct scsipi_xfer    *xs  = acb->xs;
     struct scsipi_periph  *periph = xs->xs_periph;
-    struct sbic_softc   *dev = periph->periph_channel->chan_adapter->adapt_dev;
+    struct sbic_softc   *dev = (void *)periph->periph_channel->chan_adapter->adapt_dev;
     int                 dosched = 0;
 
 #ifdef DIAGNOSTIC
@@ -586,14 +586,14 @@
                        periph->periph_lun,
                                                    dev->target, dev->lun, stat);
 
-    if ( xs->xs_periph->periph.target == dev->sc_channel->chan_id)
+    if ( xs->xs_periph->periph_target == dev->sc_channel.chan_id)
         panic("target == hostid");
 #endif
 
     xs->status = stat;
     xs->resid = 0;      /* XXXX */
     if ( xs->error == XS_NOERROR) {
-        if ( stat == SCSI_CHECK || stat == SCSU_BUSY)
+        if ( stat == SCSI_CHECK || stat == SCSI_BUSY)
             xs->error = XS_BUSY;
     }
 
@@ -857,7 +857,7 @@
 
     s = splbio();
 
-    my_id = dev->sc_channel->chan_id & SBIC_ID_MASK;
+    my_id = dev->sc_channel.chan_id & SBIC_ID_MASK;
 
     if (dev->sc_clkfreq < 110)
         my_id |= SBIC_ID_FS_8_10;
diff -r 0ab15c207fbf -r 3c0f991a45ff sys/arch/mvme68k/dev/siop.c
--- a/sys/arch/mvme68k/dev/siop.c       Thu Mar 29 10:13:25 2001 +0000
+++ b/sys/arch/mvme68k/dev/siop.c       Thu Mar 29 10:17:50 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop.c,v 1.3.2.2 2001/03/29 09:03:01 bouyer Exp $ */
+/*     $NetBSD: siop.c,v 1.3.2.3 2001/03/29 10:26:01 bouyer Exp $ */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -199,7 +199,7 @@
 {
        struct scsipi_xfer *xs;
        struct siop_acb *acb;
-       struct siop_softc *sc = (void *)chan->chan_adapter->adapt_dev;;
+       struct siop_softc *sc = (void *)chan->chan_adapter->adapt_dev;
        struct scsipi_periph *periph;
        int flags, s;
 
@@ -398,7 +398,7 @@
                return;
        }
        periph = xs->xs_periph;
-       sc = (void *)periph->periph_channel->chan->chan_adapter->adapt_dev;
+       sc = (void *)periph->periph_channel->chan_adapter->adapt_dev;
        /*
         * is this right?
         */
@@ -626,7 +626,7 @@
        rp->siop_dmode = 0x80;  /* burst length = 4 */
        rp->siop_sien = 0x00;   /* don't enable interrupts yet */
        rp->siop_dien = 0x00;   /* don't enable interrupts yet */
-       rp->siop_scid = 1 << sc->xs_periph.periph_channel->chan_id;
+       rp->siop_scid = 1 << sc->sc_channel.chan_id;
        rp->siop_dwt = 0x00;
        rp->siop_ctest0 |= SIOP_CTEST0_BTD | SIOP_CTEST0_EAN;
        rp->siop_ctest7 |= sc->sc_ctest7;
@@ -644,7 +644,7 @@
 
        delay (siop_reset_delay * 1000);
        printf("siop id %d reset V%d\n",
-           sc->xs_periph->periph_channel->chan_id,
+           sc->sc_channel.chan_id,
            rp->siop_ctest8 >> 4);
 
        if ((sc->sc_flags & SIOP_ALIVE) == 0) {