From 3429cc4f589251cf06177972b43aee3de1b84399 Mon Sep 17 00:00:00 2001 From: Chris Chiu Date: Thu, 2 May 2019 17:46:45 +0800 Subject: [PATCH 1/2] Revert "hwdb: Apply Acer mappings to all Gateway and Packard Bell models" This reverts commit e09dba97b96f877e36cd3f1afdb321922eed064b. It's reported that the same rules for Acer cause false match and unexpected response from certain keys on an old PackardBell laptop. Bug: https://github.com/systemd/systemd/issues/12178 --- hwdb/60-keyboard.hwdb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 851b62bb5c..91340b6186 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -98,8 +98,7 @@ # common keys evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn* -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pn* -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pn* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr* evdev:atkbd:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr* KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for comunication key KEYBOARD_KEY_a5=help # Fn+F1 @@ -183,6 +182,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*1640:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOA*:pvr* KEYBOARD_KEY_a9=!switchvideomode # Fn+F5 +# Easynote models +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pnEasynote*:pvr* + KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for comunication key + ########################################################### # Alienware ########################################################### From 82b941cb5d1fa04b6c13dba4f07af4be8b21561e Mon Sep 17 00:00:00 2001 From: Chris Chiu Date: Thu, 2 May 2019 18:10:22 +0800 Subject: [PATCH 2/2] hwdb: Align airplane mode toggle key mapping for all Acer series Packard Bell and Gateway are different marketing names from Acer. The same scan code E0 86 is fired for the airplane mode toggle key. It was verified in commit d8d51328fe6db33a2d8cda06f181c55c00d09672. Signed-off-by: Chris Chiu --- hwdb/60-keyboard.hwdb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 91340b6186..a05db181b8 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -182,8 +182,9 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire*1640:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOA*:pvr* KEYBOARD_KEY_a9=!switchvideomode # Fn+F5 -# Easynote models -evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pnEasynote*:pvr* +# Packard Bell and Gateway models +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pn* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pn* KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for comunication key ###########################################################