diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb index 3b42f5a2e7..55d3fcc3b0 100644 --- a/hwdb.d/60-autosuspend.hwdb +++ b/hwdb.d/60-autosuspend.hwdb @@ -5,8 +5,8 @@ # Match string formats: # : # -# pci:vd: -# usb:vp: +# pci:vd +# usb:vp # # To add local entries, create a new file # /etc/udev/hwdb.d/61-autosuspend-local.hwdb @@ -24,8 +24,6 @@ # # Allowed properties are: # ID_AUTOSUSPEND=1 -# -# All matches should end in ':*' to allow future expansions of the match key. # Sort by brand, model @@ -34,7 +32,7 @@ ######################################### # AU9540 Smartcard Reader -usb:v058Fp9540:* +usb:v058Fp9540* ID_AUTOSUSPEND=1 ######################################### @@ -42,9 +40,9 @@ usb:v058Fp9540:* ######################################### # X1C8 Touchscreen -usb:v04F3p2B7C:* +usb:v04F3p2B7C* # T14 Gen 1 Touchscreen -usb:v04F3p2ACC:* +usb:v04F3p2ACC* ID_AUTOSUSPEND=1 ######################################### @@ -52,14 +50,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 diff --git a/hwdb.d/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb index 31475ed71c..9635fb4e4c 100644 --- a/hwdb.d/60-evdev.hwdb +++ b/hwdb.d/60-evdev.hwdb @@ -35,8 +35,6 @@ # the struct input_absinfo as listed in linux/input.h. If a field is missing # the field will be left as-is. Not all fields need to be present. e.g. ::45 # sets the resolution to 45 units/mm. -# -# All matches should end in ':*' to allow future expansions of the match key. # Sort by brand, model @@ -45,9 +43,9 @@ ######################################### # Hyperpen 12000U -evdev:input:b0003v08CAp0010:* +evdev:input:b0003v08CAp0010* # Hyperpen 6000U -evdev:input:b0003v08CAp0020:* +evdev:input:b0003v08CAp0020* EVDEV_ABS_00=::20 EVDEV_ABS_01=::20 @@ -56,48 +54,48 @@ evdev:input:b0003v08CAp0020:* ######################################### # Macbook2,1 (late 2006), single-button touchpad -evdev:input:b0003v05ACp021B:* +evdev:input:b0003v05ACp021B* # Macbook4,1 -evdev:input:b0003v05ACp0229:* -evdev:input:b0003v05ACp022A:* +evdev:input:b0003v05ACp0229* +evdev:input:b0003v05ACp022A* EVDEV_ABS_00=256:1471:12 EVDEV_ABS_01=256:831:12 # Macbook5,1 (unibody), aka wellspring3 -evdev:input:b0003v05ACp0236:* -evdev:input:b0003v05ACp0237:* -evdev:input:b0003v05ACp0238:* +evdev:input:b0003v05ACp0236* +evdev:input:b0003v05ACp0237* +evdev:input:b0003v05ACp0238* EVDEV_ABS_00=::92 EVDEV_ABS_01=::90 EVDEV_ABS_35=::92 EVDEV_ABS_36=::90 # Macbook8 (unibody, March 2011) -evdev:input:b0003v05ACp0245:* -evdev:input:b0003v05ACp0246:* -evdev:input:b0003v05ACp0247:* +evdev:input:b0003v05ACp0245* +evdev:input:b0003v05ACp0246* +evdev:input:b0003v05ACp0247* EVDEV_ABS_00=::92 EVDEV_ABS_01=::91 EVDEV_ABS_35=::92 EVDEV_ABS_36=::91 # Macbook8,2 (unibody) -evdev:input:b0003v05ACp0252:* -evdev:input:b0003v05ACp0253:* -evdev:input:b0003v05ACp0254:* +evdev:input:b0003v05ACp0252* +evdev:input:b0003v05ACp0253* +evdev:input:b0003v05ACp0254* EVDEV_ABS_00=::94 EVDEV_ABS_01=::92 EVDEV_ABS_35=::94 EVDEV_ABS_36=::92 # MacbookPro10,1 (unibody, June 2012) -evdev:input:b0003v05ACp0262:* -evdev:input:b0003v05ACp0263:* -evdev:input:b0003v05ACp0264:* +evdev:input:b0003v05ACp0262* +evdev:input:b0003v05ACp0263* +evdev:input:b0003v05ACp0264* # MacbookPro10,2 (unibody, October 2012) -evdev:input:b0003v05ACp0259:* -evdev:input:b0003v05ACp025A:* -evdev:input:b0003v05ACp025B:* +evdev:input:b0003v05ACp0259* +evdev:input:b0003v05ACp025A* +evdev:input:b0003v05ACp025B* EVDEV_ABS_00=::94 EVDEV_ABS_01=::92 EVDEV_ABS_35=::94 @@ -294,7 +292,7 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:bvn*:bvr*:bd*:svnDellInc.:pnXPSM1530:* ##### # Fujitsu Component - USB Touch Panel -evdev:input:b0003v0430p0530:* +evdev:input:b0003v0430p0530* EVDEV_ABS_00=0:4096:16 EVDEV_ABS_01=0:4096:16 @@ -446,7 +444,7 @@ evdev:name:Synaptics TM3289-002:dmi:*svnLENOVO*:pvrThinkPadX1Carbon5th:* EVDEV_ABS_36=::19 # Lenovo Thinkpad X1 Tablet Gen3 -evdev:input:b0003v17EFp60B5:* +evdev:input:b0003v17EFp60B5* EVDEV_ABS_00=::12 EVDEV_ABS_01=::11 EVDEV_ABS_35=::12 @@ -639,7 +637,7 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnTOSHIBA:pnSATELLITER830:* ######################################### # Trust Flex Graphics Tablet -evdev:input:b0003v2179p0004:* +evdev:input:b0003v2179p0004* EVDEV_ABS_00=::234 EVDEV_ABS_01=::328 @@ -648,11 +646,11 @@ evdev:input:b0003v2179p0004:* ######################################### # WALTOP International Corp. Slim Tablet -evdev:input:b0003v172Fp0031:* +evdev:input:b0003v172Fp0031* EVDEV_ABS_00=0:10000:400 EVDEV_ABS_01=0:6250:400 #WALTOP International Corp. Graphics Tablet -evdev:input:b0003v172Fp0047:* +evdev:input:b0003v172Fp0047* EVDEV_ABS_00=0:20000:80 EVDEV_ABS_01=0:12500:80 diff --git a/hwdb.d/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb index 3fe850847b..1eec776885 100644 --- a/hwdb.d/60-input-id.hwdb +++ b/hwdb.d/60-input-id.hwdb @@ -9,7 +9,7 @@ # ABI. # # Match string formats: -# id-input:modalias: +# id-input:modalias: # # To add local entries, create a new file # /etc/udev/hwdb.d/61-input-id-local.hwdb @@ -48,28 +48,27 @@ # NOT allowed in this file are: # ID_INPUT_WIDTH_MM, ID_INPUT_HEIGHT_MM, ID_INPUT_TOUCHPAD_INTEGRATION # -# 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 diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index 97800f4364..8cb41ec093 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -47,8 +47,6 @@ # /sys/class/input/input?/capabilities/ev" and is the # firmware-provided string exported by the kernel DMI modalias, # see /sys/class/dmi/id/modalias -# -# All matches should end in ':*' to allow future expansions of the match key. # ######################### KEY MAPPING ###################################### # @@ -230,7 +228,7 @@ evdev:name:Asus Laptop extra buttons:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:* KEYBOARD_KEY_6b=f21 # Touchpad Toggle # USB keyboard in Asus FX503VD -evdev:input:b0003v0B05p1869:* +evdev:input:b0003v0B05p1869* KEYBOARD_KEY_ff31007c=f20 # Remap micmute to f20 ########################################################### @@ -268,7 +266,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*Evo*N*:* KEYBOARD_KEY_9e=email KEYBOARD_KEY_9f=homepage -evdev:input:b0003v049Fp0051:* +evdev:input:b0003v049Fp0051* KEYBOARD_KEY_0c0011=presentation KEYBOARD_KEY_0c0012=addressbook KEYBOARD_KEY_0c0013=info @@ -465,7 +463,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGeminiDevices:pnNC14V1006:* ########################################################### # Slimstar 320 -evdev:input:b0003v0458p0708:* +evdev:input:b0003v0458p0708* KEYBOARD_KEY_0900f0=scrollup KEYBOARD_KEY_0900f1=scrolldown KEYBOARD_KEY_0900f3=back @@ -715,7 +713,7 @@ evdev:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnIBM*:pn*:* KEYBOARD_KEY_17=prog1 # ThinkPad/ThinkVantage button (high keycode: "vendor") # IBM Thinkpad USB Keyboard Trackpoint -evdev:input:b0003v04B3p301[89]:* +evdev:input:b0003v04B3p301[89]* KEYBOARD_KEY_900f0=screenlock KEYBOARD_KEY_900f1=wlan KEYBOARD_KEY_900f2=switchvideomode @@ -759,7 +757,7 @@ evdev:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*:* KEYBOARD_KEY_45=bookmarks # ThinkPad Keyboard with TrackPoint -evdev:input:b0003v17EFp6009:* +evdev:input:b0003v17EFp6009* KEYBOARD_KEY_090012=screenlock # Fn+F2 KEYBOARD_KEY_090013=battery # Fn+F3 KEYBOARD_KEY_090014=wlan # Fn+F5 @@ -866,7 +864,7 @@ evdev:name:Microphone Mute Button:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*:* KEYBOARD_KEY_00=f20 # enhanced USB keyboard -evdev:input:b0003v04B3p301B:* +evdev:input:b0003v04B3p301B* KEYBOARD_KEY_90001=prog1 # ThinkVantage KEYBOARD_KEY_90002=screenlock KEYBOARD_KEY_90003=file @@ -884,7 +882,7 @@ evdev:input:b0003v04B3p301B:* # 27MHz wireless keyboards, these all have a PID of 00?? and all send c10xx # logitech custom consumer usage-page codes. The mappings below are the most # common, but some mapping may differ, especially the Fn F1-F12 mappings -evdev:input:b0003v046Dp00??:* +evdev:input:b0003v046Dp00* KEYBOARD_KEY_c0183=media # HUT:config, kbd:Media/Music player button KEYBOARD_KEY_c1001=chat # Messenger button KEYBOARD_KEY_c1002=camera # Webcam button @@ -934,7 +932,7 @@ evdev:input:b0003v046Dp00??:* KEYBOARD_KEY_c104c=prog4 # Smartkey D (Fn + F12) → XF86Launch4 # Cordless Access Keyboard (27 MHz, modelnumber Y-RH35) -evdev:input:b0003v046Dp0042:* +evdev:input:b0003v046Dp0042* KEYBOARD_KEY_c1041=new KEYBOARD_KEY_c1042=reply KEYBOARD_KEY_c1043=forward @@ -949,7 +947,7 @@ evdev:input:b0003v046Dp0042:* KEYBOARD_KEY_c104c=audio # "Cordless Rechargeable Desktop" keyboard (27 MHz, modelnumber Y-RK49) -evdev:input:b0003v046Dp0045:* +evdev:input:b0003v046Dp0045* KEYBOARD_KEY_c1041=new KEYBOARD_KEY_c1042=reply KEYBOARD_KEY_c1043=forward @@ -960,7 +958,7 @@ evdev:input:b0003v046Dp0045:* KEYBOARD_KEY_c104c=audio # S510 keyboard (27 MHz, modelnumber Y-RAK73) -evdev:input:b0003v046Dp0056:* +evdev:input:b0003v046Dp0056* KEYBOARD_KEY_c1041=battery # Battery icon (Fn + F1) # MX3000 keyboard (27 MHz, modelnumber Y-RAM74) @@ -969,7 +967,7 @@ evdev:input:b0003v046Dp0056:* # Note if the "Special Button Function" in the HID++ features register gets # cleared then the scroll-wheel events for these buttons go away and then # tilting the scrollwheel left/right starts sending c1022 / c1024 events -evdev:input:b0003v046Dp0057:* +evdev:input:b0003v046Dp0057* KEYBOARD_KEY_c1041=battery # Battery icon (Fn + F1) #KEYBOARD_KEY_c101d=scrolldown # Button below scrollwheel (see note above) @@ -978,7 +976,7 @@ evdev:input:b0003v046Dp0057:* #KEYBOARD_KEY_c1024=scrollright # Right click on scroll-wheel (see note above) # MX3200 keyboard (27 MHz, modelnumber Y-RAV80) -evdev:input:b0003v046Dp005C:* +evdev:input:b0003v046Dp005C* KEYBOARD_KEY_c1001=phone # VOIP button KEYBOARD_KEY_c1016=record # Record button KEYBOARD_KEY_c1041=wordprocessor # Word icon (Fn + F1) @@ -991,13 +989,13 @@ evdev:input:b0003v046Dp005C:* KEYBOARD_KEY_c1048=prog4 # Smartkey D (Fn + F8) → XF86Launch4 # EX100 keyboard (27 MHz, modelnumber Y-RBH94) -evdev:input:b0003v046Dp0065:* +evdev:input:b0003v046Dp0065* KEYBOARD_KEY_c104b=battery # Battery icon (Fn + F11) KEYBOARD_KEY_c104c=ejectcd # Eject icon (Fn + F12) # S520 keyboard (27 MHz, modelnumber Y-RBA97) # Note this one uses non-standard codes for FN + F9 - Fn + F12? -evdev:input:b0003v046Dp0066:* +evdev:input:b0003v046Dp0066* KEYBOARD_KEY_c100e=prog4 # Smartkey D (Fn + F12) → XF86Launch4 KEYBOARD_KEY_c1019=prog1 # Smartkey A (Fn + F9) → XF86Launch1 KEYBOARD_KEY_c101a=prog2 # Smartkey B (Fn + F10) → XF86Launch2 @@ -1013,12 +1011,12 @@ evdev:input:b0003v046Dp0066:* KEYBOARD_KEY_c106f=battery # Battery icon # S510 remote control (27 MHz) -evdev:input:b0003v046Dp00FE:* +evdev:input:b0003v046Dp00FE* KEYBOARD_KEY_c1018=media # Media button # MX5000 keyboard (HID proxy mode and bluetooth matches) -evdev:input:b0003v046DpB305:* -evdev:input:b0005v046DpB305:* +evdev:input:b0003v046DpB305* +evdev:input:b0005v046DpB305* KEYBOARD_KEY_c0230=zoomreset # HUT says fullscreen, kbd says 100% KEYBOARD_KEY_c1004=send # Send and receive / sync button KEYBOARD_KEY_c1006=coffee # Status (online/away) button @@ -1033,8 +1031,8 @@ evdev:input:b0005v046DpB305:* KEYBOARD_KEY_c103b=prog4 # Smartkey D → XF86Launch4 # MX5500 keyboard (HID proxy mode and bluetooth matches) -evdev:input:b0003v046DpB30B:* -evdev:input:b0005v046DpB30B:* +evdev:input:b0003v046DpB30B* +evdev:input:b0005v046DpB30B* KEYBOARD_KEY_c0183=media # HUT says consumer control configuration, kbd says Media Center KEYBOARD_KEY_c100e=images # Camera icon, "Photo Gallery" KEYBOARD_KEY_c100f=config # Window with gear icon @@ -1044,12 +1042,12 @@ evdev:input:b0005v046DpB30B:* KEYBOARD_KEY_c103b=prog4 # Smartkey D → XF86Launch4 # Logitech K811 -evdev:input:b0005v046DpB317:* +evdev:input:b0005v046DpB317* KEYBOARD_KEY_70047=brightnessdown KEYBOARD_KEY_70048=brightnessup # iTouch -evdev:input:b0003v046DpC308:* +evdev:input:b0003v046DpC308* KEYBOARD_KEY_90001=shop # Shopping KEYBOARD_KEY_90002=config # iTouch KEYBOARD_KEY_90003=finance # Finance @@ -1058,12 +1056,12 @@ evdev:input:b0003v046DpC308:* KEYBOARD_KEY_c0183=media # Media # Cordless Desktop S510 -evdev:input:b0003v046DpC50C:* +evdev:input:b0003v046DpC50C* KEYBOARD_KEY_d4=up # zoomin KEYBOARD_KEY_cc=down # zoomout # Wave cordless -evdev:input:b0003v046DpC317:* +evdev:input:b0003v046DpC317* KEYBOARD_KEY_9001c=scale # expo KEYBOARD_KEY_9001f=down # zoomout KEYBOARD_KEY_90020=up # zoomin @@ -1082,7 +1080,7 @@ evdev:input:b0003v046DpC317:* KEYBOARD_KEY_9004c=ejectclosecd # Wave cordless -evdev:input:b0003v046DpC517:* +evdev:input:b0003v046DpC517* KEYBOARD_KEY_c101f=down # zoomout KEYBOARD_KEY_c1020=up # zoomin KEYBOARD_KEY_c1005=camera @@ -1098,7 +1096,7 @@ evdev:input:b0003v046DpC517:* KEYBOARD_KEY_c104c=ejectclosecd # Cordless Wave Pro -evdev:input:b0003v046DpC529:* +evdev:input:b0003v046DpC529* KEYBOARD_KEY_0c01b6=camera KEYBOARD_KEY_0c0183=media KEYBOARD_KEY_0c0184=wordprocessor @@ -1113,13 +1111,13 @@ evdev:input:b0003v046DpC529:* KEYBOARD_KEY_0c022e=down # zoomout # Logitech Presenter R400 -evdev:input:b0003v046DpC52D:* +evdev:input:b0003v046DpC52D* KEYBOARD_KEY_070029=presentation KEYBOARD_KEY_07003e=presentation KEYBOARD_KEY_070037=displaytoggle # Internet Navigator -evdev:input:b0003v046DpC309:* +evdev:input:b0003v046DpC309* KEYBOARD_KEY_90001=chat # Messenger/SMS KEYBOARD_KEY_90002=camera # webcam KEYBOARD_KEY_90003=prog1 # iTouch @@ -1191,12 +1189,12 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMedion*:pnErazer*:* ########################################################### # Microsoft Natural Ergonomic Keyboard 4000 -evdev:input:b0003v045Ep00DB:* +evdev:input:b0003v045Ep00DB* KEYBOARD_KEY_c022d=up # zoomin KEYBOARD_KEY_c022e=down # zoomout # Microsoft (Razer produced) Reclusa keyboard -evdev:input:b0003v1532p0200:* +evdev:input:b0003v1532p0200* KEYBOARD_KEY_c01c9=shuffle KEYBOARD_KEY_c01ca=up # zoomin KEYBOARD_KEY_c01cb=down # zoomout @@ -1259,7 +1257,7 @@ evdev:name:MSI Laptop hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnM[iI][cC][rR][oO]-S[tT][a ########################################################### # Teres-I -evdev:input:b0003v15BAp003C:* +evdev:input:b0003v15BAp003C* KEYBOARD_KEY_70066=sleep # Fn+F1 KEYBOARD_KEY_700f6=wlan # Fn+F2 KEYBOARD_KEY_700c7=f21 # Fn+F3 touchpad toggle @@ -1371,7 +1369,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnOQO*Inc.*:pnOQO*Model*2*:* # The key code identifiers used below exactly match the text # labels on the keys/buttons (or standard icons on the buttons # that have no text labels), except as noted. -evdev:input:b0003v05A4p9735:* +evdev:input:b0003v05A4p9735* KEYBOARD_KEY_c0015=back KEYBOARD_KEY_c0012=forward KEYBOARD_KEY_c000c=stop @@ -1402,7 +1400,7 @@ evdev:input:b0003v05A4p9735:* ########################################################### # Plantronics .Audio 626 DSP -evdev:input:b0003v047FpC006:* +evdev:input:b0003v047FpC006* KEYBOARD_KEY_b002f=f20 # Microphone mute button; should be micmute ########################################################### @@ -1699,7 +1697,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote*6615WD:* ########################################## # Ideazon Zboard Merc -evdev:input:b0003v1038p0210:* +evdev:input:b0003v1038p0210* KEYBOARD_KEY_c0227=q KEYBOARD_KEY_c0223=w KEYBOARD_KEY_c0221=e @@ -1737,7 +1735,7 @@ evdev:input:b0003v1038p0210:* KEYBOARD_KEY_70079=f6 # Ideazon Zboard Fang -evdev:input:b0003v1038p0310:* +evdev:input:b0003v1038p0310* KEYBOARD_KEY_70059=1 KEYBOARD_KEY_7005b=3 KEYBOARD_KEY_70040=equal @@ -1789,13 +1787,13 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDIXONSP:pnDIXON*:* # with an accompanying variant (defined with XKB_FIXED_VARIANT) if necessary. # Yubico Yubico Yubikey II" -evdev:input:b0003v1050p0010:* +evdev:input:b0003v1050p0010* # Yubico Yubikey NEO OTP+CCID -evdev:input:b0003v1050p0111:* +evdev:input:b0003v1050p0111* # Yubico Yubikey NEO OTP+U2F+CCID -evdev:input:b0003v1050p0116:* +evdev:input:b0003v1050p0116* # OKE Electron Company USB barcode reader -evdev:input:b0003v05FEp1010:* +evdev:input:b0003v05FEp1010* XKB_FIXED_LAYOUT=us XKB_FIXED_VARIANT= @@ -1808,12 +1806,12 @@ evdev:input:b0003v05FEp1010:* # Presence of a LED is implicit when the property is absent. # Logitech K750 -evdev:input:b0003v046Dp4002:* +evdev:input:b0003v046Dp4002* KEYBOARD_LED_NUMLOCK=0 KEYBOARD_LED_CAPSLOCK=0 # PFU Limited HHKB Professional JP -evdev:input:b0003v04FEp000D:* +evdev:input:b0003v04FEp000D* KEYBOARD_LED_NUMLOCK=0 KEYBOARD_LED_CAPSLOCK=0 diff --git a/hwdb.d/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb index 16edca57aa..b0d0d084de 100644 --- a/hwdb.d/60-sensor.hwdb +++ b/hwdb.d/60-sensor.hwdb @@ -67,8 +67,6 @@ # or 'display'. The default, when unset, is equivalent to: # ACCEL_LOCATION=display # -# All matches should end in ':*' to allow future expansions of the match key. - # Sort by brand, model ######################################### diff --git a/hwdb.d/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb index f72a69dd27..9d5c4fc069 100644 --- a/hwdb.d/70-joystick.hwdb +++ b/hwdb.d/70-joystick.hwdb @@ -36,8 +36,6 @@ # # If the property is missing, user-space can assume: # ID_INPUT_JOYSTICK_INTEGRATION=external -# -# All matches should end in ':*' to allow future expansions of the match key. joystick:bluetooth:* ID_INPUT_JOYSTICK_INTEGRATION=external @@ -47,6 +45,6 @@ joystick:bluetooth:* ########################################################### # GPD Win, Classic and XBox 360 compat modes -joystick:usb:v11c5p5507:* -joystick:usb:v045ep028e:* +joystick:usb:v11c5p5507* +joystick:usb:v045ep028e* ID_INPUT_JOYSTICK_INTEGRATION=internal diff --git a/hwdb.d/70-pointingstick.hwdb b/hwdb.d/70-pointingstick.hwdb index bcc993644e..b427f21ea5 100644 --- a/hwdb.d/70-pointingstick.hwdb +++ b/hwdb.d/70-pointingstick.hwdb @@ -13,7 +13,7 @@ # # Supported hardware matches are: # - Generic input devices match: -# evdev:input:bZZZZvYYYYpXXXXeWWWW-VVVV:* +# evdev:input:bZZZZvYYYYpXXXXeWWWW-VVVV # This matches on the kernel modalias of the input-device, mainly: # ZZZZ is the bus-id (see /usr/include/linux/input.h BUS_*), YYYY, XXXX and # WWW are the 4-digit hex uppercase vendor, product and version ID and VVVV @@ -27,8 +27,6 @@ # is the firmware-provided string from the kernel DMI modalias, # see /sys/class/dmi/id/modalias # -# All matches should end in ':*' to allow future expansions of the match key. -# # To add local entries, create a new file # /etc/udev/hwdb.d/71-pointingstick-local.hwdb # and add your rules there. To load the new rules execute (as root): @@ -157,6 +155,6 @@ evdev:name:TPPS/2 IBM TrackPoint:dmi:bvn*:bvr*:bd*:svnLENOVO:pn*:pvrThinkPadX20? POINTINGSTICK_CONST_ACCEL=1.25 # Lenovo UltraNav SK-8845 (USB keyboard) -evdev:input:b0003v06CBp0009:* +evdev:input:b0003v06CBp0009* POINTINGSTICK_CONST_ACCEL=2.5 POINTINGSTICK_SENSITIVITY=200 diff --git a/hwdb.d/70-touchpad.hwdb b/hwdb.d/70-touchpad.hwdb index 797ed3925f..8194d98358 100644 --- a/hwdb.d/70-touchpad.hwdb +++ b/hwdb.d/70-touchpad.hwdb @@ -15,8 +15,6 @@ # # vid/pid as 4-digit hex lowercase vendor/product # -# All matches should end in ':*' to allow future expansions of the match key. -# # To add local entries, create a new file # /etc/udev/hwdb.d/71-touchpad-local.hwdb # and add your rules there. To load the new rules execute (as root): @@ -61,11 +59,11 @@ touchpad:usb:v044ep1221:* ########################################################### # Logitech ########################################################### -touchpad:usb:v046dp????:* +touchpad:usb:v046d* ID_INPUT_TOUCHPAD_INTEGRATION=external ########################################################### # Wacom ########################################################### -touchpad:usb:v056ap????:* +touchpad:usb:v056a* ID_INPUT_TOUCHPAD_INTEGRATION=external diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py index 4174c7598f..ed07224b3c 100755 --- a/hwdb.d/parse_hwdb.py +++ b/hwdb.d/parse_hwdb.py @@ -202,9 +202,8 @@ def check_matches(groups): except ParseBaseException as e: error('Pattern {!r} is invalid: {}', rest, e) continue - - if not rest.endswith(':*'): - error("pattern {!r} does not end with ':*'", match) + if rest[-1] not in '*:': + error('pattern {} does not end with "*" or ":"', match) matches.sort() prev = None diff --git a/tools/make-autosuspend-rules.py b/tools/make-autosuspend-rules.py index 8114522a1c..a20edc0f34 100755 --- a/tools/make-autosuspend-rules.py +++ b/tools/make-autosuspend-rules.py @@ -7,18 +7,18 @@ import chromiumos.gen_autosuspend_rules -print('# pci:v<00VENDOR>d<00DEVICE>:* (8 uppercase hexadecimal digits twice)') +print('# pci:v<00VENDOR>d<00DEVICE> (8 uppercase hexadecimal digits twice)') for entry in chromiumos.gen_autosuspend_rules.PCI_IDS: vendor, device = entry.split(':') vendor = int(vendor, 16) device = int(device, 16) - print('pci:v{:08X}d{:08X}:*'.format(vendor, device)) + print('pci:v{:08X}d{:08X}*'.format(vendor, device)) -print('# usb:vp:* (4 uppercase hexadecimal digits twice)') +print('# usb:vp (4 uppercase hexadecimal digits twice)') for entry in chromiumos.gen_autosuspend_rules.USB_IDS: vendor, product = entry.split(':') vendor = int(vendor, 16) product = int(product, 16) - print('usb:v{:04X}p{:04X}:*'.format(vendor, product)) + print('usb:v{:04X}p{:04X}*'.format(vendor, product)) print(' ID_AUTOSUSPEND=1')