[src/netbsd-1-6]: src/sys/arch/vax/conf pullup-1-6 ticket #203:

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

details:   https://anonhg.NetBSD.org/src/rev/f355bbe06fa0
branches:  netbsd-1-6
changeset: 527796:f355bbe06fa0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 07 19:34:49 2002 +0000

description:
pullup-1-6 ticket #203:

syssrc/sys/arch/vax/conf/GENERIC 1.98
syssrc/sys/arch/vax/conf/INSTALL 1.27

Original log message:

Change the uba devices from "xx0" to "xx*". Even if they have an exact
csr there may be multiple uba's in a machine and therefore multiple
matches for devices.

diffstat:

 sys/arch/vax/conf/GENERIC |  22 +++++++++++-----------
 sys/arch/vax/conf/INSTALL |  22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diffs (106 lines):

diff -r f469fc38db95 -r f355bbe06fa0 sys/arch/vax/conf/GENERIC
--- a/sys/arch/vax/conf/GENERIC Fri Jun 07 19:32:42 2002 +0000
+++ b/sys/arch/vax/conf/GENERIC Fri Jun 07 19:34:49 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97 2002/04/25 15:06:39 atatat Exp $
+# $NetBSD: GENERIC,v 1.97.4.1 2002/06/07 19:34:49 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.97 $"
+#ident                 "GENERIC-$Revision: 1.97.4.1 $"
 
 # Here are all different supported CPU types listed.
 #options       VAX8800         # VAX 8500, 8530, 8550, 8700, 8800
@@ -203,18 +203,18 @@
 hp*            at mba? drive?          # RM/RP disk drives
 
 # Devices on Unibus/Qbus adapters
-uda0           at uba? csr 0172150     # UDA50/RQDX?
-uda1           at uba? csr 0160334
-mtc0           at uba? csr 0174500     # Tape MSCP ctlr
+uda*           at uba? csr 0172150     # UDA50/RQDX?
+uda*           at uba? csr 0160334
+mtc*           at uba? csr 0174500     # Tape MSCP ctlr
 #ts0           at uba? csr 0172520     # TS11/TSV05 tape.
 #qd0           at uba? csr 0177400     # 4- or 8-bitplans color graphics
 #qv0           at uba? csr 0177400     # Monochrome graphics
-de0            at uba? csr 0174510     # DELUA/DEUNA
-qe0            at uba? csr 0174440     # DEQNA/DELQA
-dhu0           at uba? csr 0160440     # DHU-11
-dz0            at uba? csr 0160100     # DZ-11
-dl0            at uba? csr 0176500     # DL-11
-rlc0           at uba? csr 0174400     # RL11/RLV11 controller
+de*            at uba? csr 0174510     # DELUA/DEUNA
+qe*            at uba? csr 0174440     # DEQNA/DELQA
+dhu*           at uba? csr 0160440     # DHU-11
+dz*            at uba? csr 0160100     # DZ-11
+dl*            at uba? csr 0176500     # DL-11
+rlc*           at uba? csr 0174400     # RL11/RLV11 controller
 rl*            at rlc? drive?          # RL01/RL02 disk drive
 
 # MSCP devices
diff -r f469fc38db95 -r f355bbe06fa0 sys/arch/vax/conf/INSTALL
--- a/sys/arch/vax/conf/INSTALL Fri Jun 07 19:32:42 2002 +0000
+++ b/sys/arch/vax/conf/INSTALL Fri Jun 07 19:34:49 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.26 2002/04/25 15:06:39 atatat Exp $
+#      $NetBSD: INSTALL,v 1.26.4.1 2002/06/07 19:34:50 thorpej Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -143,12 +143,12 @@
 #asc0          at ibus?        # VAX 4000/105A SCSI ctlr
 
 # Disk controllers at Unibus
-uda0           at uba? csr 0172150     # UDA50/RQDX?
-uda1           at uba? csr 0160334
+uda*           at uba? csr 0172150     # UDA50/RQDX?
+uda*           at uba? csr 0160334
 mscpbus*       at uda?
 
 # Tape drivers
-mtc0           at uba? csr 0174500     # Tape MSCP ctlr
+mtc*           at uba? csr 0174500     # Tape MSCP ctlr
 mscpbus*       at mtc?
 
 # MSCP devices
@@ -157,7 +157,7 @@
 mt*            at mscpbus? drive?      # MSCP tape
 
 # Unibus tapes
-#ts0           at uba? csr 0172520     # TS11/TSV05 tape.
+#ts*           at uba? csr 0172520     # TS11/TSV05 tape.
 
 # VS2000 builtin MFM controller (HDC9224)
 hdc0           at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
@@ -180,19 +180,19 @@
 #uk*           at scsibus? target? lun?
 
 # Ethernet cards
-de0            at uba? csr 0174510     # DELUA/DEUNA
-qe0            at uba? csr 0174440     # DEQNA/DELQA
-qe1            at uba? csr 0174460     # DEQNA/DELQA
+de*            at uba? csr 0174510     # DELUA/DEUNA
+qe*            at uba? csr 0174440     # DEQNA/DELQA
+qe*            at uba? csr 0174460     # DEQNA/DELQA
 le0            at vsbus0 csr 0x200e0000# LANCE
 ze0            at vsbus0 csr 0x20008000# SGEC ethernet
 ze0            at ibus0                # SGEC on-board ethernet
 
 # Terminal lines
-dhu0           at uba? csr 0160440     # DHU-11
-dz0            at uba? csr 0160100     # DZ-11
+dhu*           at uba? csr 0160440     # DHU-11
+dz*            at uba? csr 0160100     # DZ-11
 dz0            at vsbus0 csr 0x200a0000# DC-367
 dz0            at vsbus0 csr 0x25000000# VS4000/90 and VAX 4000/10x serial lines
-dl0            at uba? csr 0176500     # DL-11
+dl*            at uba? csr 0176500     # DL-11
 
 # VAXstation graphics support
 #qd0           at uba? csr 0177400