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

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

details:   https://anonhg.NetBSD.org/src/rev/0ab15c207fbf
branches:  thorpej_scsipi
changeset: 477434:0ab15c207fbf
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Mar 29 10:13:25 2001 +0000

description:
Pass compile-test on i386.

diffstat:

 sys/arch/mac68k/dev/ncr5380.c     |  8 +++++---
 sys/arch/mac68k/mac68k/autoconf.c |  4 ++--
 sys/arch/mac68k/obio/esp.c        |  6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r 7941c986a01b -r 0ab15c207fbf sys/arch/mac68k/dev/ncr5380.c
--- a/sys/arch/mac68k/dev/ncr5380.c     Thu Mar 29 10:04:51 2001 +0000
+++ b/sys/arch/mac68k/dev/ncr5380.c     Thu Mar 29 10:13:25 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr5380.c,v 1.45.2.2 2001/03/27 13:16:22 bouyer Exp $  */
+/*     $NetBSD: ncr5380.c,v 1.45.2.3 2001/03/29 10:13:25 bouyer Exp $  */
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -303,7 +303,8 @@
                 */
                if (flags & XS_CTL_RESET) {
                        scsi_reset_verbose(sc, "Got reset-command");
-                       return (COMPLETE);
+                       scsipi_done(xs);
+                       return;
                }
 
                /*
@@ -425,6 +426,7 @@
        case ADAPTER_REQ_SET_XFER_MODE:
                /* XXX Not supported. */
                return;
+       }
 }
 
 static void
@@ -719,7 +721,7 @@
        u_int8_t                targ_bit;
        struct ncr_softc        *sc;
 
-       sc = reqp->xs->xs_periph->periph_channel->chan_adapter->adapt_dev;
+       sc = (void *)reqp->xs->xs_periph->periph_channel->chan_adapter->adapt_dev;
        DBG_SELPRINT ("Starting arbitration\n", 0);
        PID("scsi_select1");
 
diff -r 7941c986a01b -r 0ab15c207fbf sys/arch/mac68k/mac68k/autoconf.c
--- a/sys/arch/mac68k/mac68k/autoconf.c Thu Mar 29 10:04:51 2001 +0000
+++ b/sys/arch/mac68k/mac68k/autoconf.c Thu Mar 29 10:13:25 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.53.2.2 2001/03/27 13:16:23 bouyer Exp $ */
+/*     $NetBSD: autoconf.c,v 1.53.2.3 2001/03/29 10:13:25 bouyer Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -154,7 +154,7 @@
        u_long bus, target, lun;
 {
        struct scsibus_softc    *scsi;
-       struct scsipi_periph    *sc_periph;
+       struct scsipi_periph    *periph;
        struct device           *sc_dev;
 extern struct cfdriver         scsibus_cd;
 
diff -r 7941c986a01b -r 0ab15c207fbf sys/arch/mac68k/obio/esp.c
--- a/sys/arch/mac68k/obio/esp.c        Thu Mar 29 10:04:51 2001 +0000
+++ b/sys/arch/mac68k/obio/esp.c        Thu Mar 29 10:13:25 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp.c,v 1.23.2.4 2001/02/11 19:11:01 bouyer Exp $      */
+/*     $NetBSD: esp.c,v 1.23.2.5 2001/03/29 10:13:25 bouyer Exp $      */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -316,7 +316,9 @@
        /*
         * Now try to attach all the sub-devices
         */
-       ncr53c9x_attach(sc, NULL, NULL);
+       sc->sc_adapter.adapt_minphys = minphys;
+       sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request;
+       ncr53c9x_attach(sc);
 }
 
 /*