Update supported devices list and add a few words about console selection.

2 files changed, 55 insertions, 26 deletions

diff --git a/distrib/notes/vax/hardware b/distrib/notes/vax/hardware
index ca3bfaa6593..781cf832146 100644
--- a/distrib/notes/vax/hardware
+++ b/distrib/notes/vax/hardware
@@ -1,3 +1,4 @@
+dnl	$OpenBSD: hardware,v 1.18 2006/07/30 13:06:55 miod Exp $
 OpenBSD/MACHINE OSREV runs on a wide variety of VAX hardware.
 The following systems have been tested:
 	- VAXstation 2000
@@ -14,32 +15,46 @@ The following systems have been tested:
 	- MicroVAX 3100/85
 	- MicroVAX 3100/90
 	- MicroVAX 3300
-	- VAX 4000 10{0,5}
+	- VAX 4000 100
+	- VAX 4000 105
+	- VAX 4000 106
 	- VAX 4000 200
 	- VAX 4000 300
-	- VAX 4000 {4,5,6}00
-	- VAX 4000 {5,7}00A
-
-Ethernet devices:
-	- on-board MicroVAX or VAXstation LANCE
-	- DEC SGEC
-
-SCSI:
-	- NCR 5380 or NCR 53C9x on-board SCSI is generally supported
-	- Includes most 3100's and VAXstation 4000's, as well as the
-	  VAX 4000 10X series.
-	
-QBUS:
-	- KFQSA       (MSCP DSSI controller)
-	- Emulex UC08 (MSCP SCSI controller)
-	- CXY08       (DHV-11 emulating serial)
-	- DELQA       (Ethernet)
-
-Serial ports:
-	- DZ*11 lines (also DZ*11 compatible lines on VAXstations)
+	- VAX 4000 {400,500,600}
+	- VAX 4000 {500A,700A}
+
+Supported devices {:-include-:}:
+    * Ethernet devices:
+	- on-board MicroVAX or VAXstation LANCE (le)
+	- DEC SGEC (ze)
+
+    * SCSI controllers:
+	- NCR 5380 (asc) or NCR 53C9x (ncr) on-board SCSI
+	  (this {:-include-:}s most 3100s and VAXstation 4000s, as well
+	   as the VAX 4000 10x series).
+
+    * QBUS devices:
+	- KFQSA       (MSCP DSSI controller) (uda)
+	- Emulex UC08 (MSCP SCSI controller) (uda)
+	- CXY08       (DHV-11 emulating serial) (dhu)
+	- DELQA       (Ethernet) (qe)
+
+    * Serial ports:
+	- DZ*11 lines (also DZ*11 compatible lines on VAXstations) (dz)
+
+    * Frame buffers:
+	- VAXstation 3100 monochrome frame buffer on-board (smg)
+	- VAXstation 3100/{30,38,40,48} color frame buffer option (gpx)
+	- VAXstation 4000/60 and 4000/VLC frame buffer (lcg)
+	- VAXstation 4000/90 color frame buffer (lcspx)
+	The VAXstation 3100/76 spx frame buffer, as well as the spx/spxg
+	option for VAXstation 4000s is not supported yet.
+
+    * Keyboard and mice:
+	- LK201 and LK401 keyboards (lkkbd)
+	- VSxxx mouse (lkms)
 
 The lowest amount of memory tested is 6MB; however, more is recommended.
-At the moment, the only supported console is a serial console.
 
 Currently, your storage options for using OpenBSD/MACHINE are SCSI disks
 or tapes on one of the supported controllers, disks and tapes accessed
diff --git a/distrib/notes/vax/prep b/distrib/notes/vax/prep
index a86587a13f6..7af0176dee0 100644
--- a/distrib/notes/vax/prep
+++ b/distrib/notes/vax/prep
@@ -1,4 +1,18 @@
-VAX machines don't generally need any specific preparation. It's worth
-noting, however, that OpenBSD/MACHINE currently requires a serial console,
-so on systems with graphics support (such as VAXstations), you may have
-to flip a switch in order to yield this behaviour.
+dnl	$OpenBSD: prep,v 1.5 2006/07/30 13:06:55 miod Exp $
+VAX machines don't generally need any specific preparation. You will need
+to properly identify the console port on your machine.
+
+Machines without frame buffers (i.e. everything but VAXstations) use serial
+port 0 as the console port. However, it is possible to select port 3 instead,
+by moving the S3 switch on the back of the machine in the up position. Not
+all models have such a switch, though.
+
+Machines with frame buffers (i.e. VAXstations) have a similar S3 switch,
+and will either use a serial console connected to port 3 (usually labeled
+as the printer port) if the S3 switch is in the up position, and will use
+the keyboard and frame buffer console, if the S3 switch is in the down
+position.
+
+Note that, if the frame buffer in your VAXstation is not supported, OpenBSD
+will use serial port 3 as the console, as if the S3 switch had been in the
+up position.