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