Module Name: src
Committed By: christos
Date: Sun Aug 13 08:48:30 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbmips/conf: LOONGSON
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
Add ALPS pms support
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.463 -r1.464 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.426 -r1.427 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1165 -r1.1166 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.66 src/sys/arch/amd64/conf/ALL:1.67
--- src/sys/arch/amd64/conf/ALL:1.66 Sat Aug 12 02:46:13 2017
+++ src/sys/arch/amd64/conf/ALL Sun Aug 13 04:48:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.66 2017/08/12 06:46:13 maxv Exp $
+# $NetBSD: ALL,v 1.67 2017/08/13 08:48:30 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.66 $"
+#ident "ALL-$Revision: 1.67 $"
maxusers 64 # estimated number of users
@@ -502,6 +502,7 @@ pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
+options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
vga0 at isa?
vga* at pci? dev ? function ?
genfb* at pci? dev ? function ?
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.463 src/sys/arch/amd64/conf/GENERIC:1.464
--- src/sys/arch/amd64/conf/GENERIC:1.463 Fri Aug 4 05:30:19 2017
+++ src/sys/arch/amd64/conf/GENERIC Sun Aug 13 04:48:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.463 2017/08/04 09:30:19 maxv Exp $
+# $NetBSD: GENERIC,v 1.464 2017/08/13 08:48:30 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.463 $"
+#ident "GENERIC-$Revision: 1.464 $"
maxusers 64 # estimated number of users
@@ -394,6 +394,7 @@ pms* at pckbc? # PS/2 mouse for wsmous
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
+options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
vga* at pci? dev ? function ?
genfb* at pci? dev ? function ?
options VCONS_DRAW_INTR
Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.31 src/sys/arch/evbmips/conf/LOONGSON:1.32
--- src/sys/arch/evbmips/conf/LOONGSON:1.31 Thu May 11 03:56:43 2017
+++ src/sys/arch/evbmips/conf/LOONGSON Sun Aug 13 04:48:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.31 2017/05/11 07:56:43 maya Exp $
+# $NetBSD: LOONGSON,v 1.32 2017/08/13 08:48:30 christos Exp $
#
# LOONGSON machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.loongson
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "LOONGSON-$Revision: 1.31 $"
+#ident "LOONGSON-$Revision: 1.32 $"
maxusers 16
@@ -200,8 +200,10 @@ isa0 at pcib?
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
+#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
+options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.426 src/sys/arch/i386/conf/ALL:1.427
--- src/sys/arch/i386/conf/ALL:1.426 Sat Aug 12 02:46:13 2017
+++ src/sys/arch/i386/conf/ALL Sun Aug 13 04:48:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.426 2017/08/12 06:46:13 maxv Exp $
+# $NetBSD: ALL,v 1.427 2017/08/13 08:48:30 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.426 $"
+#ident "ALL-$Revision: 1.427 $"
maxusers 64 # estimated number of users
@@ -574,6 +574,7 @@ pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
+options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1165 src/sys/arch/i386/conf/GENERIC:1.1166
--- src/sys/arch/i386/conf/GENERIC:1.1165 Sat Aug 12 02:46:13 2017
+++ src/sys/arch/i386/conf/GENERIC Sun Aug 13 04:48:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1165 2017/08/12 06:46:13 maxv Exp $
+# $NetBSD: GENERIC,v 1.1166 2017/08/13 08:48:30 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1165 $"
+#ident "GENERIC-$Revision: 1.1166 $"
maxusers 64 # estimated number of users
@@ -536,6 +536,7 @@ pms* at pckbc? # PS/2 mouse for wsmous
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
+options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads
# vga@isa and pcdisplay@isa are disabled; see PR#49290
#vga0 at isa?
vga* at pci? dev ? function ?
