From f80864671365d9b930beb861ee0c13367d766d17 Mon Sep 17 00:00:00 2001
From: tron <tron@NetBSD.org>
Date: Wed, 21 Jul 1999 20:28:45 +0000
Subject: [PATCH] Use wsmouse protocol for PS/2, Logitech bus and Microsoft
 InPort mice by default. The X11 distribution included in our last release
 already supports it and the wsmouse protocol can be used for any of the above
 and for USB mice.

---
 sys/arch/i386/conf/GENERIC | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e25aed3603fa..e7eab839bef9 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.242 1999/07/20 07:40:35 christos Exp $
+#	$NetBSD: GENERIC,v 1.243 1999/07/21 20:28:45 tron Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -237,17 +237,17 @@ npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor
 pckbc0		at isa?			# pc keyboard controller
 pckbd*		at pckbc?		# PC keyboard
 # "opms" should not be enabled together with "pms" or "pmsi"
-#pms*		at pckbc?		# PS/2 mouse for wsmouse
-#pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
-opms*		at pckbc?		# backwards compatible PS/2 mouse
+pms*		at pckbc?		# PS/2 mouse for wsmouse
+pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
+#opms*		at pckbc?		# backwards compatible PS/2 mouse
 vga0		at isa?
 vga*		at pci?
 pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
 wsdisplay*	at vga? console ?
 wsdisplay*	at pcdisplay? console ?
 wskbd* 		at pckbd? console ?
-#wsmouse*	at pms?
-#wsmouse*	at pmsi?
+wsmouse*	at pms?
+wsmouse*	at pmsi?
 
 pcppi0	at isa?
 sysbeep0	at pcppi?
@@ -584,17 +584,17 @@ midi*	at opl?			# OPL FM synth
 # Mice
 
 # ISA busmice
-#lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-#lms1	at isa? port 0x238 irq 5
-#mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-#mms1	at isa? port 0x238 irq 5
-#wsmouse*	at lms?
-#wsmouse*	at mms?
+lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
+lms1	at isa? port 0x238 irq 5
+mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
+mms1	at isa? port 0x238 irq 5
+wsmouse*	at lms?
+wsmouse*	at mms?
 # backwards compatible versions
-olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-olms1	at isa? port 0x238 irq 5
-omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-omms1	at isa? port 0x238 irq 5
+#olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
+#olms1	at isa? port 0x238 irq 5
+#omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
+#omms1	at isa? port 0x238 irq 5
 #opms0	at pc? irq 12		# PS/2 auxiliary port mouse
 #opms0	at vt? irq 12		# PS/2 auxiliary port mouse