summaryrefslogtreecommitdiff
path: root/hwdb.d/60-autosuspend.hwdb
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-10-15 09:23:30 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-10-15 18:01:32 +0200
commitc0443b97b71d5f70a0622061f589307bec5502c6 (patch)
tree4662dec2a2a26f8a3246f83bb1068e962f89ca97 /hwdb.d/60-autosuspend.hwdb
parentb4dfe06e1929d2b458b7735e181e1234884a86da (diff)
downloadsystemd-c0443b97b71d5f70a0622061f589307bec5502c6.tar.gz
hwdb: add trailing ":*" everywhere
No functional change is intended. The general pattern of changes: -usb:v04F3p2B7C* +usb:v04F3p2B7C:* This is mostly a clarification, to make the part that makes the usb vXXXXpYYYY part visually separated. It would only make a difference if we added further keys with a different number of digits, which is unlikely. -usb:v0627p0001:*QEMU USB Keyboard* -usb:v0627p0001:*QEMU USB Mouse* -usb:v0627p0001:*QEMU USB Tablet* +usb:v0627p0001:*QEMU USB Keyboard*:* +usb:v0627p0001:*QEMU USB Mouse*:* +usb:v0627p0001:*QEMU USB Tablet*:* Again, only a clarification. We know that ":" will appear somewhere later in the match key, so anything that matches "…Keyboard*" will also match "…Keyboard*:*". -evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnASUSTeKComputerInc.:pnN53SV* +evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnASUSTeKComputerInc.:pnN53SV:* This makes the match narrower. Previously we would match product "N53SV" and "N53SV2", "N53SV3", and others. Here we are saying that the ':pn' part must match exactly. Most of the changes in this patch match this pattern. I made a few judgement calls and used "pn…*:*" when I wasn't sure if the full pn is included: -evdev:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision* +evdev:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*:* -evdev:name:Cypress APA Trackpad ?cyapa?:dmi:*:svnHewlett-Packard*:pnFalco*: +evdev:name:Cypress APA Trackpad ?cyapa?:dmi:*:svnHewlett-Packard*:pnFalco*:* This more like the "QEMU" example above, since all dmi strings end in ":", so anything which matches the old version will also match the new version. -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:* I replaced trailing ":pvr*" by ":*". This makes no functional difference because we expect "pvr" to always appear in the dmi string. This makes patterns shorter. -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn*:* OTOH, ":pn*" is kept. This is because almost patterns include ":pn*", and if we skip it, we should make it clear that this is on purpose, that we really want to match any product name. The python script to generate autosuspend rules is updated to use ":*" too. Inspired by https://github.com/systemd/systemd/pull/17281#discussion_r501489750.
Diffstat (limited to 'hwdb.d/60-autosuspend.hwdb')
-rw-r--r--hwdb.d/60-autosuspend.hwdb14
1 files changed, 7 insertions, 7 deletions
diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb
index 8ec9f1fb87..3b42f5a2e7 100644
--- a/hwdb.d/60-autosuspend.hwdb
+++ b/hwdb.d/60-autosuspend.hwdb
@@ -34,7 +34,7 @@
#########################################
# AU9540 Smartcard Reader
-usb:v058Fp9540*
+usb:v058Fp9540:*
ID_AUTOSUSPEND=1
#########################################
@@ -42,9 +42,9 @@ usb:v058Fp9540*
#########################################
# X1C8 Touchscreen
-usb:v04F3p2B7C*
+usb:v04F3p2B7C:*
# T14 Gen 1 Touchscreen
-usb:v04F3p2ACC*
+usb:v04F3p2ACC:*
ID_AUTOSUSPEND=1
#########################################
@@ -52,14 +52,14 @@ usb:v04F3p2ACC*
#########################################
# Emulated USB HID devices
-usb:v0627p0001:*QEMU USB Keyboard*
-usb:v0627p0001:*QEMU USB Mouse*
-usb:v0627p0001:*QEMU USB Tablet*
+usb:v0627p0001:*QEMU USB Keyboard*:*
+usb:v0627p0001:*QEMU USB Mouse*:*
+usb:v0627p0001:*QEMU USB Tablet*:*
ID_AUTOSUSPEND=1
#########################################
# Wacom
#########################################
-usb:v056Ap51A0*
+usb:v056Ap51A0:*
ID_AUTOSUSPEND=1