hal: Branch 'origin' - 5 commits
David Zeuthen
david at kemper.freedesktop.org
Mon Jun 18 10:55:23 PDT 2007
fdi/fdi.dtd | 10 +++++++++-
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 5 +++++
fdi/information/10freedesktop/10-usb-music-players.fdi | 10 +++++-----
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 6 ++++++
fdi/information/10freedesktop/30-keymap-dell.fdi | 12 ++++++++++++
5 files changed, 37 insertions(+), 6 deletions(-)
New commits:
diff-tree 01c666f841a0c3ba97e186ce6d10436ce2b4c6ea (from af7147f9fe790b54e015bc70ea8db5132c5a9e89)
Author: Angel Marin <anmar at anmar.eu.org>
Date: Sun Jun 17 19:59:24 2007 +0100
The patch adds the keymaps for a Dell XPS M1210. It identifies itself as
system.hardware.product='MXC062' so not sure if it'll match for older
hardware revisions.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 5e7386c..4f37dce 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -19,6 +19,18 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
+ <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
+ <append key="input.keymap.data" type="strlist">e015:prog1</append> <!-- Shutter button Takes a picture if optional camera available -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
diff-tree af7147f9fe790b54e015bc70ea8db5132c5a9e89 (from fcee3eb024085dddf9ef30c3f9a35dc4cb059ae7)
Author: Sertaç Ö. Yıldız <anon at anon.org>
Date: Fri Jun 15 16:20:07 2007 +0100
add backlight quirk for Toshiba Satellite M100
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 476f279..367467e 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -14,6 +14,11 @@
</match>
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE M100">
+ <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>
diff-tree fcee3eb024085dddf9ef30c3f9a35dc4cb059ae7 (from 133eb5ba05effb6e8e9796476769ee61ba39ef56)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Jun 14 00:26:06 2007 +0200
sync fdi.dtd from hal package with hal-info
Synced the actual fdi.dtd from hal package with hal-info to avoid
problems with 'make distcheck'
diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index 3e0bc42..7adb36c 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -8,7 +8,7 @@
<!ELEMENT device (match|merge)* >
-<!ELEMENT match (match|merge|prepend|append|remove|spawn)* >
+<!ELEMENT match (match|merge|prepend|append|addset|remove|spawn)* >
<!ATTLIST match
key CDATA #REQUIRED
string CDATA #IMPLIED
@@ -29,6 +29,8 @@
compare_le CDATA #IMPLIED
compare_gt CDATA #IMPLIED
compare_ge CDATA #IMPLIED
+ compare_ne CDATA #IMPLIED
+ sibling_contains CDATA #IMPLIED
>
<!ELEMENT merge (#PCDATA) >
@@ -49,6 +51,12 @@
type (string|strlist|int|bool|double|copy_property) #REQUIRED
>
+<!ELEMENT addset (#PCDATA) >
+<!ATTLIST addset
+ key CDATA #REQUIRED
+ type (string|strlist|int|bool|double|copy_property) #REQUIRED
+>
+
<!ELEMENT remove (#PCDATA) >
<!ATTLIST remove
key CDATA #REQUIRED
diff-tree 133eb5ba05effb6e8e9796476769ee61ba39ef56 (from a56f07994061e5f9bb543b0959946eb893994790)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Jun 14 00:23:30 2007 +0200
fix LG Fusic Phone entry
Fix entry for LG Fusic Phone:
* s/physical_device/originating_device/
* s/adddset/addset/ as detected by Richard
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index c34f135..5ff6d3a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -677,14 +677,14 @@
</match>
<!-- LG Fusic Phone -->
- <match key="@storage.physical_device:usb.vendor_id" int="0x05c6">
- <match key="@storage.physical_device:usb.product_id" int="0x1000">
- <addset key="info.capabilities" type="strlist">portable_audio_player</adddset>
+ <match key="@storage.originating_device:usb.vendor_id" int="0x05c6">
+ <match key="@storage.originating_device:usb.product_id" int="0x1000">
+ <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
<merge key="info.category" type="string">portable_audio_player</merge>
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<addset key="portable_audio_player.output_formats" type="strlist">audio/mpeg</addset>
- <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</adddset>
- <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</adddset>
+ <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
+ <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</addset>
<append key="portable_audio_player.playlist_path" type="string">MUSIC/AllMyMusic.m3u</append>
<addset key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</addset>
</match>
diff-tree a56f07994061e5f9bb543b0959946eb893994790 (from 146d8fe54936d3d7b0e405a8c06c94fca321f7ce)
Author: L. David Baron <dbaron at dbaron.org>
Date: Wed Jun 13 19:47:30 2007 +0100
add ThinkPad T21 resume quirk
The attached patch adds a rule for the power management quirk
(s3_bios) needed to get my IBM T42 laptop (bought in December 2004)
to suspend.
I tested that suspend+resume works correctly with the s3_bios quirk:
1. running X with the radeon driver
2. running X with the proprietary ATI fglrx driver
3. from tty1 (well, using pm-suspend --quirk-s3-bios rather than the
quirk coming from hal)
I tested that not having the quirk breaks resume with both the
radeon and fglrx drivers (didn't try tty1). I tested that also
having the s3_mode quirk breaks resume using the fglrx driver
(didn't try other cases).
This testing was all done on Fedora 7, although using an older X
server (from Fedora Core 6) that's needed for the fglrx driver.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index f2cffde..89eeda5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -42,6 +42,12 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <!-- T42 -->
+ <match key="system.hardware.product" prefix="2378">
+ <match key="system.hardware.version" string="ThinkPad T42">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
+ </match>
<!-- T43 -->
<match key="system.hardware.product" prefix="2668">
<match key="system.hardware.version" string="ThinkPad T43">
More information about the hal-commit
mailing list