summaryrefslogtreecommitdiff
path: root/sys/arch/hppa/conf
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-01-31 22:50:20 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-01-31 22:50:20 +0000
commit06cc3bda31bd3d5f24d4ca8606317cf1ae361230 (patch)
tree3bd75b44de4c04b9c978382b04502970d240488f /sys/arch/hppa/conf
parent588475d783a52d61a2bf8807a16cbba243f246d1 (diff)
Enter gsckbc, a driver for the ps/2-like input device ports found on many
hppa machines, and gsckbd, a driver for the ps/2-like keyboard. Both are derived from pckbc and pckbd, but the differences in port wiring and keyboard behaviour prevented the creation of a thin pckbc wrapper. Currently, only us and uk keyboard layouts are provided. The adventurous person can enable gsckb[cd], wsdisplay at sti and wskbd, but this will only work correctly on machines featuring a modern-prom sti graphics device, and a ps/2 keyboard port.
Diffstat (limited to 'sys/arch/hppa/conf')
-rw-r--r--sys/arch/hppa/conf/GENERIC12
-rw-r--r--sys/arch/hppa/conf/files.hppa18
2 files changed, 19 insertions, 11 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 393a93f7647..13d385a6e7c 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.18 2003/01/26 23:56:10 jason Exp $
+# $OpenBSD: GENERIC,v 1.19 2003/01/31 22:50:15 miod Exp $
#
# Diskless kernel config
#
@@ -99,9 +99,10 @@ scsibus* at osiop?
#audio* at aone?
harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849)
audio* at harmony?
-#pckbc* at gsc? irq 26
-#pckbd* at pckbc? # PS/2 keyboard
-#pms* at pckbc? # PS/2 mouse
+#gsckbc* at gsc? irq 26
+#gsckbd* at gsckbc? # PS/2 keyboard
+#wskbd* at gsckbd?
+#gscms* at gsckbc? # PS/2 mouse
#fdc* at gsc? # PC floppy controller (WD37C65C)
#option FD_DEBUG
@@ -124,9 +125,8 @@ audio* at harmony?
# MI devices
#wsdisplay* at vgafb?
#wsdisplay* at sti?
-#wskbd* at pckbd?
#wskbd* at hkbd?
-#wsmouse* at pms?
+#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 653b666378f..710e6f7b925 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa,v 1.38 2003/01/08 05:20:35 mickey Exp $
+# $OpenBSD: files.hppa,v 1.39 2003/01/31 22:50:16 miod Exp $
#
# hppa-specific configuration info
@@ -188,10 +188,18 @@ file arch/hppa/gsc/com_harmony.c com_harmony
#attach myri at pci
#file dev/pci/myri.c myri
-device ps2p: wskbddev, wsmousedev
-attach ps2p at gsc
-file arch/hppa/gsc/ps2p.c ps2p needs-flag
-file arch/hppa/gsc/ps2kbd_map.c ps2p
+device gsckbc {}
+attach gsckbc at gsc
+file arch/hppa/gsc/gsckbc.c gsckbc
+
+device gsckbd: wskbddev
+attach gsckbd at gsckbc
+file arch/hppa/gsc/gsckbd.c gsckbd needs-flag
+file arch/hppa/gsc/gsckbdmap.c gsckbd
+
+#device gscms: wsmousedev
+#attach gscms at gsckbc
+#file arch/hppa/gsc/gscms.c gscms needs-flag
#
# Compatibility