[src/thorpej_scsipi]: src/sys/arch/pmax/dev Make MI sii SCSI driver compile. ...

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

details:   https://anonhg.NetBSD.org/src/rev/4ee76a6795c3
branches:  thorpej_scsipi
changeset: 477443:4ee76a6795c3
user:      simonb <simonb%NetBSD.org@localhost>
date:      Thu Mar 29 17:17:54 2001 +0000

description:
Make MI sii SCSI driver compile.  Untested.

diffstat:

 sys/arch/pmax/dev/sii_ds.c |  16 ++++------------
 sys/arch/pmax/dev/siivar.h |   6 ++----
 2 files changed, 6 insertions(+), 16 deletions(-)

diffs (60 lines):

diff -r 14a6ceba48e1 -r 4ee76a6795c3 sys/arch/pmax/dev/sii_ds.c
--- a/sys/arch/pmax/dev/sii_ds.c        Thu Mar 29 17:15:01 2001 +0000
+++ b/sys/arch/pmax/dev/sii_ds.c        Thu Mar 29 17:17:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sii_ds.c,v 1.8.2.1 2000/11/20 20:20:21 bouyer Exp $    */
+/*     $NetBSD: sii_ds.c,v 1.8.2.2 2001/03/29 17:17:54 simonb Exp $    */
 
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -66,12 +66,6 @@
 struct cfattach xsii_ds_ca = {
        sizeof(struct siisoftc), sii_ds_match, sii_ds_attach
 };
-struct scsipi_device sii_ds_dev = {
-       NULL,                   /* Use default error handler */
-       NULL,                   /* have a queue, served by this */
-       NULL,                   /* have no async handler */
-       NULL,                   /* Use default 'done' routine */
-};
 #else
 extern struct cfattach sii_ds_ca;
 struct cfattach sii_ds_ca = {
@@ -133,12 +127,10 @@
 
        /* Do the common parts of attachment. */
 #if NXSII > 0
-       sc->sc_adapter.scsipi_cmd = sii_scsi_cmd;
-       sc->sc_adapter.scsipi_minphys = minphys;
-       siiattach(sc, &sii_ds_dev);
-#else
+       sc->sc_adapter.adapt_request = sii_scsi_request;
+       sc->sc_adapter.adapt_minphys = minphys;
+#endif
        siiattach(sc);
-#endif
 
        /* tie pseudo-slot to device */
        ibus_intr_establish(parent, (void*)ia->ia_cookie, IPL_BIO, siiintr, sc);
diff -r 14a6ceba48e1 -r 4ee76a6795c3 sys/arch/pmax/dev/siivar.h
--- a/sys/arch/pmax/dev/siivar.h        Thu Mar 29 17:15:01 2001 +0000
+++ b/sys/arch/pmax/dev/siivar.h        Thu Mar 29 17:17:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siivar.h,v 1.4.16.3 2001/03/29 10:42:23 bouyer Exp $   */
+/*     $NetBSD: siivar.h,v 1.4.16.4 2001/03/29 17:17:54 simonb Exp $   */
 
 #ifndef _SIIVAR_H
 #define _SIIVAR_H
@@ -54,11 +54,9 @@
 /* Machine-indepedent back-end attach entry point */
 
 #if NXSII > 0
-void   siiattach __P((struct siisoftc *));
 void   sii_scsi_request __P((struct scsipi_channel *,
                                scsipi_adapter_req_t, void *));
-#else
-void   siiattach __P((struct siisoftc *sc));
 #endif
+void   siiattach __P((struct siisoftc *));
 
 #endif /* _SIIVAR_H */