Add hil devices, and enable wsdisplay at sti and wskbd at gsc and hil.

3 files changed, 29 insertions, 38 deletions

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 13d385a6e7c..a3f491d4df3 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.19 2003/01/31 22:50:15 miod Exp $
+#	$OpenBSD: GENERIC,v 1.20 2003/02/11 19:48:15 miod Exp $
 #
 # Diskless kernel config
 #
@@ -68,16 +68,10 @@ option	EISAVERBOSE
 
 # GSC devices
 
-#hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
-#hkbd*	at hil? code 0	# keyboard
-#hilnmi0 at hil? irq 2	# double-break on hil keyboard
-#tb*	at hil? code 1	# graphics tablet
-#hms*	at hil? code 2	# mouse, 3b mouse, 3b trackball, 3b quadrature mouse
-#knob*	at hil? code 3	# knob
-#bbox*	at hil? code 4	# 32 button box
-#dizer*	at hil? code 5	# A & B size digitizers
-#crsr*	at hil? code 6	# cursor for digitizer
-#qbox*	at hil? code 7	# quadrature
+hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
+hilkbd*	at hil?		# keyboard, knob and buttons
+#hilms*	at hil?		# mouse and tablets
+#hilid*	at hil?		# ID module
 
 #medusa* at gsc? irq 4	# FDDI
 
@@ -99,9 +93,8 @@ scsibus* at osiop?
 #audio*	at aone?
 harmony* at gsc? irq 13	# Audio Type 2 (CS4215/AD1849)
 audio*	at harmony?
-#gsckbc*	at gsc? irq 26
-#gsckbd*	at gsckbc?	# PS/2 keyboard
-#wskbd*	at gsckbd?
+gsckbc*	at gsc? irq 26
+gsckbd*	at gsckbc?	# PS/2 keyboard
 #gscms*	at gsckbc?	# PS/2 mouse
 #fdc*	at gsc?		# PC floppy controller (WD37C65C)
 #option	FD_DEBUG
@@ -124,8 +117,9 @@ audio*	at harmony?
 
 # MI devices
 #wsdisplay*	at vgafb?
-#wsdisplay*	at sti?
-#wskbd*		at hkbd?
+wsdisplay*	at sti?
+wskbd*		at gsckbd?
+wskbd*		at hilkbd?
 #wsmouse*	at gscms?
 #wsmouse*	at hms?
 
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 56eaf1cf6fb..ed9787ab04f 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.7 2003/01/31 22:56:01 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.8 2003/02/11 19:48:15 miod Exp $
 #
 # Diskless kernel config
 #
@@ -70,16 +70,10 @@ option	EISAVERBOSE
 
 # GSC devices
 
-#hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
-#hkbd*	at hil? code 0	# keyboard
-#hilnmi0 at hil? irq 2	# double-break on hil keyboard
-#tb*	at hil? code 1	# graphics tablet
-#hms*	at hil? code 2	# mouse, 3b mouse, 3b trackball, 3b quadrature mouse
-#knob*	at hil? code 3	# knob
-#bbox*	at hil? code 4	# 32 button box
-#dizer*	at hil? code 5	# A & B size digitizers
-#crsr*	at hil? code 6	# cursor for digitizer
-#qbox*	at hil? code 7	# quadrature
+hil*	at gsc? irq 1	# Human Interface Loop, kbd and mouse
+hilkbd*	at hil?		# keyboard, knob and buttons
+#hilms*	at hil?		# mouse and tablets
+#hilid*	at hil?		# ID module
 
 #medusa* at gsc? irq 4	# FDDI
 
@@ -101,9 +95,8 @@ scsibus* at osiop?
 #audio*	at aone?
 #harmony* at gsc? irq 13	# Audio Type 2 (CS4215/AD1849)
 #audio*	at harmony?
-#gsckbc*	at gsc? irq 26
-#gsckbd*	at gsckbc?	# PS/2 keyboard
-#wskbd*	at gsckbd?
+gsckbc*	at gsc? irq 26
+gsckbd*	at gsckbc?	# PS/2 keyboard
 #fdc*	at gsc?		# PC floppy controller (WD37C65C)
 #option	FD_DEBUG
 
@@ -125,10 +118,10 @@ scsibus* at osiop?
 
 # MI devices
 #wsdisplay*	at vgafb?
-#wsdisplay*	at sti?
-#wskbd*		at pckbd?
-#wskbd*		at hkbd?
-#wsmouse*	at pms?
+wsdisplay*	at sti?
+wskbd*		at gsckbd?
+wskbd*		at hilkbd?
+#wsmouse*	at gscms?
 #wsmouse*	at hms?
 
 #fd*	at fdc?	drive ?	# floppy drives
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index 0f02414341e..ce9c2067b3d 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.40 2003/02/01 21:32:30 miod Exp $
+#	$OpenBSD: files.hppa,v 1.41 2003/02/11 19:48:15 miod Exp $
 #
 # hppa-specific configuration info
 
@@ -52,6 +52,11 @@ include "dev/eisa/files.eisa"
 include "dev/pci/files.pci"
 
 #
+# HIL Human Interface Loop devices
+#
+include "dev/hil/files.hil"
+
+#
 # Gonzo System Connect Bus
 #	(GSC, GSC-1X, GSC+, GSC-1.5X, GSC-2X)
 #
@@ -149,9 +154,8 @@ file	arch/hppa/gsc/if_ie_gsc.c	ie_gsc
 attach	osiop at gsc with osiop_gsc
 file	arch/hppa/gsc/osiop_gsc.c	osiop_gsc
 
-device	hil: tty
-attach	hil at gsc
-file	arch/hppa/gsc/hil.c		hil
+attach	hil at gsc with hil_gsc
+file	arch/hppa/gsc/hil_gsc.c		hil_gsc
 
 # PSB 2160-N based 8bit mono audio (705, 710, 745i/*, 747i/*)
 device	aone: audio, mulaw, auconv