hal: Branch 'origin' - 12 commits
David Zeuthen
david at kemper.freedesktop.org
Wed Jul 25 12:48:50 PDT 2007
Makefile.am | 2
configure.in | 1
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 18
fdi/information/10freedesktop/30-keymap-acer.fdi | 242 ++++++
fdi/information/10freedesktop/30-keymap-misc.fdi | 1
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 27
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 19
tools/Makefile.am | 9
tools/hal-setup-keymap-keys.txt | 348 ++++++++++
tools/keymap-check.sh | 70 ++
10 files changed, 726 insertions(+), 11 deletions(-)
New commits:
diff-tree cb12cd0dee336221f3fcf538e6ba23900ac68080 (from eb52a65be0891c716a9a875226bc25fbe65c6743)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jul 25 16:56:27 2007 +0100
correct sony keymaps
When merging upstream to linus sony-laptop changed the
msc scancodes. Correct the existing keymaps.
This is what happens when development goes fast, sorry.
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 2a01075..1608eb1 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -7,26 +7,26 @@
<match key="input.product" string="Sony Vaio Keys">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-S1XP(GB)">
- <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
- <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
- <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
- <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
- <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
- <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
- <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+ <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+ <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+ <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
+ <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
+ <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+ <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
- <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
- <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
- <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
- <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
- <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
- <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
- <append key="input.keymap.data" type="strlist">0x15:zoom</append> <!-- Fn+F10 zoom -->
- <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+ <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+ <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+ <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
+ <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
+ <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+ <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
+ <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff-tree eb52a65be0891c716a9a875226bc25fbe65c6743 (from 3ac0c5a1b382bc94fbf404801860c33ce9f9272b)
Author: Carlos Corbacho <cathectic at gmail.com>
Date: Wed Jul 25 14:05:16 2007 +0100
add keymap for TravelMate: 5110, 5610 & 5620
Add keymaps for the following Acer laptops:
TravelMate: 5110, 5610 & 5620
(As with other Acer laptops, these three all use the same base design).
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 09a29f0..54e0988 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -203,6 +203,65 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
+ <!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5110">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5610">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5620">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
</match>
</match>
</device>
diff-tree 3ac0c5a1b382bc94fbf404801860c33ce9f9272b (from 9d995bcfc0922251d10b291d8998ae9f835ddb40)
Author: Carlos Corbacho <cathectic at gmail.com>
Date: Sun Jul 22 21:59:16 2007 +0100
add keymap for acer 3610
Add the keymap for the Acer Aspire 3610.
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 1fbb329..09a29f0 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -112,6 +112,23 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3610">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- Aspire 3020 and Aspire 5020 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
diff-tree 9d995bcfc0922251d10b291d8998ae9f835ddb40 (from 82031b8600fd4a8ed4fd34b17c3225320bb62f86)
Author: Carlos Corbacho <cathectic at gmail.com>
Date: Sun Jul 22 19:22:10 2007 +0100
add keymap for acer 1360, 1520, 1690, 3020, 3030, 3040, 5030, 5040
The following patch adds support for the following Acer laptops to the
keyboard quirks:
Aspire: 1360, 1520, 1690, 3020, 3030, 3040, 5030, 5040
Ferrari: 4000
As per my discussion on the HAL mailing list with Richard Hughes, Fn+F3 (Power
Management) is remapped to KEY_BATTERY, and the extra Euro and Dollar keys
are left mapped to F14 and F15, but marked FIXME (pending a better solution
upstream).
-Carlos
(Small informative aside - many of Acer's models are identical versions of the
same hardware, just with a different processor. e.g. the 3020 and 5020 are
the same hardware, except with an AMD Sempron and Turion processor,
respectively).
1360 == 1520 (Odd, but the manual confirms this)
3020 == 5020
3030 == 5030
3040 == 5040
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 1474bc4..1fbb329 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -8,13 +8,173 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
+ <!-- Aspire 1360 and Aspire 1520 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1360">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 1360 and Aspire 1520 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1520">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 1690 taken from hotkey-setup -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1690">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3020 and Aspire 5020 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3020">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3030 and Aspire 5030 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3020">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3040 and Aspire 5040 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3040">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3020 and Aspire 5020 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
- <append key="input.keymap.data" type="strlist">e027:power2</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3030 and Aspire 5030 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5030">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- Aspire 3040 and Aspire 5040 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5040">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4000">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
<append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
- <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- Euro sign -->
- <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- Dollar sign -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
<append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
<append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
<append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
diff-tree 82031b8600fd4a8ed4fd34b17c3225320bb62f86 (from d7b1c28054d5679a7abe65a0df8c24723783de6e)
Author: Alberto Gonzalez <luis6674 at yahoo.com>
Date: Sun Jul 22 19:19:12 2007 +0100
add sleep quirk for medion MS-6714
I added my PC to hal-info to make is suspend/resume successfully.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 27d2d28..8172ea8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -126,4 +126,13 @@
</match>
</device>
+ <device>
+ <match key="system.hardware.vendor" prefix="MEDIONPC">
+ <match key="system.hardware.product" contains="MS-6714">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+
</deviceinfo>
diff-tree d7b1c28054d5679a7abe65a0df8c24723783de6e (from a9ed9e4516020c107db694a54edbfde178a84483)
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Jul 22 16:46:24 2007 +0100
add keymap validator
Add a tool to check the keymaps for invalid entries.
This should stop the checkins of keymaps where there is
a spelling mistake of the keyname.
This works with and without a checked out hal directory
diff --git a/Makefile.am b/Makefile.am
index 5450dd6..aba7b17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = fdi
+SUBDIRS = fdi tools
MAINTAINERCLEANFILES = ChangeLog
diff --git a/configure.in b/configure.in
index 587ebbc..7442a11 100644
--- a/configure.in
+++ b/configure.in
@@ -69,6 +69,7 @@ fdi/information/20thirdparty/Makefile
fdi/preprobe/Makefile
fdi/preprobe/10osvendor/Makefile
fdi/preprobe/20thirdparty/Makefile
+tools/Makefile
])
dnl ==========================================================================
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..1c3861f
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,9 @@
+check:
+ $(srcdir)/keymap-check.sh;
+
+clean-local :
+ rm -f *~
+
+EXTRA_DIST = \
+ keymap-check.sh
+
diff --git a/tools/hal-setup-keymap-keys.txt b/tools/hal-setup-keymap-keys.txt
new file mode 100644
index 0000000..172f8dc
--- /dev/null
+++ b/tools/hal-setup-keymap-keys.txt
@@ -0,0 +1,348 @@
+RESERVED
+ESC
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+MINUS
+EQUAL
+BACKSPACE
+TAB
+Q
+W
+E
+R
+T
+Y
+U
+I
+O
+P
+LEFTBRACE
+RIGHTBRACE
+ENTER
+LEFTCTRL
+A
+S
+D
+F
+G
+H
+J
+K
+L
+SEMICOLON
+APOSTROPHE
+GRAVE
+LEFTSHIFT
+BACKSLASH
+Z
+X
+C
+V
+B
+N
+M
+COMMA
+DOT
+SLASH
+RIGHTSHIFT
+KPASTERISK
+LEFTALT
+SPACE
+CAPSLOCK
+F1
+F2
+F3
+F4
+F5
+F6
+F7
+F8
+F9
+F10
+NUMLOCK
+SCROLLLOCK
+KP7
+KP8
+KP9
+KPMINUS
+KP4
+KP5
+KP6
+KPPLUS
+KP1
+KP2
+KP3
+KP0
+KPDOT
+ZENKAKUHANKAKU
+102ND
+F11
+F12
+RO
+KATAKANA
+HIRAGANA
+HENKAN
+KATAKANAHIRAGANA
+MUHENKAN
+KPJPCOMMA
+KPENTER
+RIGHTCTRL
+KPSLASH
+SYSRQ
+RIGHTALT
+LINEFEED
+HOME
+UP
+PAGEUP
+LEFT
+RIGHT
+END
+DOWN
+PAGEDOWN
+INSERT
+DELETE
+MACRO
+MUTE
+VOLUMEDOWN
+VOLUMEUP
+POWER
+KPEQUAL
+KPPLUSMINUS
+PAUSE
+KPCOMMA
+HANGEUL
+HANGUEL
+HANJA
+YEN
+LEFTMETA
+RIGHTMETA
+COMPOSE
+STOP
+AGAIN
+PROPS
+UNDO
+FRONT
+COPY
+OPEN
+PASTE
+FIND
+CUT
+HELP
+MENU
+CALC
+SETUP
+SLEEP
+WAKEUP
+FILE
+SENDFILE
+DELETEFILE
+XFER
+PROG1
+PROG2
+WWW
+MSDOS
+COFFEE
+SCREENLOCK
+DIRECTION
+CYCLEWINDOWS
+MAIL
+BOOKMARKS
+COMPUTER
+BACK
+FORWARD
+CLOSECD
+EJECTCD
+EJECTCLOSECD
+NEXTSONG
+PLAYPAUSE
+PREVIOUSSONG
+STOPCD
+RECORD
+REWIND
+PHONE
+ISO
+CONFIG
+HOMEPAGE
+REFRESH
+EXIT
+MOVE
+EDIT
+SCROLLUP
+SCROLLDOWN
+KPLEFTPAREN
+KPRIGHTPAREN
+NEW
+REDO
+F13
+F14
+F15
+F16
+F17
+F18
+F19
+F20
+F21
+F22
+F23
+F24
+PLAYCD
+PAUSECD
+PROG3
+PROG4
+SUSPEND
+CLOSE
+PLAY
+FASTFORWARD
+BASSBOOST
+PRINT
+HP
+CAMERA
+SOUND
+QUESTION
+EMAIL
+CHAT
+SEARCH
+CONNECT
+FINANCE
+SPORT
+SHOP
+ALTERASE
+CANCEL
+BRIGHTNESSDOWN
+BRIGHTNESSUP
+MEDIA
+SWITCHVIDEOMODE
+KBDILLUMTOGGLE
+KBDILLUMDOWN
+KBDILLUMUP
+SEND
+REPLY
+FORWARDMAIL
+SAVE
+DOCUMENTS
+BATTERY
+BLUETOOTH
+WLAN
+UNKNOWN
+OK
+SELECT
+GOTO
+CLEAR
+POWER2
+OPTION
+INFO
+TIME
+VENDOR
+ARCHIVE
+PROGRAM
+CHANNEL
+FAVORITES
+EPG
+PVR
+MHP
+LANGUAGE
+TITLE
+SUBTITLE
+ANGLE
+ZOOM
+MODE
+KEYBOARD
+SCREEN
+PC
+TV
+TV2
+VCR
+VCR2
+SAT
+SAT2
+CD
+TAPE
+RADIO
+TUNER
+PLAYER
+TEXT
+DVD
+AUX
+MP3
+AUDIO
+VIDEO
+DIRECTORY
+LIST
+MEMO
+CALENDAR
+RED
+GREEN
+YELLOW
+BLUE
+CHANNELUP
+CHANNELDOWN
+FIRST
+LAST
+AB
+NEXT
+RESTART
+SLOW
+SHUFFLE
+BREAK
+PREVIOUS
+DIGITS
+TEEN
+TWEN
+VIDEOPHONE
+GAMES
+ZOOMIN
+ZOOMOUT
+ZOOMRESET
+WORDPROCESSOR
+EDITOR
+SPREADSHEET
+GRAPHICSEDITOR
+PRESENTATION
+DATABASE
+NEWS
+VOICEMAIL
+ADDRESSBOOK
+MESSENGER
+DISPLAYTOGGLE
+DEL_EOL
+DEL_EOS
+INS_LINE
+DEL_LINE
+FN
+FN_ESC
+FN_F1
+FN_F2
+FN_F3
+FN_F4
+FN_F5
+FN_F6
+FN_F7
+FN_F8
+FN_F9
+FN_F10
+FN_F11
+FN_F12
+FN_1
+FN_2
+FN_D
+FN_E
+FN_F
+FN_S
+FN_B
+BRL_DOT1
+BRL_DOT2
+BRL_DOT3
+BRL_DOT4
+BRL_DOT5
+BRL_DOT6
+BRL_DOT7
+BRL_DOT8
+MIN_INTERESTING
diff --git a/tools/keymap-check.sh b/tools/keymap-check.sh
new file mode 100755
index 0000000..7254fbd
--- /dev/null
+++ b/tools/keymap-check.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Copyright Richard Hughes <richard at hughsie.com>
+
+# checks to see if the keycode is in the quirk keymap list
+isin ()
+{
+ got="0"
+ for query in `cat /tmp/quirk-keymap-list.txt`
+ do
+ if [ "$query" = "$1" ]; then
+ got="1"
+ fi
+ done
+ echo "$got"
+}
+
+# processes each line of the fdi file
+get_line ()
+{
+ cat "$1" | grep "input.keymap.data" | while read line
+ do
+ data=`echo "${line}" | cut -d":" -f2 | cut -d"<" -f1`
+ found=`isin $data`
+ if [ "$found" = "0" ]; then
+ echo "$data "
+ fi
+ done
+}
+
+# processes each line of the fdi file
+get_files ()
+{
+ find "../fdi/information/10freedesktop/" -name '30-keymap-*.fdi' | while read file
+ do
+ status="ok"
+ ret=`get_line "${file}"`
+ if [ ! -z "$ret" ]; then
+ status="FAILED"
+ retval=1
+ fi
+ echo "Validate keycode in ${file} : ${status}"
+ if [ ! -z "$ret" ]; then
+ echo "$ret" | xargs
+ fi
+ done
+}
+
+retval=0
+
+# look for a hal install with gperf
+fqpath="../../hal/tools/hal-setup-keymap-keys.txt"
+if [ ! -e "$fqpath" ]; then
+ echo "HAL keymap source not found, falling back to local db"
+ # fall back to local version
+ fqpath="hal-setup-keymap-keys.txt"
+fi
+
+# make lowercase and save in /tmp
+cat "$fqpath" | tr '[A-Z]' '[a-z]' | sort > /tmp/quirk-keymap-list.txt
+
+echo "Validating keycodes..."
+result=`get_files`
+echo "$result"
+
+if [ ! -z "`echo $result | grep FAILED`" ]; then
+ retval=1
+fi
+
+exit $retval
+
diff-tree a9ed9e4516020c107db694a54edbfde178a84483 (from 0e9cfc96276fed06d195bb1c954d36c98c146c76)
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jul 20 20:28:48 2007 +0100
add keymap for T6 range
- Add a T6x section
system.hardware.vendor = 'LENOVO' (string)
system.hardware.version = 'ThinkPad T60' (string)
2) Things I added that aren't in the other maps:
0x11 -> kbdillumtoggle (for the thinklight)
0x14/15/16 -> volume up/down/mute (don't know if these work right, as they aren't
generating either unknown key events or acpi events at the moment)
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 2c9e8dd..0a7435a 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -160,6 +160,25 @@
<append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="T6">
+ <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
+ <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+ <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+ <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
+ <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
+ <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+ <append key="input.keymap.data" type="strlist">0x11:kbdillumtoggle</append> <!-- Fn+PgUp - ThinkLight -->
+ <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
+ <append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
+ <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
+ <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+ <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R6">
<append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
<append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
diff-tree 0e9cfc96276fed06d195bb1c954d36c98c146c76 (from ceabec748dfc19b7123ece162982dd727221118f)
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jul 20 20:09:12 2007 +0100
extend sleep quirk for CF-Y hardware
Add the whole CF-Y* range on the suggestion of Stefan Seyfried
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index b4fb341..27d2d28 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -120,7 +120,7 @@
<device>
<match key="system.hardware.vendor" prefix="Matsushita Electric Industrial Co.,Ltd.">
- <match key="system.hardware.product" string="CF-Y2FWPZZBM">
+ <match key="system.hardware.product" prefix="CF-Y">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
</match>
diff-tree ceabec748dfc19b7123ece162982dd727221118f (from f82e505e535b864db1795140e990832625ff3fa1)
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jul 20 10:26:06 2007 +0100
fix quirk for CF-Y2FWPZZBM
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 37309d3..b4fb341 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -119,8 +119,7 @@
</device>
<device>
- <match key="system.hardware.vendor" prefix="Matsushita Electric Industrial C
-o.,Ltd.">
+ <match key="system.hardware.vendor" prefix="Matsushita Electric Industrial Co.,Ltd.">
<match key="system.hardware.product" string="CF-Y2FWPZZBM">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
diff-tree f82e505e535b864db1795140e990832625ff3fa1 (from ca4537fc6beb6da309ffbcc4b343aa50a39d2011)
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jul 19 13:54:01 2007 +0100
add keymap for fs790b
Add a map from caillions laptop.
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 76f7e82..2a01075 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -17,6 +17,19 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
+ <append key="input.keymap.data" type="strlist">0x0d:mute</append> <!-- Fn+F2 mute -->
+ <append key="input.keymap.data" type="strlist">0x0e:volumedown</append> <!-- Fn+F3 mixer down -->
+ <append key="input.keymap.data" type="strlist">0x0f:volumeup</append> <!-- Fn+F4 mixer up -->
+ <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+F5 brightness up -->
+ <append key="input.keymap.data" type="strlist">0x11:brightnessup</append> <!-- Fn+F6 brightness down -->
+ <append key="input.keymap.data" type="strlist">0x12:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+ <append key="input.keymap.data" type="strlist">0x15:zoom</append> <!-- Fn+F10 zoom -->
+ <append key="input.keymap.data" type="strlist">0x17:suspend</append> <!-- Fn+F12 hibernate -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree ca4537fc6beb6da309ffbcc4b343aa50a39d2011 (from a0306e3bb4539461f14da7f7837a9f455bb1a265)
Author: Lane Brooks <lbrooks at MIT.EDU>
Date: Thu Jul 19 12:29:30 2007 +0100
add suspend quirk for Panasonic Toughtbook CF-Y2
The kernel and pm-utils from updates testing works if I use the vbe-post
quirk. Attached is the hal-info patch.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 094411b..37309d3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -117,4 +117,14 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</device>
+
+ <device>
+ <match key="system.hardware.vendor" prefix="Matsushita Electric Industrial C
+o.,Ltd.">
+ <match key="system.hardware.product" string="CF-Y2FWPZZBM">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+
</deviceinfo>
diff-tree a0306e3bb4539461f14da7f7837a9f455bb1a265 (from 61c171876a537a4f315aa14dbfeb792d9bf4ee9f)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jul 17 18:01:41 2007 +0100
add a key pointed out by lennart whilst sitting next to me at guadec
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 8c2d0cb..63d4f4b 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -43,6 +43,7 @@
<append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
<append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
<append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
<append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
<append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
More information about the hal-commit
mailing list