svn commit: r360637 - stable/12/sys/dev/evdev

[Niclas Zeising]

Author: zeising (doc,ports committer)
Date: Mon May  4 18:40:56 2020
New Revision: 360637
URL: https://svnweb.freebsd.org/changeset/base/360637

Log:
  MFC r360126, r360132: Change kern.evdev.rcpt_mask to 12 by default
  
  Original commit messages:
  Change kern.evdev.rcpt_mask from 3 to 12 by default.  This makes us much
  more evdev-friendly, and will prevent everyone using xorg and wayland with
  evdev devices (the default) from needing to change this locally.
  
  powerpc32 still uses the old value for the keyboard part, becaues the adb
  keyboard driver used there is not evdev compatible.
  
  In r360126, I meant to have a different mask only on powerpc, not powerpc64.
  Update the check to check that we're not compiling for powerpc64.
  
  Approved by:	wulf (implicit, mfc)
  Relnotes:	yes
  Differential Revision:	https://reviews.freebsd.org/D24370

Modified:
  stable/12/sys/dev/evdev/evdev.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/evdev/evdev.c
==============================================================================
--- stable/12/sys/dev/evdev/evdev.c	Mon May  4 17:45:04 2020	(r360636)
+++ stable/12/sys/dev/evdev/evdev.c	Mon May  4 18:40:56 2020	(r360637)
@@ -66,7 +66,12 @@ enum evdev_sparse_result
 
 MALLOC_DEFINE(M_EVDEV, "evdev", "evdev memory");
 
-int evdev_rcpt_mask = EVDEV_RCPT_SYSMOUSE | EVDEV_RCPT_KBDMUX;
+/* adb keyboard driver used on powerpc does not support evdev yet */
+#if defined(__powerpc__) && !defined(__powerpc64__)
+int evdev_rcpt_mask = EVDEV_RCPT_KBDMUX | EVDEV_RCPT_HW_MOUSE;
+#else
+int evdev_rcpt_mask = EVDEV_RCPT_HW_MOUSE | EVDEV_RCPT_HW_KBD;
+#endif
 int evdev_sysmouse_t_axis = 0;
 
 SYSCTL_NODE(_kern, OID_AUTO, evdev, CTLFLAG_RW, 0, "Evdev args");