X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2F60-keyboard.hwdb;h=995986d5361e28357c63e3e65af6a55dfc3c4a46;hp=3862b4ca20b19dca06aabb951372ffa8eb5d88d4;hb=04d39279245834494baccfdb9349db8bf80abd13;hpb=6e1452d6f015ebca6801e497d12bc6c7c114386d

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 3862b4ca2..995986d53 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -116,7 +116,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
  KEYBOARD_KEY_f4=prog1                                  # "P1" programmable button
  KEYBOARD_KEY_f5=presentation
  KEYBOARD_KEY_f8=fn
- KEYBOARD_KEY_f9=f23                                    # Launch NTI shadow
+ KEYBOARD_KEY_f9=prog1                                  # Launch NTI shadow
 
 #
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5210*:pvr*
@@ -207,12 +207,12 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn*
  KEYBOARD_KEY_89=ejectclosecd                           # Fn+F10 Eject CD
  KEYBOARD_KEY_8a=suspend                                # Fn+F1 hibernate
  KEYBOARD_KEY_8b=switchvideomode                        # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
- KEYBOARD_KEY_8c=f23                                    # Fn+Right Auto Brightness
+ KEYBOARD_KEY_8c=unknown                                # Fn+Right Auto Brightness
  KEYBOARD_KEY_8F=switchvideomode                        # Fn+F7 aspect ratio
  KEYBOARD_KEY_90=previoussong                           # Front panel previous song
  KEYBOARD_KEY_91=prog1                                  # Wi-Fi Catcher (Dell-specific)
  KEYBOARD_KEY_92=media                                  # MediaDirect button (house icon)
- KEYBOARD_KEY_93=f23                                    # FIXME Fn+Left Auto Brightness
+ KEYBOARD_KEY_93=unknown                                # FIXME Fn+Left Auto Brightness
  KEYBOARD_KEY_95=camera                                 # Shutter button - Takes a picture if optional camera available
  KEYBOARD_KEY_97=email                                  # Tablet email button
  KEYBOARD_KEY_98=f21                                    # FIXME: Tablet screen rotation
@@ -252,7 +252,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*:pvr*
 
 # Dell XPS
 keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*
- KEYBOARD_KEY_8c=!f23
+ KEYBOARD_KEY_8c=!unknown
 
 ###########################################################
 # Everex
@@ -363,7 +363,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:pvr*
  KEYBOARD_KEY_8c=media                                  # music
  KEYBOARD_KEY_8e=dvd
  KEYBOARD_KEY_b1=help
- KEYBOARD_KEY_b3=f23                                    # FIXME: Auto brightness
+ KEYBOARD_KEY_b3=unknown                                # FIXME: Auto brightness
  KEYBOARD_KEY_d7=wlan
  KEYBOARD_KEY_92=brightnessdown                         # Fn+F7 (Fn+F9 on 6730b)
  KEYBOARD_KEY_97=brightnessup                           # Fn+F8 (Fn+F10 on 6730b)
@@ -512,11 +512,6 @@ keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
  KEYBOARD_KEY_17=prog1
  KEYBOARD_KEY_1a=f20
 
-#
-keyboard:name:Ideapad extra buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
- KEYBOARD_KEY_42=f23
- KEYBOARD_KEY_43=f22
-
 # ThinkPad Keyboard with TrackPoint
 keyboard:usb:v17EFp6009*
  KEYBOARD_KEY_090012=screenlock                         # Fn+F2
@@ -572,19 +567,27 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad*X6*:pvr*
  KEYBOARD_KEY_69=enter                                  # enter on d-pad
 
 # IdeaPad
+keyboard:name:Ideapad extra buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
+ KEYBOARD_KEY_42=f23
+ KEYBOARD_KEY_43=f22
+
 keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*Y550*:pvr*
  KEYBOARD_KEY_95=media
  KEYBOARD_KEY_a3=play
 
-# V480
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo*V480*:pvr*
- KEYBOARD_KEY_f1=f21
-
-# IdeaPad
 keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*U300s*:pvr*
  KEYBOARD_KEY_f1=f21
  KEYBOARD_KEY_ce=f20
 
+keyboard:dmi:bvn*:bvr*:svnLENOVO*:pn*IdeaPad*Z370*:pvr*
+ KEYBOARD_KEY_a0=!mute
+ KEYBOARD_KEY_ae=!volumedown
+ KEYBOARD_KEY_b0=!volumeup
+
+# V480
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo*V480*:pvr*
+ KEYBOARD_KEY_f1=f21
+
 ###########################################################
 # Logitech
 ###########################################################
@@ -904,6 +907,8 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr*
  KEYBOARD_KEY_a9=!                                      # Fn Lock - Function lock off
 
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][CDG]*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*940X3G*:pvr*
  KEYBOARD_KEY_ce=!prog1                                 # Fn+F1 launch settings
  KEYBOARD_KEY_a0=!mute                                  # Fn+F6 mute
  KEYBOARD_KEY_ae=!volumedown                            # Fn+F7
@@ -914,7 +919,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
 
 # Series 9
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*90X3A*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34]*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][AB]*:pvr*
  KEYBOARD_KEY_ce=!                                      # Fn+F8 keyboard backlight up
  KEYBOARD_KEY_8d=!                                      # Fn+F7 keyboard backlight down
  KEYBOARD_KEY_96=!                                      # Fn+F1 performance mode (?)