hal-info: Branch 'master' - 3 commits
Matthew Garrett
mjg59 at kemper.freedesktop.org
Fri Jun 27 07:13:31 PDT 2008
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 26 -
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 53 +--
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 164 ++--------
3 files changed, 65 insertions(+), 178 deletions(-)
New commits:
commit e49376fb6be21a67b44d974d5d4659b3c118b1d9
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Fri Jun 27 15:13:01 2008 +0100
Make the Sony keymap more generic
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index e9924a0..3661d37 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -6,39 +6,26 @@
You can find the scancodes in the kernel source of the module (drivers/misc/sony-laptop.c) -->
<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_outof="PCG-Z1RMP;PCG-Z1XMP;VGN-S1XP(GB);VGN-SZ3XWP_C;VGN-S5VP_B">
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-TZ16;VGN-SZ71WN_C;VGN-N320E">
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FZ140E;VGN-FZ39VN">
- <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
- <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness down -->
- <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness up -->
- <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>
+ <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="PCG-C1;PCG-K25;PCG-F1;PCG-F2;PCG-F3;PCG-F4;PCG-F5;PCG-F6;PCG-FX;PCG-FRV;PCG-GR;PCG-TR;PCG-NV;PCG-Z">
+ <!-- Older Vaios have a different keymap -->
+ <remove key="input.keymap.data" type="strlist">0x06:mute</remove>
+ <remove key="input.keymap.data" type="strlist">0x07:volumedown</remove>
+ <remove key="input.keymap.data" type="strlist">0x08:volumeup</remove>
+ <remove key="input.keymap.data" type="strlist">0x09:brightnessdown</remove>
+ <remove key="input.keymap.data" type="strlist">0x0a:brightnessup</remove>
+ <append key="input.keymap.data" type="strlist">0x06:battery</append>
+ <append key="input.keymap.data" type="strlist">0x07:mute</append>
+ </match>
+ </match>
</match>
</device>
</deviceinfo>
commit 248551deb88820332d08de4ce936138b7f40017c
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Fri Jun 27 15:12:34 2008 +0100
Fix up some errors in the Thinkpad keymaps, and make them generic.
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 1064cbd..bdc4fe9 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -5,137 +5,43 @@
<!-- These are buttons synthesized in the thinkpad-acpi kernel module -->
<match key="input.product" string="ThinkPad Extra Buttons">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="IBM">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="600">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <append key="input.keymap.data" type="strlist">0x07:search</append> <!-- Fn+F8 screen expand -->
- <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
- <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="750">
- <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <append key="input.keymap.data" type="strlist">0x07:search</append> <!-- Fn+F8 screen expand -->
- <append key="input.keymap.data" type="strlist">0x0a:mode</append> <!-- Fn+F11 power mode -->
- <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
- <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="R5">
- <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 switch wifi -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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">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_outof="T3;X2;R3;A2">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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">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="T4">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <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 switch radio -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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">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_outof="X3;G40">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <append key="input.keymap.data" type="strlist">0x07:radio</append> <!-- Fn+F8 switch radio -->
- <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">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="X4">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <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 switch radio -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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">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>
+ <append key="input.keymap.data" type="strlist">0x01:battery</append> <!-- Fn+F2 battery -->
+ <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
+ <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 switch radio -->
+ <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+ <append key="input.keymap.data" type="strlist">0x07:zoom</append> <!-- Fn+F8 screen expand -->
+ <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">0x13:zoom</append> <!-- Fn+Space -->
+ <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">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
</match>
-
+ <!-- Lenovo systems have a similar but different layout to IBM systems -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains_outof="X6;Z6">
- <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">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="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 -->
- <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:prog1</append> <!-- Fn+F8 ultranav -->
- <append key="input.keymap.data" type="strlist">0x08:ejectcd</append> <!-- Fn+F9 eject -->
- <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">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>
+ <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">0x13:zoom</append> <!-- Fn+Space -->
+ <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">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
</device>
commit 316d4722b6177af4e5205a99f0fefec3994e3b1e
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Fri Jun 27 15:08:41 2008 +0100
brightness_in_hardware should only be true on Thinkpads that use the
non-ACPI backlight control method. These will be driven by the thinkpad_backlight
driver. We've no way to key off this generically at present, so there's going
to need to be a separate solution for BSD - however, the current flagging is
simply wrong and will break backlight control on more recent models when we do
it in-hardware.
Also flag Dells as handling brightness in-hardware. Even the most recent models
haven't shifted over to using ACPI for this. Thanks, Dell.
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index fd2f3b1..73df1b6 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
- <!-- On some broken laptops, the brightness control is all done in hardware
- but the hardware also synthesizes keypresses when the brightness is
- changed. This gives power manager software problems as the brightness
- can get into a feedback state so the panel flashes uncontrollably.
- This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
+ <!-- Some laptops have software controllable backlights and will provide
+ notifications on keypresses, but will also change the brightness
+ directly in firmware. If software changes the value in response to
+ a press, there's a risk that a further event will be generated and
+ a feedback loop occur. brightness_in_hardware indicates to clients
+ that they should not act in response to keypress notifications. -->
<device>
<match key="info.category" string="laptop_panel">
<!-- For Asus EeePC -->
@@ -19,18 +20,11 @@
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="IBM">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
- <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
- </match>
+ <match key="linux.sysfs_path" string="/sys/devices/virtual/backlight/thinkpad_screen">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="LENOVO">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
- <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="3000 N100">
- <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
- </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Dell">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
</match>
</match>
</device>
More information about the hal-commit
mailing list