summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-02-17 23:07:44 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-02-17 23:07:44 +0000
commit88df2ce1522c1891eeaf62a8c735602177caeb41 (patch)
tree446a3dc6c9899ef50c47bf239ab82eb976dc5bc1 /sys/arch/hppa
parent137a0f31e269263744dfab2e91fc44774923a5bf (diff)
Allow the generic ps/2 mouse driver, pms, to attach to gsckbc as well.
Thankfully HP's ps/2 mouse have no specific behaviour.
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/conf/GENERIC6
-rw-r--r--sys/arch/hppa/conf/RAMDISK4
-rw-r--r--sys/arch/hppa/conf/files.hppa11
3 files changed, 10 insertions, 11 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 904608457a8..e626eace405 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.26 2003/02/15 23:50:00 miod Exp $
+# $OpenBSD: GENERIC,v 1.27 2003/02/17 23:07:40 miod Exp $
#
# Diskless kernel config
#
@@ -95,7 +95,7 @@ harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849)
audio* at harmony?
gsckbc* at gsc? irq 26
gsckbd* at gsckbc? # PS/2 keyboard
-#gscms* at gsckbc? # PS/2 mouse
+pms* at gsckbc? # PS/2 mouse
#fdc* at gsc? # PC floppy controller (WD37C65C)
#option FD_DEBUG
@@ -120,7 +120,7 @@ gsckbd* at gsckbc? # PS/2 keyboard
wsdisplay* at sti?
wskbd* at gsckbd? mux 1
wskbd* at hilkbd? mux 1
-#wsmouse* at gscms? mux 0
+wsmouse* at pms? mux 0
wsmouse* at hilms? mux 0
#fd* at fdc? drive ? # floppy drives
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 8d1a41c0a16..35b67a002b7 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.11 2003/02/15 23:45:50 miod Exp $
+# $OpenBSD: RAMDISK,v 1.12 2003/02/17 23:07:40 miod Exp $
#
# Diskless kernel config
#
@@ -121,8 +121,6 @@ gsckbd* at gsckbc? # PS/2 keyboard
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 65239d0c9fe..653b706cc0d 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa,v 1.43 2003/02/12 22:17:18 mickey Exp $
+# $OpenBSD: files.hppa,v 1.44 2003/02/17 23:07:40 miod Exp $
#
# hppa-specific configuration info
@@ -203,18 +203,19 @@ file arch/hppa/gsc/com_harmony.c com_harmony
#attach myri at pci
#file dev/pci/myri.c myri
-device gsckbc { [slot = -1] }
+# PS/2 input ports
+#device gsckbc { [slot = -1] }
attach gsckbc at gsc
file arch/hppa/gsc/gsckbc.c gsckbc
+# PS/2 keyboard
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
+# PS/2 mouse
+include "dev/pckbc/files.pckbc"
#
# Compatibility