[systemd-commits] hwdb/60-keyboard.hwdb

[Martin Pitt]

 hwdb/60-keyboard.hwdb |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 6e1452d6f015ebca6801e497d12bc6c7c114386d
Author: Martin Pitt <martinpitt at gnome.org>
Date:   Mon Sep 16 14:25:44 2013 -0500

    keymap: Add Samsung Series 5 [Ultra]
    
    Also consolidate the wlan key into the "all Samsung" rule to avoid repetition.
    
    Thanks to Mauro Carvalho Chehab!
    
    https://bugzilla.redhat.com/show_bug.cgi?id=989103

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 53e83ad..3862b4c 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -882,6 +882,8 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*
  KEYBOARD_KEY_b1=!prog2                                 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice)
  KEYBOARD_KEY_b3=!prog3                                 # Fn+F8 switch power mode (battery/dynamic/performance)
  KEYBOARD_KEY_b4=!wlan                                  # Fn+F9 (X60P)
+ KEYBOARD_KEY_c5=!prog3                                 # Fn+F8 switch power mode (battery/dynamic/performance)
+ KEYBOARD_KEY_d5=!wlan                                  # Fn+F12 wlan/airplane switch
  KEYBOARD_KEY_f7=!f22                                   # Fn+F10 Touchpad on
  KEYBOARD_KEY_f9=!f23                                   # Fn+F10 Touchpad off
 
@@ -889,9 +891,18 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*300E[457]*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*200E[45]*:pvr*
  KEYBOARD_KEY_ce=!                                      # Fn+F1  launch control setting
- KEYBOARD_KEY_d5=!                                      # Fn+F12 Wi-Fi toggle
 
 # Series 5
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*530U*:pvr*
+ KEYBOARD_KEY_ce=!prog1                                 # Fn+F1 launch settings
+ KEYBOARD_KEY_a8=!                                      # Fn Lock - Function lock on
+ KEYBOARD_KEY_a9=!                                      # Fn Lock - Function lock off
+
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr*
+ KEYBOARD_KEY_ce=!prog1                                 # Fn+F1 launch settings
+ KEYBOARD_KEY_a8=!                                      # Fn Lock - Function lock on
+ 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_KEY_ce=!prog1                                 # Fn+F1 launch settings
  KEYBOARD_KEY_a0=!mute                                  # Fn+F6 mute
@@ -900,7 +911,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
  KEYBOARD_KEY_97=!kbdillumdown                          # Fn+F9 keyboard backlight down
  KEYBOARD_KEY_96=!kbdillumup                            # Fn+F10 keyboard backlight up
  KEYBOARD_KEY_b3=!prog3                                 # Fn+F11 fan/cooling mode changer
- KEYBOARD_KEY_d5=!wlan                                  # Fn+F12 wlan/airplane switch
 
 # Series 9
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*90X3A*:pvr*
@@ -936,9 +946,6 @@ 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*700T*:pvr*
  KEYBOARD_KEY_ad=leftmeta
 
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn535U*:pvr*
- KEYBOARD_KEY_d5=!wlan
-
 ###########################################################
 # SONY
 ###########################################################