Sync with NetBSD 961207

1 files changed, 20 insertions, 18 deletions

diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 115116e2ad4..889529aee36 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,5 +1,5 @@
-#	$OpenBSD: RAMDISK,v 1.1 1996/10/30 22:38:44 niklas Exp $
-#	$NetBSD: RAMDISK,v 1.4 1996/10/03 20:47:19 cgd Exp $
+#	$OpenBSD: RAMDISK,v 1.2 1997/01/24 19:57:02 niklas Exp $
+#	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 
@@ -13,6 +13,7 @@ options		DEC_3000_300	# Pelican etc:	3000/300*
 options		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
 options		DEC_KN20AA	# KN20AA:	AlphaStation 600
 options		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
+options		DEC_EB164	# EB164:	AlphaPC 164
 #options	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 
 # Enable the hooks used for initializing the ram-disk.
@@ -24,7 +25,6 @@ options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
@@ -76,8 +76,8 @@ tcasic*	at	mainbus0
 tc*	at	tcasic?
 
 # TurboChannel devices
-ioasic0	at	tc? slot ? offset ?
-mcclock0 at	ioasic? offset ?
+ioasic*	at	tc? slot ? offset ?
+mcclock* at	ioasic? offset ?
 le*	at	ioasic? offset ?
 scc0	at	ioasic? offset ?
 scc1	at	ioasic? offset ?
@@ -109,7 +109,7 @@ fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI cards
 le*	at	pci? dev ? function ?		# PCI LANCE Ethernet (untested)
 ncr*	at	pci? dev ? function ?		# NCR 53c8xx SCSI
 pceb*	at	pci? dev ? function ?		# Intel PCI-EISA brige
-pcivga*	at	pci? dev ? function ?		# PCI VGA graphics
+vga*	at	pci? dev ? function ?		# PCI VGA graphics
 ppb*	at	pci? dev ? function ?		# PCI-PCI bridges
 sio*	at	pci? dev ? function ?		# Intel PCI-ISA bridge
 tga*	at	pci? dev ? function ?		# DEC ZLXp-E[123] graphics
@@ -120,13 +120,15 @@ eisa*	at	pceb?
 isa*	at	sio?
 
 # ISA devices
-mcclock0 at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
+mcclock* at	isa? port 0x70
+pcppi*	at	isa?				# PC prog. periph. interface
+pckbd*	at	pcppi?				# PC keyboard (kbd port)
+pms*	at	pcppi?				# PS/2-style mouse (aux port)
+com*	at	isa? port 0x3f8 irq 4		# standard serial ports
+com*	at	isa? port 0x2f8 irq 3
+lpt*	at	isa? port 0x3bc irq 7		# standard parallel port
+vga*	at	isa?				# ISA (EISA: XXX) VGA
+#wss*	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 
 # EISA devices
 fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
@@ -136,19 +138,19 @@ scsibus* at	esp?
 scsibus* at	ncr?
 
 # SCSI devices
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
+cd*	at	scsibus? target ? lun ?		# SCSI CD-ROM drives
+sd*	at	scsibus? target ? lun ?		# SCSI disk drives
+st*	at	scsibus? target ? lun ?		# SCSI tape drives
 
 # Workstation Console attachments
 wscons*	at	cfb?
-wscons*	at	pcivga?
+wscons*	at	vga?
 wscons*	at	sfb?
 wscons*	at	tga?
 
 pseudo-device	bpfilter	16
 pseudo-device	loop
 pseudo-device	pty		64
+pseudo-device	rd		1
 pseudo-device	sl		4
 pseudo-device	vnd		4
-pseudo-device	rd		1