From 88df2ce1522c1891eeaf62a8c735602177caeb41 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Mon, 17 Feb 2003 23:07:44 +0000
Subject: Allow the generic ps/2 mouse driver, pms, to attach to gsckbc as
 well. Thankfully HP's ps/2 mouse have no specific behaviour.

---
 sys/arch/hppa/conf/GENERIC    |  6 +++---
 sys/arch/hppa/conf/RAMDISK    |  4 +---
 sys/arch/hppa/conf/files.hppa | 11 ++++++-----
 sys/conf/files                |  5 ++++-
 sys/dev/pckbc/files.pckbc     |  4 ++--
 5 files changed, 16 insertions(+), 14 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
diff --git a/sys/conf/files b/sys/conf/files
index 1dbb8e28dfd..30ba3f5f8ef 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.267 2003/01/21 16:59:23 markus Exp $
+#	$OpenBSD: files,v 1.268 2003/02/17 23:07:43 miod Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -251,6 +251,9 @@ file	dev/ic/com.c		com & (com_isa | com_isapnp | com_commulti | com_pcmcia | com
 device	pckbc { [slot = -1] }
 file	dev/ic/pckbc.c		pckbc needs-flag
 
+# HPPA PS/2 input ports (forward definition)
+device	gsckbc { [slot = -1] }
+
 # OPL2/OPL3 FM synth driver
 device	opl: midibus, midisyn
 file	dev/ic/opl.c			opl
diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc
index 4292b296b95..0728e721278 100644
--- a/sys/dev/pckbc/files.pckbc
+++ b/sys/dev/pckbc/files.pckbc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pckbc,v 1.2 2001/04/14 00:03:27 fgsch Exp $
+# $OpenBSD: files.pckbc,v 1.3 2003/02/17 23:07:43 miod Exp $
 # $NetBSD: files.pckbc,v 1.6 1999/01/23 16:05:56 drochner Exp $
 # devices attached at pckbc, for use with wscons
 
@@ -8,7 +8,7 @@ file	dev/pckbc/pckbd.c		pckbd	needs-flag
 file	dev/pckbc/wskbdmap_mfii.c		pckbd
 
 device  pms: wsmousedev
-attach  pms at pckbc
+attach  pms at pckbc, gsckbc
 file    dev/pckbc/psm.c            pms
 
 device  pmsi: wsmousedev
-- 
cgit v1.2.3