Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Switch to MI SCSI and drop old pmax MD SCSI support comp...
details: https://anonhg.NetBSD.org/src/rev/48f41cc086ac
branches: trunk
changeset: 514227:48f41cc086ac
user: simonb <simonb%NetBSD.org@localhost>
date: Sun Aug 26 11:47:18 2001 +0000
description:
Switch to MI SCSI and drop old pmax MD SCSI support completely.
diffstat:
sys/arch/pmax/conf/GENERIC | 35 +-
sys/arch/pmax/conf/INSTALL | 11 +-
sys/arch/pmax/conf/SULACO | 12 +-
sys/arch/pmax/conf/files.pmax | 58 +-
sys/arch/pmax/conf/scsi.pmax | 28 -
sys/arch/pmax/dev/ascreg.h | 343 -----
sys/arch/pmax/dev/device.h | 145 --
sys/arch/pmax/dev/rz.c | 1737 ----------------------------
sys/arch/pmax/dev/scsi.c | 237 ---
sys/arch/pmax/dev/scsi.h | 584 ---------
sys/arch/pmax/dev/sii.c | 140 +-
sys/arch/pmax/dev/sii_ds.c | 17 +-
sys/arch/pmax/dev/siivar.h | 22 +-
sys/arch/pmax/dev/tz.c | 948 ---------------
sys/arch/pmax/include/conf.h | 8 +-
sys/arch/pmax/pmax/autoconf.c | 67 +-
sys/arch/pmax/pmax/conf-glue.c | 232 ---
sys/arch/pmax/pmax/conf.c | 20 +-
sys/arch/pmax/pmax/locore_machdep.S | 6 +-
sys/arch/pmax/tc/asc_ioasic.c | 6 +-
sys/arch/pmax/tc/asc_pmaz.c | 14 +-
sys/dev/tc/asc.c | 2159 -----------------------------------
sys/dev/tc/asc_ioasic.c | 280 ----
sys/dev/tc/asc_tc.c | 180 --
sys/dev/tc/files.tc | 5 +-
25 files changed, 126 insertions(+), 7168 deletions(-)
diffs (truncated from 7937 to 300 lines):
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC Sun Aug 26 11:00:07 2001 +0000
+++ b/sys/arch/pmax/conf/GENERIC Sun Aug 26 11:47:18 2001 +0000
@@ -1,11 +1,11 @@
#
-# $NetBSD: GENERIC,v 1.88 2001/07/08 16:32:23 abs Exp $
+# $NetBSD: GENERIC,v 1.89 2001/08/26 11:47:20 simonb Exp $
#
# Distribution kernel (any model) kernel config file
#
include "arch/pmax/conf/std.pmax"
-#ident "GENERIC-$Revision: 1.88 $"
+#ident "GENERIC-$Revision: 1.89 $"
maxusers 64
@@ -100,6 +100,7 @@
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# NetBSD backwards compatibility
+#options EXEC_ELF_CATCHALL # Older .note-less ELF binaries
#options COMPAT_10 # NetBSD 1.0, (needed for X on 386?)
#options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # Netbsd 1.2 reboot()
@@ -115,6 +116,7 @@
# pmax specific
options COMPAT_ULTRIX # Ultrix compatibility
+#options EXEC_AOUT # Old NetBSD/pmax a.out compatibility
options EXEC_ECOFF # Ultrix RISC binaries are ECOFF format
options "HZ=256" # RTC rate required
@@ -143,7 +145,6 @@
dtop* at ioasic? offset ? # MAXINE kbd and mouse
#fdc at ioasic? offset ? # MAXINE floppy disk (not supported)
asc* at ioasic? offset ? # NCR53C94 SCSI with IOASIC
-#xasc* at ioasic? offset ? # [ MI SCSI version ]
# 3MAX has TURBOchannel but no IOASIC
ibus0 at tc? slot ? offset ? # 3MAX system slot
@@ -161,38 +162,30 @@
#sfbp* at tc? slot ? offset ? # PMAGD HX+ Smart Framebuffer
xcfb* at tc? slot ? offset ? # PMAG-DV Color Framebuffer at MAXINE
asc* at tc? slot ? offset ? # PMAZ-A single channel SCSI
-#xasc* at tc? slot ? offset ? # [ MI SCSI version ]
le* at tc? slot ? offset ? # PMAD-A LANCE
fta* at tc? slot ? offset ? # PMAF-F FDDI
-#tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
-#asc* at tcds? chip ?
+tcds* at tc? slot ? offset ? # PMAZB/PMAZC dual channel SCSI
+asc* at tcds? chip ?
# PMAX and MIPSMATE
ibus0 at mainbus0
pm* at ibus0 addr ? # 3100 onboard fb
le* at ibus0 addr ? # 3100, 5100 onboard LANCE
sii* at ibus0 addr ? # DC7061 onboard SCSI
-#xsii* at ibus0 addr ? # [ MI SCSI version ]
#########################################################################
# SCSI configuration #
#########################################################################
-# old 4.4BSD/pmax DECstation SCSI driver
-oldscsibus* at sii?
-oldscsibus* at asc?
-include "arch/pmax/conf/scsi.pmax"
+scsibus* at sii?
+scsibus* at asc?
-# MI SCSI configuration
-#scsibus* at xsii?
-#scsibus* at xasc?
-#
-#sd* at scsibus? target ? lun ? # SCSI disks
-#st* at scsibus? target ? lun ? # SCSI tapes
-#cd* at scsibus? target ? lun ? # SCSI CD-ROMs
-#ch* at scsibus? target ? lun ? # SCSI changer devices
-#ss* at scsibus? target ? lun ? # SCSI scanners
-#uk* at scsibus? target ? lun ? # unknown SCSI
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+ch* at scsibus? target ? lun ? # SCSI changer devices
+ss* at scsibus? target ? lun ? # SCSI scanners
+uk* at scsibus? target ? lun ? # unknown SCSI
#########################################################################
# Pseudo-devices #
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/conf/INSTALL
--- a/sys/arch/pmax/conf/INSTALL Sun Aug 26 11:00:07 2001 +0000
+++ b/sys/arch/pmax/conf/INSTALL Sun Aug 26 11:47:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.40 2001/07/08 16:32:23 abs Exp $
+# $NetBSD: INSTALL,v 1.41 2001/08/26 11:47:20 simonb Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -130,10 +130,11 @@
# SCSI configuration #
#########################################################################
-# SCSI configuration for old 4.4BSD/pmax DECstation SCSI driver
-oldscsibus* at sii?
-oldscsibus* at asc?
-include "arch/pmax/conf/scsi.pmax"
+scsibus* at sii?
+scsibus* at asc?
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
#########################################################################
# Pseudo-devices #
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/conf/SULACO
--- a/sys/arch/pmax/conf/SULACO Sun Aug 26 11:00:07 2001 +0000
+++ b/sys/arch/pmax/conf/SULACO Sun Aug 26 11:47:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SULACO,v 1.8 2001/07/08 16:32:23 abs Exp $
+# $NetBSD: SULACO,v 1.9 2001/08/26 11:47:20 simonb Exp $
#
# sulaco.nas.nasa.gov - thorpej's DECstation 5000/200
#
@@ -152,10 +152,12 @@
#le* at ibus0 addr ? # 3100 onboard LANCE
#sii* at ibus0 addr ? # DC7061 onboard SCSI
-# XXX Old DECstation SCSI code.
-#oldscsibus* at sii?
-oldscsibus* at asc?
-include "arch/pmax/conf/scsi.pmax"
+# SCSI configuration
+#scsibus* at sii?
+scsibus* at asc?
+sd* at scsibus? target ? lun ? # SCSI disks
+st* at scsibus? target ? lun ? # SCSI tapes
+cd* at scsibus? target ? lun ? # SCSI CD-ROMs
pseudo-device loop 1 # network loopback
#pseudo-device sl 4 # serial-line IP ports
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/conf/files.pmax
--- a/sys/arch/pmax/conf/files.pmax Sun Aug 26 11:00:07 2001 +0000
+++ b/sys/arch/pmax/conf/files.pmax Sun Aug 26 11:47:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.93 2001/08/22 06:59:44 nisimura Exp $
+# $NetBSD: files.pmax,v 1.94 2001/08/26 11:47:20 simonb Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -91,7 +91,6 @@
include "dev/scsipi/files.scsipi"
major { sd = 19 }
major { cd = 25 }
-major { rz = 21 }
# Memory Disk
file dev/md_root.c memory_disk_hooks
@@ -100,52 +99,23 @@
# RAIDframe
major { raid = 32 }
-#
-# Old 4.4BSD pmax-specific SCSI driver (deprecated).
+
+# MI SCSI driver; to be moved into dev/tc/ replacing existings, eventually.
#
-define oldscsi {}
-device oldscsibus {target = -1, drive = -1}
-attach oldscsibus at oldscsi
-file arch/pmax/dev/scsi.c oldscsi
-file arch/pmax/pmax/conf-glue.c oldscsi
-
-# asc: SCSI interface in TC option slot or in IOASIC slot
-device asc: oldscsi
-file dev/tc/asc.c asc needs-flag
-attach asc at ioasic with asc_ioasic
-file dev/tc/asc_ioasic.c asc_ioasic
-attach asc at tc with asc_tc
-file dev/tc/asc_tc.c asc_tc
+device asc: ncr53c9x,scsi
+attach asc at tc with asc_pmaz
+file arch/pmax/tc/asc_pmaz.c asc_pmaz
+attach asc at ioasic with asc_ioasic
+file arch/pmax/tc/asc_ioasic.c asc_ioasic
+attach asc at tcds with asc_tcds
+file dev/tc/asc_tcds.c asc_tcds
# sii: kn01 SCSI interface
-device sii: oldscsi
-device xsii: ncr53c9x,scsi
-file arch/pmax/dev/sii.c sii | xsii needs-flag
-attach sii at ibus with sii_ds
-attach xsii at ibus with xsii_ds
-file arch/pmax/dev/sii_ds.c sii_ds | xsii_ds
-
-device tz: tape
-attach tz at oldscsibus
-file arch/pmax/dev/tz.c tz needs-count
+device sii: ncr53c9x,scsi
+file arch/pmax/dev/sii.c sii needs-flag
+attach sii at ibus with sii_ds
+file arch/pmax/dev/sii_ds.c sii_ds
-device rz: disk
-attach rz at oldscsibus
-file arch/pmax/dev/rz.c rz needs-count
-
-#
-# MI SCSI driver; to be moved into dev/tc/ replacing existings, eventually.
-#
-device xasc: ncr53c9x,scsi
-attach xasc at tc with xasc_pmaz
-file arch/pmax/tc/asc_pmaz.c xasc_pmaz
-attach xasc at ioasic with xasc_ioasic
-file arch/pmax/tc/asc_ioasic.c xasc_ioasic
-
-# XXX waiting on pmax MI scsi being `asc'.
-# 53C[F]90 SCSI
-attach xasc at tcds with asc_tcds
-file dev/tc/asc_tcds.c asc_tcds
# DC7085 (DZ-like four-port serial device) on ibus
device dc: tty
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/conf/scsi.pmax
--- a/sys/arch/pmax/conf/scsi.pmax Sun Aug 26 11:00:07 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# $NetBSD: scsi.pmax,v 1.3 1998/05/08 00:05:19 simonb Exp $
-#
-# SCSI configuration for old DECstation SCSI driver
-# NB: if you change this, you will also need to change conf-glue.c.
-#
-
-# disks and tapes for first ASC or SII
-rz0 at oldscsibus? target ? drive ?
-rz1 at oldscsibus? target ? drive ?
-rz2 at oldscsibus? target ? drive ?
-rz3 at oldscsibus? target ? drive ?
-rz4 at oldscsibus? target ? drive ?
-rz5 at oldscsibus? target ? drive ?
-rz6 at oldscsibus? target ? drive ?
-rz7 at oldscsibus? target ? drive ?
-tz0 at oldscsibus? target ? drive ?
-tz1 at oldscsibus? target ? drive ?
-
-# disks and tapes for a second ASC
-rz8 at oldscsibus? target ? drive ?
-rz9 at oldscsibus? target ? drive ?
-rz10 at oldscsibus? target ? drive ?
-rz11 at oldscsibus? target ? drive ?
-rz12 at oldscsibus? target ? drive ?
-rz13 at oldscsibus? target ? drive ?
-rz14 at oldscsibus? target ? drive ?
-tz2 at oldscsibus? target ? drive ?
-tz3 at oldscsibus? target ? drive ?
diff -r b68a52ef9ea5 -r 48f41cc086ac sys/arch/pmax/dev/ascreg.h
--- a/sys/arch/pmax/dev/ascreg.h Sun Aug 26 11:00:07 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/* $NetBSD: ascreg.h,v 1.9 1999/04/24 08:01:01 simonb Exp $ */
-
-/*-
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell and Rick Macklem.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)ascreg.h 8.1 (Berkeley) 6/10/93
- */
-
Home |
Main Index |
Thread Index |
Old Index