configure vga console, keyboard and mouse once again. support coming soon.

2 files changed, 24 insertions, 31 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 5d6d2ef6a3c..20a5027b667 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.56 2000/11/08 16:21:38 art Exp $
+#	$OpenBSD: GENERIC,v 1.57 2000/11/16 04:30:01 ericj Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -8,8 +8,6 @@ machine	alpha
 include "../../../conf/GENERIC"
 maxusers	8
 
-option		PMAP_NEW
-option		UVM
 # CPU Support
 option		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 option		DEC_3000_300	# Pelican etc:	3000/300*
@@ -20,6 +18,9 @@ option		DEC_EB164	# EB164:	AlphaPC 164
 option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 option		DEC_550		# Miata:	Digital Personal Workstation
 
+option		PMAP_NEW
+option		UVM
+
 option		COMPAT_OSF1	# OSF/1 binary compatibility
 
 # Disklabel compatibility options
@@ -83,7 +84,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
-#vga*	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
@@ -110,13 +111,13 @@ isa*	at	sio?
 mcclock* at	isa? port 0x70
 #pcppi*	at	isa?				# PC prog. periph. interface
 #spkr0	at	pcppi?
-#pckbc*	at	isa?				# PC keyboard controller
-#pckbd*	at	pckbc?				# PC keyboard (kbd port)
-#pms*	at	pckbc?				# PS/2-style mouse (aux port)
+pckbc*	at	isa?				# PC keyboard controller
+pckbd*	at	pckbc?				# PC keyboard (kbd port)
+pms*	at	pckbc?				# 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
+vga*	at	isa?				# ISA (EISA: XXX) VGA
 we0	at	isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
 we1	at	isa? port 0x300 iomem 0xcc000 irq 10	#
 ec0	at	isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
@@ -164,11 +165,11 @@ uk*	at	scsibus? target ? lun ?
 
 # Workstation Console attachments
 #wsdisplay*	at	cfb?
-#wsdisplay*	at	vga?
+wsdisplay*	at	vga?
 #wsdisplay*	at	sfb?
 wsdisplay*	at	tga?
-#wskbd*		at	pckbd?
-#wsmouse*	at	pms?
+wskbd*		at	pckbd?
+wsmouse*	at	pms?
 
 # for IPv6
 pseudo-device	gif		4
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 0184c6a13c4..0686e1e721b 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.35 2000/11/08 16:01:07 art Exp $
+#	$OpenBSD: files.alpha,v 1.36 2000/11/16 04:30:01 ericj Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -11,7 +11,7 @@ maxusers 2 8 64
 # this loses, but there's no way to define attributes which have attributes
 define	alpha_shared_intr
 file	arch/alpha/dev/shared_intr.c	alpha_shared_intr | dec_eb164 |
-					dec_kn20aa
+					dec_kn20aa | dec_550
 
 define	alpha_sgmap
 file	arch/alpha/common/sgmap_common.c alpha_sgmap | dec_3000_500
@@ -49,7 +49,7 @@ file	arch/alpha/alpha/rd_root.c	ramdisk_hooks
 major { rd = 6 }
 
 #
-# "wprkstation cpnsole" routines
+# "workstation console" routines
 #
 
 include "dev/wscons/files.wscons"
@@ -123,30 +123,22 @@ include "dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
 include "dev/isa/files.isa"
 major { wd = 0 }
 
-#file	arch/alpha/isa/isafcns_jensen.c	dec_2000_300
-
-
 #
 # ISA Bus devices
 #
 
-#device	ibus at mainbus { }
-#device	jcombo at ibus: isabus
-#device	jeisa at ibus: eisabus
-
 file	arch/alpha/isa/isa_machdep.c	isa
 
-device	pckbc { }
-attach	pckbc at isa
-file	arch/alpha/isa/pckbc.c		pckbc
+# ISA PC keyboard controller
 
-device	pckbd
-attach	pckbd at pckbc
-file	arch/alpha/isa/pckbd.c		pckbd
+# PC-like keyboard controller
+device  pckbc { [slot = -1] }
+file	dev/ic/pckbc.c			pckbc	needs-flag
 
-device	pms
-attach	pms at pckbc
-file	arch/alpha/isa/pms.c		pms
+attach	pckbc at isa with pckbc_isa
+file	dev/isa/pckbc_isa.c		pckbc	needs-flag
+
+include "dev/pckbc/files.pckbc"
 
 # National Semiconductor DS8390/WD83C690-based boards
 # (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
@@ -199,7 +191,6 @@ file	arch/alpha/pci/cia_bus_mem.c	cia
 file	arch/alpha/pci/cia_bwx_bus_io.c	cia
 file	arch/alpha/pci/cia_bwx_bus_mem.c	cia
 
-
 file	arch/alpha/pci/pci_2100_a50.c	dec_2100_a50
 file	arch/alpha/pci/pci_axppci_33.c	dec_axppci_33
 file	arch/alpha/pci/pci_eb164.c	dec_eb164
@@ -288,6 +279,7 @@ file	arch/alpha/alpha/dec_eb164.c		dec_eb164	needs-flag
 file	arch/alpha/alpha/dec_kn20aa.c		dec_kn20aa	needs-flag
 file	arch/alpha/alpha/dec_550.c		dec_550		needs-flag
 
+
 # OSF/1 Binary Compatibility (COMPAT_OSF1)
 include "compat/osf1/files.osf1"
 file	arch/alpha/alpha/osf1_locore.s		compat_osf1