From db7c6e6fc85d13ab18eb0d918957210c7476cba6 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 30 Aug 2013 06:31:12 +0200 Subject: [PATCH] keymap: Fix Dell vendor names Spaces are dropped from vendor and product names in DMI modaliases, so a match like "svnDell Inc.:" will never happen. Also, some machines use "Dell", some "Dell Inc", some "Dell Inc.", so just match on "Dell*" to avoid all these traps. https://launchpad.net/bugs/1218433 --- hwdb/60-keyboard.hwdb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 33dc5d6a3..958185f4f 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -192,7 +192,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*Evo N*:pvr* # Dell ########################################################### -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pvr* KEYBOARD_KEY_81=playpause # Play/Pause KEYBOARD_KEY_82=stopcd # Stop KEYBOARD_KEY_83=previoussong # Previous song @@ -224,31 +224,31 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell:pvr* KEYBOARD_KEY_d9=f21 # Touchpad toggle # -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 910:pvr* -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 101[012]:pvr* -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1110:pvr* -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1210:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 910:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 101[012]:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 1110:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron 1210:pvr* KEYBOARD_KEY_84=wlan # Latitude XT2 -keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnLatitude XT2:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude XT2:pvr* KEYBOARD_KEY_9b=up # tablet rocker up KEYBOARD_KEY_9e=enter # tablet rocker press KEYBOARD_KEY_9f=back # tablet back KEYBOARD_KEY_a3=down # tablet rocker down -keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnStudio 155[78]:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnStudio 155[78]:pvr* KEYBOARD_KEY_a0=! # mute KEYBOARD_KEY_ae=! # volume down KEYBOARD_KEY_b0=! # volume up # Dell Touchpad -keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Latitude*:pvr* -keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Precision*:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn:*Latitude*:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn:*Precision*:pvr* KEYBOARD_KEY_9e=!f21 # Dell XPS -keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnXPS*:pvr* +keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr* KEYBOARD_KEY_8c=!f23 ########################################################### -- 2.30.2