diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | hwdb/60-sensor.hwdb | 45 | ||||
| -rwxr-xr-x | hwdb/parse_hwdb.py | 14 | ||||
| -rw-r--r-- | rules/60-sensor.rules | 10 |
4 files changed, 67 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9bc18d39d6..a4e7e56067 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3741,6 +3741,7 @@ dist_udevrules_DATA += \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ + rules/60-sensor.rules \ rules/60-serial.rules \ rules/64-btrfs.rules \ rules/70-mouse.rules \ @@ -3910,6 +3911,7 @@ dist_udevhwdb_DATA = \ hwdb/20-net-ifname.hwdb \ hwdb/60-evdev.hwdb \ hwdb/60-keyboard.hwdb \ + hwdb/60-sensor.hwdb \ hwdb/70-mouse.hwdb \ hwdb/70-pointingstick.hwdb \ hwdb/70-touchpad.hwdb diff --git a/hwdb/60-sensor.hwdb b/hwdb/60-sensor.hwdb new file mode 100644 index 0000000000..3160cf77e8 --- /dev/null +++ b/hwdb/60-sensor.hwdb @@ -0,0 +1,45 @@ +# This file is part of systemd. +# +# The lookup keys are composed in: +# 60-sensor.rules +# +# Note: The format of the "sensor:" prefix match key is a +# contract between the rules file and the hardware data, it might +# change in later revisions to support more or better matches, it +# is not necessarily expected to be a stable ABI. +# +# Match string formats: +# sensor:modalias:<parent device modalias>:dmi:<dmi string> +# +# To add local entries, create a new file +# /etc/udev/hwdb.d/61-sensor-local.hwdb +# and add your rules there. To load the new rules execute (as root): +# systemd-hwdb update +# udevadm trigger `dirname $(udevadm info -n "/dev/iio:deviceXXX" -q path)` +# where /dev/iio:deviceXXX is the device in question. +# +# If your changes are generally applicable, preferably send them as a pull +# request to +# https://github.com/systemd/systemd +# or create a bug report on https://github.com/systemd/systemd/issues and +# include your new rules, a description of the device, and the output of +# udevadm info --export-db +# +# Allowed properties are: +# ACCEL_MOUNT_MATRIX=<matrix> +# +# where <matrix> is a mount-matrix in the format specified in the IIO +# subsystem[1]. The default, when unset, is equivalent to: +# ACCEL_MOUNT_MATRIX=1, 0, 0; 0, 1, 0; 0, 0, 1 +# eg. the identity matrix. +# +# [1]: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dfc57732ad38f93ae6232a3b4e64fd077383a0f1 + +# +# Sort by brand, model + +######################################### +# Winbook +######################################### +sensor:modalias:acpi:BMA250*:dmi:*svn*WinBook*:*pn*TW100* + ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 0 diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py index 16f74b0777..18f13edd0a 100755 --- a/hwdb/parse_hwdb.py +++ b/hwdb/parse_hwdb.py @@ -60,12 +60,14 @@ COMMENTLINE = pythonStyleComment + EOL INTEGER = Word(nums) STRING = QuotedString('"') REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER)) +SIGNED_REAL = Combine(Optional(Word('-+')) + REAL) UDEV_TAG = Word(string.ascii_uppercase, alphanums + '_') TYPES = {'mouse': ('usb', 'bluetooth', 'ps2', '*'), 'evdev': ('name', 'atkbd', 'input'), 'touchpad': ('i8042', 'rmi', 'bluetooth', 'usb'), 'keyboard': ('name', ), + 'sensor': ('modalias', ), } @lru_cache() @@ -76,7 +78,7 @@ def hwdb_grammar(): for category, conn in TYPES.items()) matchline = Combine(prefix + Word(printables + ' ' + '®')) + EOL propertyline = (White(' ', exact=1).suppress() + - Combine(UDEV_TAG - '=' - Word(alphanums + '_=:@*.! "') - Optional(pythonStyleComment)) + + Combine(UDEV_TAG - '=' - Word(alphanums + '_=:@*.!-;, "') - Optional(pythonStyleComment)) + EOL) propertycomment = White(' ', exact=1) + pythonStyleComment + EOL @@ -93,8 +95,11 @@ def hwdb_grammar(): def property_grammar(): ParserElement.setDefaultWhitespaceChars(' ') - setting = Optional('*')('DEFAULT') + INTEGER('DPI') + Suppress('@') + INTEGER('HZ') - props = (('MOUSE_DPI', Group(OneOrMore(setting('SETTINGS*')))), + dpi_setting = (Optional('*')('DEFAULT') + INTEGER('DPI') + Suppress('@') + INTEGER('HZ'))('SETTINGS*') + mount_matrix_row = SIGNED_REAL + ',' + SIGNED_REAL + ',' + SIGNED_REAL + mount_matrix = (mount_matrix_row + ';' + mount_matrix_row + ';' + mount_matrix_row)('MOUNT_MATRIX') + + props = (('MOUSE_DPI', Group(OneOrMore(dpi_setting))), ('MOUSE_WHEEL_CLICK_ANGLE', INTEGER), ('MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL', INTEGER), ('MOUSE_WHEEL_CLICK_COUNT', INTEGER), @@ -105,6 +110,7 @@ def property_grammar(): ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))), ('XKB_FIXED_LAYOUT', STRING), ('XKB_FIXED_VARIANT', STRING), + ('ACCEL_MOUNT_MATRIX', mount_matrix), ) fixed_props = [Literal(name)('NAME') - Suppress('=') - val('VALUE') for name, val in props] @@ -117,7 +123,7 @@ def property_grammar(): Word(nums + ':')('VALUE') ] - grammar = Or(fixed_props + kbd_props + abs_props) + grammar = Or(fixed_props + kbd_props + abs_props) + EOL return grammar diff --git a/rules/60-sensor.rules b/rules/60-sensor.rules new file mode 100644 index 0000000000..82e44f8843 --- /dev/null +++ b/rules/60-sensor.rules @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="sensor_end" + +# device matching the sensor's name and the machine's DMI data for IIO devices +SUBSYSTEM=="iio", KERNEL=="iio*", SUBSYSTEMS=="usb|i2c", \ + IMPORT{builtin}="hwdb 'sensor:modalias:$attr{modalias}:$attr{[dmi/id]modalias}'", \ + GOTO="sensor_end" + +LABEL="sensor_end" |