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