summaryrefslogtreecommitdiff
path: root/sys/arch/vax/conf
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-07-24 20:35:09 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-07-24 20:35:09 +0000
commitd4567ce267be20d900513e1d0fd2f179dc7bd3b8 (patch)
tree15fb0c7805e7c816f8fd8aef698a561b52988abb /sys/arch/vax/conf
parentb8b1809bfab62d1f228d3281549039c26171d76a (diff)
Add a wsdisplay driver for the frame buffer found on VS4000/60 and VLC
systems, based on Blaz Antonic's work and adjusted to fit modern wscons requirements; currently running as a dumb frame buffer, acceleration code going in soon.
Diffstat (limited to 'sys/arch/vax/conf')
-rw-r--r--sys/arch/vax/conf/GENERIC16
-rw-r--r--sys/arch/vax/conf/files.vax18
2 files changed, 21 insertions, 13 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 0d4c9c45f9e..989174509b5 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.41 2006/07/20 19:15:34 miod Exp $
+# $OpenBSD: GENERIC,v 1.42 2006/07/24 20:35:06 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -68,8 +68,9 @@ ncr0 at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr
ncr1 at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
asc0 at vsbus0 csr 0x200c0080 # VS4000/60 (or VLC) SCSI-ctlr
asc0 at vsbus0 csr 0x26000080 # VS4000/90 4000/10X MV3100/9X SCSI
-smg0 at vsbus0 csr 0x200f0000 # Small monochrome display ctlr.
-#clr0 at vsbus0 csr 0x30000000 # 4- or 8-bitplans color graphics
+smg0 at vsbus0 csr 0x200f0000 # VS3100 on-board mono frame buffer
+#gpx0 at vsbus0 csr 0x3c000000 # VS3100 GPX display option
+lcg0 at vsbus0 csr 0x20100000 # VS4000/60 (or VLC) frame buffer
#hd* at hdc0 drive? # RD5x disks
#ry* at hdc0 drive? # RX floppies
@@ -142,11 +143,12 @@ ses* at scsibus?
uk* at scsibus?
# Workstation console
-wsdisplay0 at smg?
+wsdisplay* at smg?
+#wsdisplay* at gpx?
+wsdisplay* at lcg?
-#wsdisplay0 at clr0
-#wsdisplay0 at qd0
-#wsdisplay0 at qv0
+#wsdisplay* at qd0
+#wsdisplay* at qv0
lkkbd0 at dz0 line 0
wskbd* at lkkbd?
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 68e5a365e26..18a3f143282 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: files.vax,v 1.36 2006/07/23 19:17:21 miod Exp $
+# $OpenBSD: files.vax,v 1.37 2006/07/24 20:35:06 miod Exp $
# $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
#
# new style config file for vax architecture
@@ -157,11 +157,21 @@ file arch/vax/vsa/ncr.c ncr needs-flag
attach le at vsbus with le_vsbus
file arch/vax/vsa/if_le_vsbus.c le_vsbus
-# Monochrome framebuffer on VS3100.
+# Monochrome (on-board) framebuffer on VS3100
device smg: wsemuldisplaydev, rasops1
attach smg at vsbus
file arch/vax/vsa/smg.c smg needs-flag
+# GPX framebuffer on VS3100
+device gpx: wsemuldisplaydev, rasops8
+attach gpx at vsbus
+file arch/vax/vsa/gpx.c gpx needs-flag
+
+# LCG framebuffer on KA46/KA48
+device lcg: wsemuldisplaydev, rasops8
+attach lcg at vsbus
+file arch/vax/vsa/lcg.c lcg needs-flag
+
device lkkbd: wskbddev
attach lkkbd at dz with dzkbd
file arch/vax/dec/dzkbd.c dzkbd needs-flag
@@ -170,10 +180,6 @@ device lkms: wsmousedev
attach lkms at dz with dzms
file arch/vax/dec/dzms.c dzms needs-flag
-#device lkc: qfont
-#attach lkc at dz
-#file arch/vax/vsa/lkc.c lkc needs-flag
-
# These devices aren't tested (or even compiled!)
# They are just included here to make some files happy ;)
#