diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-15 09:23:30 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-15 18:01:32 +0200 |
| commit | c0443b97b71d5f70a0622061f589307bec5502c6 (patch) | |
| tree | 4662dec2a2a26f8a3246f83bb1068e962f89ca97 /hwdb.d/60-input-id.hwdb | |
| parent | hwdb: add missinging ":*" suffix (diff) | |
| download | systemd-c0443b97b71d5f70a0622061f589307bec5502c6.tar.xz systemd-c0443b97b71d5f70a0622061f589307bec5502c6.zip | |
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-input-id.hwdb')
| -rw-r--r-- | hwdb.d/60-input-id.hwdb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hwdb.d/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb index 0fee575d0b..3fe850847b 100644 --- a/hwdb.d/60-input-id.hwdb +++ b/hwdb.d/60-input-id.hwdb @@ -51,25 +51,25 @@ # All matches should end in ':*' to allow future expansions of the match key. # Example: -# id-input:modalias:input:b0003v1234pABCD* +# id-input:modalias:input:b0003v1234pABCD:* # ID_INPUT_TOUCHPAD=1 # ID_INPUT=1 # Sort by brand, model # UC-Logic TABLET 1060N Pad -id-input:modalias:input:b0003v5543p0081* +id-input:modalias:input:b0003v5543p0081:* ID_INPUT_TABLET=1 ID_INPUT_TABLET_PAD=1 # XP-PEN STAR 06 -id-input:modalias:input:b0003v28bdp0078* +id-input:modalias:input:b0003v28bdp0078:* ID_INPUT_TABLET=1 # Lite-On Tech IBM USB Travel Keyboard with Ultra Nav Mouse -id-input:modalias:input:b0003v04B3p301Ee0100-e0,1,2,4* +id-input:modalias:input:b0003v04B3p301Ee0100-e0,1,2,4*:* ID_INPUT_POINTINGSTICK=1 # Logitech Ultrathin Touch Mouse -id-input:modalias:input:b0005v046DpB00De0700* +id-input:modalias:input:b0005v046DpB00De0700:* ID_INPUT_MOUSE=1 |