[src/trunk]: src/sys/arch/vax Rename ncr[5380] device to si to more consisten...

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

details:   https://anonhg.NetBSD.org/src/rev/9fa4ba4f1121
branches:  trunk
changeset: 488132:9fa4ba4f1121
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 19 04:22:14 2000 +0000

description:
Rename ncr[5380] device to si to more consistent with other ports.
Add VAX660 to cputype.h.  Remove needs-flag from si & asc entries.

diffstat:

 sys/arch/vax/boot/xxboot/Makefile |   9 +++++-
 sys/arch/vax/conf/GENERIC         |  10 +++---
 sys/arch/vax/conf/INSTALL         |   8 ++--
 sys/arch/vax/conf/files.vax       |  12 ++++----
 sys/arch/vax/vax/autoconf.c       |  12 ++-----
 sys/arch/vax/vsa/ncr.c            |  58 +++++++++++++++-----------------------
 6 files changed, 50 insertions(+), 59 deletions(-)

diffs (285 lines):

diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/boot/xxboot/Makefile
--- a/sys/arch/vax/boot/xxboot/Makefile Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/boot/xxboot/Makefile Mon Jun 19 04:22:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2000/05/22 15:42:37 matt Exp $
+#      $NetBSD: Makefile,v 1.7 2000/06/19 04:22:14 matt Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -30,6 +30,13 @@
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=${KERNLIB}
 
+.BEGIN:
+       @[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
+       @[ -h ${MACHINE_ARCH} ] || ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
+.NOPATH: machine ${MACHINE_ARCH}
+CLEANFILES+= machine ${MACHINE_ARCH}
+
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 ${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
        ld -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
        objcopy -O binary ${PROG}.out ${PROG}
diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/conf/GENERIC
--- a/sys/arch/vax/conf/GENERIC Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/conf/GENERIC Mon Jun 19 04:22:14 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.70 2000/06/14 22:02:42 veego Exp $
+#      $NetBSD: GENERIC,v 1.71 2000/06/19 04:22:16 matt Exp $
 #
 # GENERIC VAX configuration file; all supported devices.
 #
 
 include                "arch/vax/conf/std.vax"
 
-#ident                 "GENERIC-$Revision: 1.70 $"
+#ident                 "GENERIC-$Revision: 1.71 $"
 
 # Here are all different supported CPU types listed.
 options        "VAX8600"
@@ -115,10 +115,10 @@
 dz0            at vsbus0 csr 0x200a0000 # DC-367 DZ-11 lookalike ctlr
 dz0            at vsbus0 csr 0x25000000 # VS4000/90 serial line
 #hdc0          at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
-ncr0           at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr
+si0            at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr
 asc0           at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr
 asc0           at vsbus0 csr 0x26000080 # VS4000/90 SCSI-ctlr
-ncr1           at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
+si1            at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
 smg0           at vsbus0 csr 0x200f0000 # Small monochrome display ctlr.
 #clr0          at vsbus0 csr 0x30000000 # 4- or 8-bitplans color graphics
 
@@ -183,7 +183,7 @@
 
 # SCSI devices
 scsibus*       at asc?
-scsibus*       at ncr?
+scsibus*       at si?
 
 sd*            at scsibus? target? lun?
 st*            at scsibus? target? lun?
diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/conf/INSTALL
--- a/sys/arch/vax/conf/INSTALL Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/conf/INSTALL Mon Jun 19 04:22:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.5 2000/06/11 23:32:10 matt Exp $
+#      $NetBSD: INSTALL,v 1.6 2000/06/19 04:22:16 matt Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -151,10 +151,10 @@
 # SCSI controllers.
 asc0           at vsbus0 csr 0x200c0080 # VS4000/{60,VLC} SCSI-controller
 #asc0          at vsbus0 csr 0x26000080 # VS4000/90 SCSI-controller
-ncr0           at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-controller (5380)
-ncr1           at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-controller (5380)
+si0            at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-controller (5380)
+si1            at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-controller (5380)
 scsibus*       at asc?
-scsibus*       at ncr?
+scsibus*       at si?
 
 # SCSI devices
 sd*            at scsibus? target? lun?
diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/conf/files.vax       Mon Jun 19 04:22:14 2000 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.70 2000/06/12 11:13:17 ragge Exp $
+#       $NetBSD: files.vax,v 1.71 2000/06/19 04:22:16 matt Exp $
 #
 # new style config file for vax architecture
 #
@@ -18,7 +18,7 @@
 
 defopt opt_cputype.h   VAX780 VAX750 VAX730 VAX8200 VAX8800 VAX8600
        VAX6200 VAX6400 VAX6500 VAX6600 VAX410 VAX43 VAX46 VAX48
-       VAX49 VAX53 VAX630 VAX650 VAX670 VAX680
+       VAX49 VAX53 VAX630 VAX650 VAX660 VAX670 VAX680
 
 # NBI on KA88
 device nmi { slot=-1 }
@@ -159,9 +159,9 @@
 major  { cd = 22 }
 
 # builtin NCR5380 SCSI-controller on VAXstation 
-device ncr: scsi, ncr5380sbc
-attach ncr at vsbus
-file   arch/vax/vsa/ncr.c              ncr needs-flag
+device si: scsi, ncr5380sbc
+attach si at vsbus with si_vsbus
+file   arch/vax/vsa/ncr.c              si_vsbus
 
 # LANCE ethernet controller on VAXstation
 attach le at vsbus with le_vsbus:      le24
@@ -175,7 +175,7 @@
 # builtin NCR53C95 SCSI Controlller on VAXstation 4000 VLC/60/9x
 device asc: scsi, ncr53c9x
 attach asc at vsbus with asc_vsbus
-file   arch/vax/vsa/asc_vsbus.c        asc needs-flag
+file   arch/vax/vsa/asc_vsbus.c        asc_vsbus
 
 device lkc: qfont
 attach lkc at dz
diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/vax/autoconf.c
--- a/sys/arch/vax/vax/autoconf.c       Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/vax/autoconf.c       Mon Jun 19 04:22:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.63 2000/06/15 19:49:37 ragge Exp $      */
+/*     $NetBSD: autoconf.c,v 1.64 2000/06/19 04:22:16 matt Exp $       */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -330,13 +330,9 @@
 
        ppdev = dev->dv_parent->dv_parent;
 
-       /* VS3100 NCR 53C80 */
-       if ((jmfr("ncr", ppdev, BDEV_SD) == 0) &&
-           (ppdev->dv_cfdata->cf_loc[0] == rpb.csrphy))
-                       return 1;
-
-       /* VS4000 NCR 53C94 */
-       if ((jmfr("asc", ppdev, BDEV_SD) == 0) &&
+       /* VS3100 NCR 53C80 (si) & VS4000 NCR 53C94 (asc) */
+       if (((jmfr("si",  ppdev, BDEV_SD) == 0) ||      /* new name */
+            (jmfr("asc", ppdev, BDEV_SD) == 0)) &&
            (ppdev->dv_cfdata->cf_loc[0] == rpb.csrphy))
                        return 1;
 
diff -r 8ff939b2de7c -r 9fa4ba4f1121 sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Mon Jun 19 04:04:46 2000 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Mon Jun 19 04:22:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.30 2000/06/05 00:09:21 matt Exp $    */
+/*     $NetBSD: ncr.c,v 1.31 2000/06/19 04:22:17 matt Exp $    */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -103,33 +103,30 @@
        struct  si_dma_handle ncr_dma[SCI_OPENINGS];
 };
 
-static int si_match(struct device *, struct cfdata *, void *);
-static void si_attach(struct device *, struct device *, void *);
+static int si_vsbus_match(struct device *, struct cfdata *, void *);
+static void si_vsbus_attach(struct device *, struct device *, void *);
 static void si_minphys(struct buf *);
 
-static void si_dma_alloc __P((struct ncr5380_softc *));
-static void si_dma_free __P((struct ncr5380_softc *));
-static void si_dma_setup __P((struct ncr5380_softc *));
-static void si_dma_start __P((struct ncr5380_softc *));
-static void si_dma_poll __P((struct ncr5380_softc *));
-static void si_dma_eop __P((struct ncr5380_softc *));
-static void si_dma_stop __P((struct ncr5380_softc *));
+static void si_dma_alloc(struct ncr5380_softc *);
+static void si_dma_free(struct ncr5380_softc *);
+static void si_dma_setup(struct ncr5380_softc *);
+static void si_dma_start(struct ncr5380_softc *);
+static void si_dma_poll(struct ncr5380_softc *);
+static void si_dma_eop(struct ncr5380_softc *);
+static void si_dma_stop(struct ncr5380_softc *);
 
-
-struct cfattach ncr_ca = {
-       sizeof(struct si_softc), si_match, si_attach
+struct cfattach si_vsbus_ca = {
+       sizeof(struct si_softc), si_vsbus_match, si_vsbus_attach
 };
 
 static int
-si_match(parent, cf, aux)
-       struct device *parent;
-       struct cfdata *cf;
-       void *aux;
+si_vsbus_match(struct device *parent, struct cfdata *cf, void *aux)
 {
        struct vsbus_attach_args *va = aux;
        volatile char *si_csr = (char *) va->va_addr;
 
-       if (vax_boardtype == VAX_BTYP_49)
+       if (vax_boardtype == VAX_BTYP_49 || vax_boardtype == VAX_BTYP_46
+           || vax_boardtype == VAX_BTYP_48)
                return 0;
        /* This is the way Linux autoprobes the interrupt MK-990321 */
        si_csr[12] = 0;
@@ -141,9 +138,7 @@
 }
 
 static void
-si_attach(parent, self, aux)
-       struct device   *parent, *self;
-       void            *aux;
+si_vsbus_attach(struct device *parent, struct device *self, void *aux)
 {
        struct vsbus_attach_args *va = aux;
        struct si_softc *sc = (struct si_softc *) self;
@@ -243,8 +238,7 @@
 }
 
 void
-si_dma_alloc(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_alloc(struct ncr5380_softc *ncr_sc)
 {
        struct si_softc *sc = (struct si_softc *)ncr_sc;
        struct sci_req *sr = ncr_sc->sc_current;
@@ -292,8 +286,7 @@
 }
 
 void
-si_dma_free(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_free(struct ncr5380_softc *ncr_sc)
 {
        struct sci_req *sr = ncr_sc->sc_current;
        struct si_dma_handle *dh = sr->sr_dma_hand;
@@ -307,15 +300,13 @@
 }
 
 void
-si_dma_setup(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_setup(struct ncr5380_softc *ncr_sc)
 {
        /* Do nothing here */
 }
 
 void
-si_dma_start(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_start(struct ncr5380_softc *ncr_sc)
 {
        struct si_softc *sc = (struct si_softc *)ncr_sc;
        struct sci_req *sr = ncr_sc->sc_current;
@@ -364,8 +355,7 @@
  * When?
  */
 void
-si_dma_poll(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_poll(struct ncr5380_softc *ncr_sc)
 {
        printf("si_dma_poll\n");
 }
@@ -374,15 +364,13 @@
  * When?
  */
 void
-si_dma_eop(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_eop(struct ncr5380_softc *ncr_sc)
 {
        printf("si_dma_eop\n");
 }
 
 void
-si_dma_stop(ncr_sc)
-       struct ncr5380_softc *ncr_sc;
+si_dma_stop(struct ncr5380_softc *ncr_sc)
 {
        struct si_softc *sc = (struct si_softc *)ncr_sc;
        struct sci_req *sr = ncr_sc->sc_current;