[src/thorpej_scsipi]: src/sys/arch/sparc/dev GENERIC without isp now compiles

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

details:   https://anonhg.NetBSD.org/src/rev/5d2c6bd441fa
branches:  thorpej_scsipi
changeset: 477382:5d2c6bd441fa
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Jan 22 18:26:20 2001 +0000

description:
GENERIC without isp now compiles

diffstat:

 sys/arch/sparc/dev/sw.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (41 lines):

diff -r 460477137ecf -r 5d2c6bd441fa sys/arch/sparc/dev/sw.c
--- a/sys/arch/sparc/dev/sw.c   Mon Jan 22 18:23:36 2001 +0000
+++ b/sys/arch/sparc/dev/sw.c   Mon Jan 22 18:26:20 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sw.c,v 1.3.4.2 2000/11/20 20:25:34 bouyer Exp $        */
+/*     $NetBSD: sw.c,v 1.3.4.3 2001/01/22 18:26:20 bouyer Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -142,7 +142,6 @@
 
 #ifdef DEBUG
 int sw_debug = 0;
-static int sw_link_flags = 0 /* | SDEV_DB2 */ ;
 #endif
 
 /*
@@ -373,12 +372,9 @@
                        bitmask_snprintf(sc->sc_options, SW_OPTIONS_BITS,
                            bits, sizeof(bits)));
        }
-#ifdef DEBUG
-       ncr_sc->sc_link.flags |= sw_link_flags;
-#endif
 
-       ncr_sc->sc_link.scsipi_scsi.adapter_target = 7;
-       ncr_sc->sc_adapter.scsipi_minphys = sw_minphys;
+       ncr_sc->sc_channel.chan_id = 7;
+       ncr_sc->sc_adapter.adapt_minphys = sw_minphys;
 
        /* Initialize sw board */
        sw_reset_adapter(ncr_sc);
@@ -399,7 +395,7 @@
 #endif
                bp->b_bcount = MAX_DMA_LEN;
        }
-       return (minphys(bp));
+       minphys(bp);
 }
 
 #define CSR_WANT (SW_CSR_SBC_IP | SW_CSR_DMA_IP | \