summaryrefslogtreecommitdiff
path: root/sys/arch/vax/conf
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-11-06 20:28:24 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-11-06 20:28:24 +0000
commit32aca6b0a24845980934ceeb3de289b9a0ddbc8d (patch)
tree2ca61c84e06b809f8e7abab5e027ab44ac7ee005 /sys/arch/vax/conf
parent7ecb0539247bd28e20478740d86ace43ef70f717 (diff)
Sync the VS2000 (and some VS3100) MFM controller driver with NetBSD, and
enable it in GENERIC and RAMDISK. Completely untested due to lack of hardware (both my VS3100 are dual-SCSI), but it hopefully can't hurt.
Diffstat (limited to 'sys/arch/vax/conf')
-rw-r--r--sys/arch/vax/conf/GENERIC9
-rw-r--r--sys/arch/vax/conf/RAMDISK9
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 0ee5f498969..67c30fa724b 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.47 2006/08/30 19:29:20 miod Exp $
+# $OpenBSD: GENERIC,v 1.48 2006/11/06 20:28:20 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -61,7 +61,7 @@ le0 at vsbus0 csr 0x200e0000 # LANCE ethernet
ze0 at vsbus0 csr 0x20008000 # SGEC ethernet
dz0 at vsbus0 csr 0x200a0000 # DC-367 DZ-11 lookalike ctlr
dz0 at vsbus0 csr 0x25000000 # VS4000/90 4000/10X MV3100/9X serial
-#hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
+hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
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
@@ -71,7 +71,7 @@ gpx0 at vsbus0 csr 0x3c000000 # VS3100 GPX display option
lcg0 at vsbus0 csr 0x20100000 # VS4000/60 (or VLC) frame buffer
lcspx0 at vsbus0 csr 0x39302000 # VS4000/90 frame buffer
-#hd* at hdc0 drive? # RD5x disks
+hd* at hdc0 drive? # RD5x disks
#ry* at hdc0 drive? # RX floppies
# Ibus, the internal bus on most Microvaxen
@@ -130,9 +130,6 @@ ra* at mscpbus? drive? # MSCP disk
rx* at mscpbus? drive? # MSCP floppy
mt* at mscpbus? drive? # MSCP tape
-# VS2000 builtin MFM controller (HDC9224)
-#hdc0 at vsbus0 # The strange builtin MFM controller
-
# SCSI devices
scsibus* at asc?
scsibus* at ncr?
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index 778a4b3042a..a0b6ae12940 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.27 2006/08/30 19:29:20 miod Exp $
+# $OpenBSD: RAMDISK,v 1.28 2006/11/06 20:28:20 miod Exp $
machine vax # machine type
@@ -69,7 +69,7 @@ le0 at vsbus0 csr 0x200e0000 # LANCE ethernet
ze0 at vsbus0 csr 0x20008000 # SGEC ethernet
dz0 at vsbus0 csr 0x200a0000 # DC-367 DZ-11 lookalike ctlr
dz0 at vsbus0 csr 0x25000000 # VS4000/90 4000/10X MV3100/9X serial
-#hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
+hdc0 at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
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
@@ -79,7 +79,7 @@ gpx0 at vsbus0 csr 0x3c000000 # VS3100 GPX display option
lcg0 at vsbus0 csr 0x20100000 # VS4000/60 (or VLC) frame buffer
lcspx0 at vsbus0 csr 0x39302000 # VS4000/90 frame buffer
-#hd* at hdc0 drive? # RD5x disks
+hd* at hdc0 drive? # RD5x disks
#ry* at hdc0 drive? # RX floppies
# Ibus, the internal bus on most Microvaxen
@@ -138,9 +138,6 @@ ra* at mscpbus? drive? # MSCP disk
rx* at mscpbus? drive? # MSCP floppy
mt* at mscpbus? drive? # MSCP tape
-# VS2000 builtin MFM controller (HDC9224)
-#hdc0 at vsbus0 # The strange builtin MFM controller
-
# SCSI devices
scsibus* at asc?
scsibus* at ncr?