[src/thorpej_scsipi]: src/sys/arch/vax Make this compile.

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

details:   https://anonhg.NetBSD.org/src/rev/f3c9b7ac4fd1
branches:  thorpej_scsipi
changeset: 477428:f3c9b7ac4fd1
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Mar 29 09:00:03 2001 +0000

description:
Make this compile.

diffstat:

 sys/arch/vax/vax/autoconf.c  |  7 ++++---
 sys/arch/vax/vsa/asc_vsbus.c |  8 +++++---
 sys/arch/vax/vsa/ncr.c       |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r c495145de649 -r f3c9b7ac4fd1 sys/arch/vax/vax/autoconf.c
--- a/sys/arch/vax/vax/autoconf.c       Thu Mar 29 07:40:08 2001 +0000
+++ b/sys/arch/vax/vax/autoconf.c       Thu Mar 29 09:00:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.44.2.2 2001/02/11 19:13:01 bouyer Exp $ */
+/*     $NetBSD: autoconf.c,v 1.44.2.3 2001/03/29 09:00:03 bouyer Exp $ */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -334,10 +334,11 @@
        if (jmfr("sd", dev, BDEV_SD) && jmfr("cd", dev, BDEV_SD))
                return 0;
 
-       if (sa->sa_sc_link->type != BUS_SCSI)
+       if (sa->sa_periph->periph_channel->chan_bustype->bustype_type !=
+           SCSIPI_BUSTYPE_SCSI)
                return 0; /* ``Cannot happen'' */
 
-       if (sa->sa_sc_link->scsipi_scsi.target != rpb.unit)
+       if (sa->sa_periph->periph_target != rpb.unit)
                return 0; /* Wrong unit */
 
        ppdev = dev->dv_parent->dv_parent;
diff -r c495145de649 -r f3c9b7ac4fd1 sys/arch/vax/vsa/asc_vsbus.c
--- a/sys/arch/vax/vsa/asc_vsbus.c      Thu Mar 29 07:40:08 2001 +0000
+++ b/sys/arch/vax/vsa/asc_vsbus.c      Thu Mar 29 09:00:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc_vsbus.c,v 1.21.2.4 2001/02/11 19:13:10 bouyer Exp $        */
+/*     $NetBSD: asc_vsbus.c,v 1.21.2.5 2001/03/29 09:00:04 bouyer Exp $        */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.21.2.4 2001/02/11 19:13:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.21.2.5 2001/03/29 09:00:04 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -305,7 +305,9 @@
        printf("\n%s", self->dv_xname); /* Pretty print */
 
        /* 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);
 }
 
 /*
diff -r c495145de649 -r f3c9b7ac4fd1 sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Thu Mar 29 07:40:08 2001 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Thu Mar 29 09:00:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.22.2.2 2001/02/11 19:13:12 bouyer Exp $      */
+/*     $NetBSD: ncr.c,v 1.22.2.3 2001/03/29 09:00:04 bouyer Exp $      */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -215,8 +215,8 @@
 
        printf("\n%s: NCR5380, SCSI ID %d\n", ncr_sc->sc_dev.dv_xname, target);
 
-       ncr_sc->sc_adapter.scsipi_minphys = si_minphys;
-       ncr_sc->sc_link.scsipi_scsi.adapter_target = target;
+       ncr_sc->sc_adapter.adapt_minphys = si_minphys;
+       ncr_sc->sc_channel.chan_id = target;
 
        /*
         * Init the vsbus DMA resource queue struct */