ryantimwilson / rpms / systemd

Forked from rpms/systemd 2 months ago
Clone
65878a
From fd5f1706cda158e7a89e955f861bd34d7a8b429f Mon Sep 17 00:00:00 2001
65878a
From: Martin Pitt <martinpitt@gnome.org>
65878a
Date: Thu, 19 Dec 2013 08:33:32 +0100
65878a
Subject: [PATCH] keymap: Refactor Acer tables
65878a
65878a
Move common keys into generic Acer table, and factorize the model specific
65878a
exceptions.
65878a
---
65878a
 hwdb/60-keyboard.hwdb | 101 ++++++++++++++++++--------------------------------
65878a
 1 file changed, 36 insertions(+), 65 deletions(-)
65878a
65878a
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
65878a
index d4d948d..ab9e569 100644
65878a
--- a/hwdb/60-keyboard.hwdb
65878a
+++ b/hwdb/60-keyboard.hwdb
65878a
@@ -46,52 +46,7 @@
65878a
 # Acer
65878a
 ##########################################
65878a
 
65878a
-# Acer platform kernel driver
65878a
-keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr*
65878a
- KEYBOARD_KEY_82=f21
65878a
-
65878a
-# Aspire 5720
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*5720*:pvr*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnZG8*:pvr*
65878a
- KEYBOARD_KEY_84=bluetooth                              # sent when bluetooth module missing, and key pressed
65878a
- KEYBOARD_KEY_92=media                                  # Acer arcade
65878a
- KEYBOARD_KEY_d4=bluetooth                              # Bluetooth on
65878a
- KEYBOARD_KEY_d9=bluetooth                              # Bluetooth off
65878a
- KEYBOARD_KEY_f4=prog3                                  # e-key
65878a
-
65878a
-# Aspire 5920g
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*5920G:*
65878a
- KEYBOARD_KEY_8a=media
65878a
- KEYBOARD_KEY_92=media
65878a
- KEYBOARD_KEY_a6=setup
65878a
- KEYBOARD_KEY_b2=www
65878a
- KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
65878a
-
65878a
-# Aspire 6920
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*6920:*
65878a
- KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
65878a
- KEYBOARD_KEY_92=media
65878a
- KEYBOARD_KEY_9e=back
65878a
- KEYBOARD_KEY_83=rewind
65878a
- KEYBOARD_KEY_89=fastforward
65878a
-
65878a
-# Aspire 8930
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*8930:*
65878a
- KEYBOARD_KEY_ca=prog3                                  # key 'HOLD' on CineDash Media Console
65878a
- KEYBOARD_KEY_83=rewind
65878a
- KEYBOARD_KEY_89=fastforward
65878a
- KEYBOARD_KEY_92=media                                  # key 'ARCADE' on CineDash Media Console
65878a
- KEYBOARD_KEY_9e=back
65878a
-
65878a
-# Travelmate C300
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
65878a
- KEYBOARD_KEY_67=f24                                    # FIXME: rotate screen
65878a
- KEYBOARD_KEY_68=up
65878a
- KEYBOARD_KEY_69=down
65878a
- KEYBOARD_KEY_6b=fn
65878a
- KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
65878a
-
65878a
-#
65878a
+# common keys
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
65878a
@@ -99,6 +54,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
65878a
  KEYBOARD_KEY_a6=setup                                  # Fn+F2 Acer eSettings
65878a
  KEYBOARD_KEY_a7=battery                                # Fn+F3 Power Management
65878a
  KEYBOARD_KEY_a9=switchvideomode                        # Fn+F5
65878a
+ KEYBOARD_KEY_b2=www
65878a
  KEYBOARD_KEY_b3=euro
65878a
  KEYBOARD_KEY_b4=dollar
65878a
  KEYBOARD_KEY_ce=brightnessup                           # Fn+Right
65878a
@@ -118,33 +74,48 @@ keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr*
65878a
  KEYBOARD_KEY_f8=fn
65878a
  KEYBOARD_KEY_f9=prog1                                  # Launch NTI shadow
65878a
 
65878a
-#
65878a
+# Acer platform kernel driver
65878a
+keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr*
65878a
+ KEYBOARD_KEY_82=f21					# Touchpad toggle
65878a
+
65878a
+# Aspire models
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*:pvr*
65878a
+ KEYBOARD_KEY_84=bluetooth                              # sent when bluetooth module missing, and key pressed
65878a
+ KEYBOARD_KEY_d9=bluetooth                              # Bluetooth off
65878a
+ KEYBOARD_KEY_92=media                                  # Acer arcade
65878a
+
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*5720*:pvr*
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnZG8*:pvr*
65878a
+ KEYBOARD_KEY_f4=prog3                                  # e-key
65878a
+
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*5920G:*
65878a
+ KEYBOARD_KEY_8a=media
65878a
+ KEYBOARD_KEY_a6=setup
65878a
+
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*6920:*
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*8930:*
65878a
+ KEYBOARD_KEY_ca=prog3                                  # key 'HOLD' on CineDash Media Console
65878a
+ KEYBOARD_KEY_83=rewind
65878a
+ KEYBOARD_KEY_89=fastforward
65878a
+ KEYBOARD_KEY_9e=back
65878a
+
65878a
+# Travelmate C300
65878a
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
65878a
+ KEYBOARD_KEY_67=f24                                    # FIXME: rotate screen
65878a
+ KEYBOARD_KEY_68=up
65878a
+ KEYBOARD_KEY_69=down
65878a
+ KEYBOARD_KEY_6b=fn
65878a
+ KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
65878a
+
65878a
+# on some models this isn't brightnessup
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5210*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5220*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5610*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5620*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5720*:pvr*
65878a
- KEYBOARD_KEY_ee=screenlock
65878a
-
65878a
-#
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*6292*:pvr*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*8471*:pvr*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*7720*:pvr*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*1810T*:pvr*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO751h:*
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO531h:*
65878a
- KEYBOARD_KEY_d9=bluetooth
65878a
-
65878a
-#
65878a
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
65878a
- KEYBOARD_KEY_b2=www
65878a
- KEYBOARD_KEY_ee=screenlock
65878a
-
65878a
-#
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*6593:*
65878a
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*1640:*
65878a
- KEYBOARD_KEY_b2=www
65878a
  KEYBOARD_KEY_ee=screenlock
65878a
 
65878a
 ###########################################################