Update.hwids-20150118

2 files changed, 36 insertions, 15 deletions

diff --git a/udev/60-keyboard.hwdb b/udev/60-keyboard.hwdb
index af0917e..56fbbb1 100644
--- a/udev/60-keyboard.hwdb
+++ b/udev/60-keyboard.hwdb
@@ -800,14 +800,16 @@ keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnGE70*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*:pvr*
  KEYBOARD_KEY_c2=ejectcd
 
-#
+# some MSI models generate ACPI/input events on the LNXVIDEO input devices,
+# plus some extra synthesized ones on atkbd as an echo of actually changing the
+# brightness; so ignore those atkbd ones, to avoid loops
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U-100*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U100*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*N033:*
  KEYBOARD_KEY_f7=reserved
  KEYBOARD_KEY_f8=reserved
 
-#
+# MSI Wind U90/U100 generates separate touchpad on/off keycodes so ignore touchpad toggle keycode
 keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnU90/U100:*
  KEYBOARD_KEY_e4=reserved
 
diff --git a/udev/70-mouse.hwdb b/udev/70-mouse.hwdb
index a7e9eb2..e23e4f6 100644
--- a/udev/70-mouse.hwdb
+++ b/udev/70-mouse.hwdb
@@ -28,6 +28,29 @@
 # mouse:usb:v17efp6019:*
 # mouse:*:name:Lenovo Optical USB Mouse:
 #
+# To add local entries, create a new file
+#   /etc/udev/hwdb.d/71-mouse-local.hwdb
+# and add your rules there. To load the new rules execute (as root):
+#   udevadm hwdb --update
+#   udevadm trigger /dev/input/eventXX
+# where /dev/input/eventXX is the mouse in question. If in
+# doubt, simply use /dev/input/event* to reload all input rules.
+#
+# If your changes are generally applicable, open a bug report on
+#   http://bugs.freedesktop.org/enter_bug.cgi?product=systemd
+# and include your new rules, a description of the device, and the
+# output of
+#   udevadm info /dev/input/eventXX
+# (or /dev/input/event*).
+#
+# Allowed properties are:
+#    MOUSE_DPI
+#    MOUSE_WHEEL_CLICK_ANGLE
+#
+#########################################
+#               MOUSE_DPI               #
+#########################################
+#
 # DPI settings are specified as
 #    MOUSE_DPI=<dpi>[@<frequency>]
 #
@@ -64,20 +87,15 @@
 # third-party software) must not be entered into this file, use a local
 # hwdb instead.
 #
-# To add local entries, create a new file
-#   /etc/udev/hwdb.d/71-mouse-local.hwdb
-# and add your rules there. To load the new rules execute (as root):
-#   udevadm hwdb --update
-#   udevadm trigger /dev/input/eventXX
-# where /dev/input/eventXX is the mouse in question. If in
-# doubt, simply use /dev/input/event* to reload all input rules.
+#########################################
+#       MOUSE_WHEEL_CLICK_ANGLE         #
+#########################################
+#
+# The angle in degrees per mouse wheel 'click', specified as
+#     MOUSE_WHEEL_CLICK_ANGLE=<degrees>
+#
+# Most mice have a 15 degree click stop (24 clicks per full rotation).
 #
-# If your changes are generally applicable, open a bug report on
-#   http://bugs.freedesktop.org/enter_bug.cgi?product=systemd
-# and include your new rules, a description of the device, and the
-# output of
-#   udevadm info /dev/input/eventXX
-# (or /dev/input/event*).
 
 #
 # Sort by by brand, type (usb, bluetooth), DPI, frequency.
@@ -146,6 +164,7 @@ mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
 # Logitech Wireless Mouse M325
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
  MOUSE_DPI=600@166
+ MOUSE_WHEEL_CLICK_ANGLE=20
 
 # Logitech MX1000 Laser Cordless Mouse
 mouse:usb:v046dpc50e:name:Logitech USB RECEIVER: