[src/trunk]: src/sys/arch Add ALPS pms support

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb118799cad7
branches:  trunk
changeset: 355764:eb118799cad7
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 13 08:48:30 2017 +0000

description:
Add ALPS pms support

diffstat:

 sys/arch/amd64/conf/ALL        |  5 +++--
 sys/arch/amd64/conf/GENERIC    |  5 +++--
 sys/arch/evbmips/conf/LOONGSON |  6 ++++--
 sys/arch/i386/conf/ALL         |  5 +++--
 sys/arch/i386/conf/GENERIC     |  5 +++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diffs (133 lines):

diff -r d2eda66c87f4 -r eb118799cad7 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sun Aug 13 08:07:52 2017 +0000
+++ b/sys/arch/amd64/conf/ALL   Sun Aug 13 08:48:30 2017 +0000
@@ -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 @@
 
 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 @@
 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 ?
diff -r d2eda66c87f4 -r eb118799cad7 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Aug 13 08:07:52 2017 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Aug 13 08:48:30 2017 +0000
@@ -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 @@
 
 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 @@
 #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
diff -r d2eda66c87f4 -r eb118799cad7 sys/arch/evbmips/conf/LOONGSON
--- a/sys/arch/evbmips/conf/LOONGSON    Sun Aug 13 08:07:52 2017 +0000
+++ b/sys/arch/evbmips/conf/LOONGSON    Sun Aug 13 08:48:30 2017 +0000
@@ -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 @@
 
 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 @@
 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
 
diff -r d2eda66c87f4 -r eb118799cad7 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun Aug 13 08:07:52 2017 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Aug 13 08:48:30 2017 +0000
@@ -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 @@
 
 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 @@
 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
diff -r d2eda66c87f4 -r eb118799cad7 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Aug 13 08:07:52 2017 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Aug 13 08:48:30 2017 +0000
@@ -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 @@
 
 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 @@
 #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 ?